microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-12 04:17:34 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(31909): show suggestions for second type argument of generic (#36024)

Browse Source
This commit is contained in:
Alexander T 2020-01-07 13:03:22 +02:00 committed by Orta
parent 88677de380
commit 8ed92dcecd
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/services/completions.ts
View File

@ -2077,7 +2077,7 @@ namespace ts.Completions {
switch (contextToken.kind) {
case SyntaxKind.CommaToken:
return containingNodeKind === SyntaxKind.VariableDeclaration ||
containingNodeKind === SyntaxKind.VariableDeclarationList ||
isVariableDeclarationListButNotTypeArgument(contextToken) ||
containingNodeKind === SyntaxKind.VariableStatement ||
containingNodeKind === SyntaxKind.EnumDeclaration || // enum a { foo, |
isFunctionLikeButNotConstructor(containingNodeKind) ||
@ -2209,6 +2209,11 @@ namespace ts.Completions {
return false;
}
function isVariableDeclarationListButNotTypeArgument(node: Node): boolean {
return node.parent.kind === SyntaxKind.VariableDeclarationList
&& !isPossiblyTypeArgumentPosition(node, sourceFile, typeChecker);
}
/**
* Filters out completion suggestions for named imports or exports.
*

12
tests/cases/fourslash/completionsAtGenericTypeArguments.ts Normal file
View File

@ -0,0 +1,12 @@
/// <reference path='fourslash.ts' />
////class Foo<T1, T2> {}
////const foo = new Foo</*1*/, /*2*/,
////
////function foo<T1, T2>() {}
////const f = foo</*3*/, /*4*/,
verify.completions({ marker: "1", exact: completion.globalTypesPlus(['Foo']) });
verify.completions({ marker: "2", exact: completion.globalTypesPlus(['Foo']) });
verify.completions({ marker: "3", exact: completion.globalTypesPlus(['Foo']) });
verify.completions({ marker: "4", exact: completion.globalTypesPlus(['Foo']) });