Use string literal type for script kind names

zhengbli · zhengbli · commit cc58e2d7eb14 · 2016-04-19T15:20:05.000-07:00
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -496,7 +496,7 @@ namespace Harness.LanguageService {
             this.client = client;
         }
 
-        openFile(fileName: string, content?: string, scriptKindName?: string): void {
+        openFile(fileName: string, content?: string, scriptKindName?: "TS" | "JS" | "TSX" | "JSX"): void {
             super.openFile(fileName, content, scriptKindName);
             this.client.openFile(fileName, content, scriptKindName);
         }
diff --git a/src/server/client.ts b/src/server/client.ts
@@ -120,7 +120,7 @@ namespace ts.server {
             return response;
         }
 
-        openFile(fileName: string, content?: string, scriptKindName?: string): void {
+        openFile(fileName: string, content?: string, scriptKindName?: "TS" | "JS" | "TSX"  | "JSX"): void {
             var args: protocol.OpenRequestArgs = { file: fileName, fileContent: content, scriptKindName };
             this.processRequest(CommandNames.Open, args);
         }
diff --git a/src/server/protocol.d.ts b/src/server/protocol.d.ts
@@ -520,9 +520,9 @@ declare namespace ts.server.protocol {
         fileContent?: string;
         /**
          * Used to specify the script kind of the file explicitly. It could be one of the following:
-         *      ".ts", ".js", ".tsx", ".jsx"
+         *      "TS", "JS", "TSX", "JSX"
          */
-        scriptKindName?: string;
+        scriptKindName?: "TS" | "JS" | "TSX" | "JSX";
     }
 
     /**
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -969,16 +969,16 @@ namespace ts.server {
                 const openArgs = <protocol.OpenRequestArgs>request.arguments;
                 let scriptKind: ScriptKind;
                 switch (openArgs.scriptKindName) {
-                    case ".ts":
+                    case "TS":
                         scriptKind = ScriptKind.TS;
                         break;
-                    case ".js":
+                    case "JS":
                         scriptKind = ScriptKind.JS;
                         break;
-                    case ".tsx":
+                    case "TSX":
                         scriptKind = ScriptKind.TSX;
                         break;
-                    case ".jsx":
+                    case "JSX":
                         scriptKind = ScriptKind.JSX;
                         break;
                 }
diff --git a/tests/cases/fourslash/server/openFileWithSyntaxKind.ts b/tests/cases/fourslash/server/openFileWithSyntaxKind.ts
@@ -14,6 +14,6 @@
 //// var t;
 //// t.
 
-goTo.file("test.ts", /*content*/ undefined, ".js");
+goTo.file("test.ts", /*content*/ undefined, "JS");
 goTo.eof();
 verify.completionListContains("toExponential");

Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ namespace Harness.LanguageService {`
`496`	`496`	`this.client = client;`
`497`	`497`	`}`
`498`	`498`
`499`		`- openFile(fileName: string, content?: string, scriptKindName?: string): void {`
	`499`	`+ openFile(fileName: string, content?: string, scriptKindName?: "TS" \| "JS" \| "TSX" \| "JSX"): void {`
`500`	`500`	`super.openFile(fileName, content, scriptKindName);`
`501`	`501`	`this.client.openFile(fileName, content, scriptKindName);`
`502`	`502`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ namespace ts.server {`
`120`	`120`	`return response;`
`121`	`121`	`}`
`122`	`122`
`123`		`- openFile(fileName: string, content?: string, scriptKindName?: string): void {`
	`123`	`+ openFile(fileName: string, content?: string, scriptKindName?: "TS" \| "JS" \| "TSX" \| "JSX"): void {`
`124`	`124`	`var args: protocol.OpenRequestArgs = { file: fileName, fileContent: content, scriptKindName };`
`125`	`125`	`this.processRequest(CommandNames.Open, args);`
`126`	`126`	`}`