maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #26140 from Kingwl/completionUnionType

Browse source 
improve completions for union type in type arguments
This commit is contained in:
Sheetal Nandi 2018-08-13 10:36:19 -07:00 committed by GitHub
parent fe387cc7f0 23601a10b8
commit 2b83b67aa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/services/completions.ts
View file

@ -402,6 +402,8 @@ namespace ts.Completions {
return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode((node.parent.parent as IndexedAccessTypeNode).objectType));
case SyntaxKind.ImportType:
return { kind: StringLiteralCompletionKind.Paths, paths: PathCompletions.getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
case SyntaxKind.UnionType:
return isTypeReferenceNode(node.parent.parent.parent) ? { kind: StringLiteralCompletionKind.Types, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(node.parent.parent as UnionTypeNode)), isNewIdentifier: false } : undefined;
default:
return undefined;
}

12
tests/cases/fourslash/completionListForStringUnion.ts Normal file
View file

@ -0,0 +1,12 @@
/// <reference path='fourslash.ts' />
//// type A = 'fooooo' | 'barrrrr';
//// type B<T extends A> = {};
//// type C = B<'fooooo' | '/**/'>
goTo.marker();
verify.completionListContains("fooooo");
verify.completionListContains("barrrrr");
edit.insert("b");
verify.completionListContains("barrrrr");