microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-30 01:04:49 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(54902): Incorrect quick info on using declarations (#54912)

Browse Source
This commit is contained in:
Oleksandr T
2023-07-08 01:07:42 +03:00
committed by GitHub
parent b1da6eead3
commit f38e0fe6f0
6 changed files with 209 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/services/symbolDisplay.ts
View File

@@ -60,7 +60,9 @@ import {
isThisInTypeQuery,
isTransientSymbol,
isTypeAliasDeclaration,
isVarAwaitUsing,
isVarConst,
isVarUsing,
JSDocTagInfo,
JsxOpeningLikeElement,
keywordPart,
@@ -161,6 +163,12 @@ function getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeCheck
else if (symbol.valueDeclaration && isVarConst(symbol.valueDeclaration as VariableDeclaration)) {
return ScriptElementKind.constElement;
}
else if (symbol.valueDeclaration && isVarUsing(symbol.valueDeclaration as VariableDeclaration)) {
return ScriptElementKind.variableUsingElement;
}
else if (symbol.valueDeclaration && isVarAwaitUsing(symbol.valueDeclaration as VariableDeclaration)) {
return ScriptElementKind.variableAwaitUsingElement;
}
else if (forEach(symbol.declarations, isLet)) {
return ScriptElementKind.letElement;
}
@@ -630,6 +638,8 @@ export function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker: Typ
symbolFlags & SymbolFlags.Variable ||
symbolKind === ScriptElementKind.localVariableElement ||
symbolKind === ScriptElementKind.indexSignatureElement ||
symbolKind === ScriptElementKind.variableUsingElement ||
symbolKind === ScriptElementKind.variableAwaitUsingElement ||
isThisExpression) {
displayParts.push(punctuationPart(SyntaxKind.ColonToken));
displayParts.push(spacePart());
@@ -807,6 +817,8 @@ export function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker: Typ
case ScriptElementKind.letElement:
case ScriptElementKind.constElement:
case ScriptElementKind.constructorImplementationElement:
case ScriptElementKind.variableUsingElement:
case ScriptElementKind.variableAwaitUsingElement:
displayParts.push(textOrKeywordPart(symbolKind));
return;
default:

6
src/services/types.ts
View File

@@ -1596,6 +1596,12 @@ export const enum ScriptElementKind {
/** Inside function */
localVariableElement = "local var",
/** using foo = ... */
variableUsingElement = "using",
/** await using foo = ... */
variableAwaitUsingElement = "await using",
/**
* Inside module and script only
* function f() { }