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

Fix to test harness and addressing CR comments

Browse Source
This commit is contained in:
Jason Ramsay
2016-02-16 22:44:43 -08:00
parent a71fa457bd
commit 2aa8f05e64
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/services.ts
View File

@@ -1019,7 +1019,7 @@ namespace ts {
getNewLine?(): string;
getProjectVersion?(): string;
getScriptFileNames(): string[];
getScriptKind(fileName: string): ScriptKind;
getScriptKind?(fileName: string): ScriptKind;
getScriptVersion(fileName: string): string;
getScriptSnapshot(fileName: string): IScriptSnapshot;
getLocalizedDiagnosticMessages?(): any;
@@ -1750,7 +1750,7 @@ namespace ts {
private createEntry(fileName: string, path: Path) {
let entry: HostFileInformation;
const scriptKind = this.host.getScriptKind(fileName);
const scriptKind = this.host.getScriptKind ? this.host.getScriptKind(fileName) : ScriptKind.Unknown;
const scriptSnapshot = this.host.getScriptSnapshot(fileName);
if (scriptSnapshot) {
entry = {
@@ -1823,7 +1823,7 @@ namespace ts {
throw new Error("Could not find file: '" + fileName + "'.");
}
const scriptKind = this.host.getScriptKind(fileName);
const scriptKind = this.host.getScriptKind ? this.host.getScriptKind(fileName) : ScriptKind.Unknown;
const version = this.host.getScriptVersion(fileName);
let sourceFile: SourceFile;

5
src/services/shims.ts
View File

@@ -55,7 +55,7 @@ namespace ts {
/** Returns a JSON-encoded value of the type: string[] */
getScriptFileNames(): string;
getScriptKind(fileName: string): ScriptKind;
getScriptKind?(fileName: string): ScriptKind;
getScriptVersion(fileName: string): string;
getScriptSnapshot(fileName: string): ScriptSnapshotShim;
getLocalizedDiagnosticMessages(): string;
@@ -350,7 +350,8 @@ namespace ts {
public getScriptKind(fileName: string): ScriptKind {
try {
return this.shimHost.getScriptKind(fileName);
} catch (e) {
}
catch (e) {
return ScriptKind.Unknown;
}
}