Merge pull request microsoft#12543 from wonderful-panda/fix-12536

mhegazy · web-flow · commit 6418c2f9bb2b · 2016-12-30T13:23:07.000-08:00
tsserver: get candidates from <K extends keyof Foo> (fix microsoft#12536)
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -114,7 +114,8 @@ namespace ts {
                 // we deliberately exclude augmentations
                 // since we are only interested in declarations of the module itself
                 return tryFindAmbientModule(moduleName, /*withAugmentations*/ false);
-            }
+            },
+            getApparentType
         };
 
         const tupleTypes: GenericType[] = [];
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2372,6 +2372,7 @@ namespace ts {
         getAmbientModules(): Symbol[];
 
         tryGetMemberInModuleExports(memberName: string, moduleSymbol: Symbol): Symbol | undefined;
+        getApparentType(type: Type): Type;
 
         /* @internal */ tryFindAmbientModuleWithoutAugmentations(moduleName: string): Symbol;
 
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -244,6 +244,9 @@ namespace ts.Completions {
         }
 
         function addStringLiteralCompletionsFromType(type: Type, result: CompletionEntry[]): void {
+            if (type && type.flags & TypeFlags.TypeParameter) {
+                type = typeChecker.getApparentType(type);
+            }
             if (!type) {
                 return;
             }
diff --git a/tests/cases/fourslash/completionForStringLiteral5.ts b/tests/cases/fourslash/completionForStringLiteral5.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts'/>
+
+////interface Foo {
+////    foo: string;
+////    bar: string;
+////}
+////
+////function f<K extends keyof Foo>(a: K) { };
+////f("/*1*/
+
+goTo.marker('1');
+verify.completionListContains("foo");
+verify.completionListContains("bar");
+verify.memberListCount(2);
+

Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,9 @@ namespace ts.Completions {`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`function addStringLiteralCompletionsFromType(type: Type, result: CompletionEntry[]): void {`
	`247`	`+ if (type && type.flags & TypeFlags.TypeParameter) {`
	`248`	`+ type = typeChecker.getApparentType(type);`
	`249`	`+ }`
`247`	`250`	`if (!type) {`
`248`	`251`	`return;`
`249`	`252`	`}`