fix completions for string literal types with template string (microsoft#19162)

Kingwl · Kingwl · commit f1904a93f5cc · 2017-11-10T22:17:09.000+08:00
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -213,7 +213,7 @@ namespace ts.Completions {
 
     function getStringLiteralCompletionEntries(sourceFile: SourceFile, position: number, typeChecker: TypeChecker, compilerOptions: CompilerOptions, host: LanguageServiceHost, log: Log): CompletionInfo | undefined {
         const node = findPrecedingToken(position, sourceFile);
-        if (!node || node.kind !== SyntaxKind.StringLiteral) {
+        if (!node || (node.kind !== SyntaxKind.StringLiteral && node.kind !== SyntaxKind.NoSubstitutionTemplateLiteral)) {
             return undefined;
         }
 
@@ -278,7 +278,7 @@ namespace ts.Completions {
 
             // Get completion for string literal from string literal type
             // i.e. var x: "hi" | "hello" = "/*completion position*/"
-            return getStringLiteralCompletionEntriesFromType(typeChecker.getContextualType(<StringLiteral>node), typeChecker);
+            return getStringLiteralCompletionEntriesFromType(typeChecker.getContextualType(<LiteralExpression>node), typeChecker);
         }
     }
 
diff --git a/tests/cases/fourslash/completionListAfterStringLiteralTypeWithNoSubstitutionTemplateLiteral.ts b/tests/cases/fourslash/completionListAfterStringLiteralTypeWithNoSubstitutionTemplateLiteral.ts
@@ -0,0 +1,8 @@
+/// <reference path="fourslash.ts" />
+
+////let count: 'one' | 'two';
+////count = `/**/`
+
+goTo.marker();
+verify.completionListContains('one');
+verify.completionListContains('two');

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ namespace ts.Completions {`
`213`	`213`
`214`	`214`	`function getStringLiteralCompletionEntries(sourceFile: SourceFile, position: number, typeChecker: TypeChecker, compilerOptions: CompilerOptions, host: LanguageServiceHost, log: Log): CompletionInfo \| undefined {`
`215`	`215`	`const node = findPrecedingToken(position, sourceFile);`
`216`		`- if (!node \|\| node.kind !== SyntaxKind.StringLiteral) {`
	`216`	`+ if (!node \|\| (node.kind !== SyntaxKind.StringLiteral && node.kind !== SyntaxKind.NoSubstitutionTemplateLiteral)) {`
`217`	`217`	`return undefined;`
`218`	`218`	`}`
`219`	`219`
`@@ -278,7 +278,7 @@ namespace ts.Completions {`
`278`	`278`
`279`	`279`	`// Get completion for string literal from string literal type`
`280`	`280`	`// i.e. var x: "hi" \| "hello" = "/completion position/"`
`281`		`- return getStringLiteralCompletionEntriesFromType(typeChecker.getContextualType(<StringLiteral>node), typeChecker);`
	`281`	`+ return getStringLiteralCompletionEntriesFromType(typeChecker.getContextualType(<LiteralExpression>node), typeChecker);`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`