Add 'string' ScriptElementKind (microsoft#23821)

Andy · web-flow · commit 2604bb4dd366 · 2018-05-07T12:39:00.000-07:00
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -81,7 +81,7 @@ namespace ts.Completions {
                 return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, entries };
             }
             case StringLiteralCompletionKind.Types: {
-                const entries = completion.types.map(type => ({ name: type.value, kindModifiers: ScriptElementKindModifier.none, kind: ScriptElementKind.typeElement, sortText: "0" }));
+                const entries = completion.types.map(type => ({ name: type.value, kindModifiers: ScriptElementKindModifier.none, kind: ScriptElementKind.string, sortText: "0" }));
                 return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: completion.isNewIdentifier, entries };
             }
             default:
diff --git a/src/services/types.ts b/src/services/types.ts
@@ -995,6 +995,9 @@ namespace ts {
          * <JsxTagName attribute1 attribute2={0} />
          */
         jsxAttribute = "JSX attribute",
+
+        /** String literal */
+        string = "string",
     }
 
     export const enum ScriptElementKindModifier {
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -5021,7 +5021,9 @@ declare namespace ts {
         /**
          * <JsxTagName attribute1 attribute2={0} />
          */
-        jsxAttribute = "JSX attribute"
+        jsxAttribute = "JSX attribute",
+        /** String literal */
+        string = "string"
     }
     enum ScriptElementKindModifier {
         none = "",
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -5021,7 +5021,9 @@ declare namespace ts {
         /**
          * <JsxTagName attribute1 attribute2={0} />
          */
-        jsxAttribute = "JSX attribute"
+        jsxAttribute = "JSX attribute",
+        /** String literal */
+        string = "string"
     }
     enum ScriptElementKindModifier {
         none = "",
diff --git a/tests/cases/fourslash/completionForStringLiteral_details.ts b/tests/cases/fourslash/completionForStringLiteral_details.ts
@@ -21,7 +21,7 @@ goTo.marker("path");
 verify.completionListContains("other", "other", "", "script");
 
 goTo.marker("type");
-verify.completionListContains("a", "a", "", "type");
+verify.completionListContains("a", "a", "", "string");
 
 goTo.marker("prop");
 verify.completionListContains("x", "(property) I.x: number", "Prop doc ", "property");

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ namespace ts.Completions {`
`81`	`81`	`return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, entries };`
`82`	`82`	`}`
`83`	`83`	`case StringLiteralCompletionKind.Types: {`
`84`		`- const entries = completion.types.map(type => ({ name: type.value, kindModifiers: ScriptElementKindModifier.none, kind: ScriptElementKind.typeElement, sortText: "0" }));`
	`84`	`+ const entries = completion.types.map(type => ({ name: type.value, kindModifiers: ScriptElementKindModifier.none, kind: ScriptElementKind.string, sortText: "0" }));`
`85`	`85`	`return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: completion.isNewIdentifier, entries };`
`86`	`86`	`}`
`87`	`87`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -995,6 +995,9 @@ namespace ts {`
`995`	`995`	`* <JsxTagName attribute1 attribute2={0} />`
`996`	`996`	`*/`
`997`	`997`	`jsxAttribute = "JSX attribute",`
	`998`	`+`
	`999`	`+ /** String literal */`
	`1000`	`+ string = "string",`
`998`	`1001`	`}`
`999`	`1002`
`1000`	`1003`	`export const enum ScriptElementKindModifier {`