From 52841924dad0909e1284352d1ab9b14c00437fda Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 31 Jan 2017 16:35:30 -0800
Subject: [PATCH] Support string literal completion in case labels

---
 src/services/completions.ts                   | 28 ++++++++-----------
 .../fourslash/completionForStringLiteral11.ts | 14 ++++++++++
 2 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 tests/cases/fourslash/completionForStringLiteral11.ts

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 5d70b357625..4c882c9b6b6 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -174,9 +174,16 @@ namespace ts.Completions {
             return getStringLiteralCompletionEntriesFromModuleNames(<StringLiteral>node, compilerOptions, host, typeChecker);
         }
         else if (isEqualityExpression(node.parent)) {
-            // Get all known external module names or complete a path to a module
+            // Get completions from the type of the other operand
+            // i.e. switch (a) {
+            //         case '/*completion position*/'
+            //      }
+            return getStringLiteralCompletionEntriesFromType(typeChecker.getTypeAtLocation(node.parent.left === node ? node.parent.right : node.parent.left), typeChecker);
+        }
+        else if (isCaseOrDefaultClause(node.parent)) {
+            // Get completions from the type of the switch expression
             // i.e. x === '/*completion position'
-            return getStringLiteralCompletionEntriesFromBinaryExpression(<StringLiteral>node, node.parent, typeChecker);
+            return getStringLiteralCompletionEntriesFromType(typeChecker.getTypeAtLocation((<SwitchStatement>node.parent.parent.parent).expression), typeChecker);
         }
         else {
             const argumentInfo = SignatureHelp.getImmediatelyContainingArgumentInfo(node, position, sourceFile);
@@ -189,7 +196,7 @@ namespace ts.Completions {
 
             // Get completion for string literal from string literal type
             // i.e. var x: "hi" | "hello" = "/*completion position*/"
-            return getStringLiteralCompletionEntriesFromContextualType(<StringLiteral>node, typeChecker);
+            return getStringLiteralCompletionEntriesFromType(typeChecker.getContextualType(<StringLiteral>node), typeChecker);
         }
     }
 
@@ -233,20 +240,7 @@ namespace ts.Completions {
         return undefined;
     }
 
-    function getStringLiteralCompletionEntriesFromContextualType(node: StringLiteral, typeChecker: TypeChecker): CompletionInfo | undefined {
-        const type = typeChecker.getContextualType(node);
-        if (type) {
-            const entries: CompletionEntry[] = [];
-            addStringLiteralCompletionsFromType(type, entries, typeChecker);
-            if (entries.length) {
-                return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries };
-            }
-        }
-        return undefined;
-    }
-
-    function getStringLiteralCompletionEntriesFromBinaryExpression(node: StringLiteral, parent: BinaryExpression, typeChecker: TypeChecker): CompletionInfo | undefined {
-        const type = typeChecker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+    function getStringLiteralCompletionEntriesFromType(type: Type, typeChecker: TypeChecker): CompletionInfo | undefined {
         if (type) {
             const entries: CompletionEntry[] = [];
             addStringLiteralCompletionsFromType(type, entries, typeChecker);
diff --git a/tests/cases/fourslash/completionForStringLiteral11.ts b/tests/cases/fourslash/completionForStringLiteral11.ts
new file mode 100644
index 00000000000..f6acac28a65
--- /dev/null
+++ b/tests/cases/fourslash/completionForStringLiteral11.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////type As = 'arf' | 'abacus' | 'abaddon';
+////let a: As;
+////switch (a) {
+////    case '/**/
+////}
+
+goTo.marker();
+verify.completionListContains("arf");
+verify.completionListContains("abacus");
+verify.completionListContains("abaddon");
+verify.completionListCount(3);
+