Merge pull request #7584 from Microsoft/LS-rename-getSourceFile

vladima · vladima · commit 55cbdc96238c · 2016-03-24T14:05:49.000-07:00
mark LanguageService.getSourceFile as internal and rename it
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -1414,7 +1414,7 @@ namespace FourSlash {
                 return;
             }
 
-            const incrementalSourceFile = this.languageService.getSourceFile(this.activeFile.fileName);
+            const incrementalSourceFile = this.languageService.getNonBoundSourceFile(this.activeFile.fileName);
             Utils.assertInvariants(incrementalSourceFile, /*parent:*/ undefined);
 
             const incrementalSyntaxDiagnostics = incrementalSourceFile.parseDiagnostics;
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -423,7 +423,7 @@ namespace Harness.LanguageService {
         getProgram(): ts.Program {
             throw new Error("Program can not be marshaled across the shim layer.");
         }
-        getSourceFile(fileName: string): ts.SourceFile {
+        getNonBoundSourceFile(fileName: string): ts.SourceFile {
             throw new Error("SourceFile can not be marshaled across the shim layer.");
         }
         dispose(): void { this.shim.dispose({}); }
diff --git a/src/server/client.ts b/src/server/client.ts
@@ -613,7 +613,7 @@ namespace ts.server {
             throw new Error("SourceFile objects are not serializable through the server protocol.");
         }
 
-        getSourceFile(fileName: string): SourceFile {
+        getNonBoundSourceFile(fileName: string): SourceFile {
             throw new Error("SourceFile objects are not serializable through the server protocol.");
         }
 
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1326,7 +1326,7 @@ namespace ts.server {
         }
 
         isExternalModule(filename: string): boolean {
-            const sourceFile = this.languageService.getSourceFile(filename);
+            const sourceFile = this.languageService.getNonBoundSourceFile(filename);
             return ts.isExternalModule(sourceFile);
         }
 
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1112,7 +1112,7 @@ namespace ts {
 
         getProgram(): Program;
 
-        getSourceFile(fileName: string): SourceFile;
+        /* @internal */ getNonBoundSourceFile(fileName: string): SourceFile;
 
         dispose(): void;
     }
@@ -6528,7 +6528,7 @@ namespace ts {
         }
 
         /// Syntactic features
-        function getSourceFile(fileName: string): SourceFile {
+        function getNonBoundSourceFile(fileName: string): SourceFile {
             return syntaxTreeCache.getCurrentSourceFile(fileName);
         }
 
@@ -7616,7 +7616,7 @@ namespace ts {
             getFormattingEditsAfterKeystroke,
             getDocCommentTemplateAtPosition,
             getEmitOutput,
-            getSourceFile,
+            getNonBoundSourceFile,
             getProgram
         };
     }

Original file line number	Diff line number	Diff line change
`@@ -1414,7 +1414,7 @@ namespace FourSlash {`
`1414`	`1414`	`return;`
`1415`	`1415`	`}`
`1416`	`1416`
`1417`		`- const incrementalSourceFile = this.languageService.getSourceFile(this.activeFile.fileName);`
	`1417`	`+ const incrementalSourceFile = this.languageService.getNonBoundSourceFile(this.activeFile.fileName);`
`1418`	`1418`	`Utils.assertInvariants(incrementalSourceFile, /parent:/ undefined);`
`1419`	`1419`
`1420`	`1420`	`const incrementalSyntaxDiagnostics = incrementalSourceFile.parseDiagnostics;`
Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ namespace Harness.LanguageService {`
`423`	`423`	`getProgram(): ts.Program {`
`424`	`424`	`throw new Error("Program can not be marshaled across the shim layer.");`
`425`	`425`	`}`
`426`		`- getSourceFile(fileName: string): ts.SourceFile {`
	`426`	`+ getNonBoundSourceFile(fileName: string): ts.SourceFile {`
`427`	`427`	`throw new Error("SourceFile can not be marshaled across the shim layer.");`
`428`	`428`	`}`
`429`	`429`	`dispose(): void { this.shim.dispose({}); }`
Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ namespace ts.server {`
`613`	`613`	`throw new Error("SourceFile objects are not serializable through the server protocol.");`
`614`	`614`	`}`
`615`	`615`
`616`		`- getSourceFile(fileName: string): SourceFile {`
	`616`	`+ getNonBoundSourceFile(fileName: string): SourceFile {`
`617`	`617`	`throw new Error("SourceFile objects are not serializable through the server protocol.");`
`618`	`618`	`}`
`619`	`619`
Original file line number	Diff line number	Diff line change
`@@ -1326,7 +1326,7 @@ namespace ts.server {`
`1326`	`1326`	`}`
`1327`	`1327`
`1328`	`1328`	`isExternalModule(filename: string): boolean {`
`1329`		`- const sourceFile = this.languageService.getSourceFile(filename);`
	`1329`	`+ const sourceFile = this.languageService.getNonBoundSourceFile(filename);`
`1330`	`1330`	`return ts.isExternalModule(sourceFile);`
`1331`	`1331`	`}`
`1332`	`1332`
Original file line number	Diff line number	Diff line change
`@@ -1112,7 +1112,7 @@ namespace ts {`
`1112`	`1112`
`1113`	`1113`	`getProgram(): Program;`
`1114`	`1114`
`1115`		`- getSourceFile(fileName: string): SourceFile;`
	`1115`	`+ /* @internal */ getNonBoundSourceFile(fileName: string): SourceFile;`
`1116`	`1116`
`1117`	`1117`	`dispose(): void;`
`1118`	`1118`	`}`
`@@ -6528,7 +6528,7 @@ namespace ts {`
`6528`	`6528`	`}`
`6529`	`6529`
`6530`	`6530`	`/// Syntactic features`
`6531`		`- function getSourceFile(fileName: string): SourceFile {`
	`6531`	`+ function getNonBoundSourceFile(fileName: string): SourceFile {`
`6532`	`6532`	`return syntaxTreeCache.getCurrentSourceFile(fileName);`
`6533`	`6533`	`}`
`6534`	`6534`
`@@ -7616,7 +7616,7 @@ namespace ts {`
`7616`	`7616`	`getFormattingEditsAfterKeystroke,`
`7617`	`7617`	`getDocCommentTemplateAtPosition,`
`7618`	`7618`	`getEmitOutput,`
`7619`		`- getSourceFile,`
	`7619`	`+ getNonBoundSourceFile,`
`7620`	`7620`	`getProgram`
`7621`	`7621`	`};`
`7622`	`7622`	`}`