microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Use string literal type for script kind names

Browse Source
This commit is contained in:
zhengbli
2016-04-19 15:17:36 -07:00
parent a2035a572e
commit cc58e2d7eb
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/harness/harnessLanguageService.ts
View File

@@ -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);
}

2
src/server/client.ts
View File

@@ -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);
}

4
src/server/protocol.d.ts vendored
View File

@@ -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";
}
/**

8
src/server/session.ts
View File

@@ -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;
}

2
tests/cases/fourslash/server/openFileWithSyntaxKind.ts
View File

@@ -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");