Merge pull request microsoft#26169 from Microsoft/largeFile

sheetalkamat · web-flow · commit 77e29b7f0e8e · 2018-08-03T10:38:02.000-07:00
Do not read files greater than maxFileSize which is currently 4mb
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1,5 +1,7 @@
 namespace ts.server {
     export const maxProgramSizeForNonTsFiles = 20 * 1024 * 1024;
+    /*@internal*/
+    export const maxFileSize = 4 * 1024 * 1024;
 
     // tslint:disable variable-name
     export const ProjectsUpdatedInBackgroundEvent = "projectsUpdatedInBackground";
diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts
@@ -163,7 +163,10 @@ namespace ts.server {
         }
 
         private getFileText(tempFileName?: string) {
-            return this.host.readFile(tempFileName || this.fileName) || "";
+            let text: string;
+            const getText = () => text === undefined ? (text = this.host.readFile(tempFileName || this.fileName) || "") : text;
+            const size = this.host.getFileSize ? this.host.getFileSize(tempFileName || this.fileName) : getText().length;
+            return size > maxFileSize ? "" : getText();
         }
 
         private switchToScriptVersionCache(): ScriptVersionCache {
diff --git a/src/testRunner/unittests/tsserverProjectSystem.ts b/src/testRunner/unittests/tsserverProjectSystem.ts
@@ -9020,6 +9020,51 @@ export const x = 10;`
         });
     });
 
+    describe("tsserverProjectSystem with large file", () => {
+        const projectRoot = "/user/username/projects/project";
+        const largeFile: File = {
+            path: `${projectRoot}/src/large.ts`,
+            content: "export var x = 10;",
+            fileSize: server.maxFileSize + 1
+        };
+
+        it("when large file is included by tsconfig", () => {
+            const file: File = {
+                path: `${projectRoot}/src/file.ts`,
+                content: "export var y = 10;"
+            };
+            const tsconfig: File = {
+                path: `${projectRoot}/tsconfig.json`,
+                content: JSON.stringify({ files: ["src/file.ts", "src/large.ts"] })
+            };
+            const files = [file, largeFile, libFile, tsconfig];
+            const host = createServerHost(files);
+            const service = createProjectService(host);
+            service.openClientFile(file.path);
+            service.checkNumberOfProjects({ configuredProjects: 1 });
+            const project = service.configuredProjects.get(tsconfig.path)!;
+            checkProjectActualFiles(project, [file.path, libFile.path, largeFile.path, tsconfig.path]);
+            const info = service.getScriptInfo(largeFile.path)!;
+            assert.equal(info.cacheSourceFile.sourceFile.text, "");
+        });
+
+        it("when large file is included by module resolution", () => {
+            const file: File = {
+                path: `${projectRoot}/src/file.ts`,
+                content: `export var y = 10;import {x} from "./large"`
+            };
+            const files = [file, largeFile, libFile];
+            const host = createServerHost(files);
+            const service = createProjectService(host);
+            service.openClientFile(file.path);
+            service.checkNumberOfProjects({ inferredProjects: 1 });
+            const project = service.inferredProjects[0];
+            checkProjectActualFiles(project, [file.path, libFile.path, largeFile.path]);
+            const info = service.getScriptInfo(largeFile.path)!;
+            assert.equal(info.cacheSourceFile.sourceFile.text, "");
+        });
+    });
+
     describe("tsserverProjectSystem syntax operations", () => {
         function navBarFull(session: TestSession, file: File) {
             return JSON.stringify(session.executeCommandSeq<protocol.FileRequest>({
@@ -9575,7 +9620,7 @@ export function Test2() {
         });
     });
 
-    describe("duplicate packages", () => {
+    describe("tsserverProjectSystem duplicate packages", () => {
         // Tests that 'moduleSpecifiers.ts' will import from the redirecting file, and not from the file it redirects to, if that can provide a global module specifier.
         it("works with import fixes", () => {
             const packageContent = "export const foo: number;";

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,10 @@ namespace ts.server {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`private getFileText(tempFileName?: string) {`
`166`		`- return this.host.readFile(tempFileName \|\| this.fileName) \|\| "";`
	`166`	`+ let text: string;`
	`167`	`+ const getText = () => text === undefined ? (text = this.host.readFile(tempFileName \|\| this.fileName) \|\| "") : text;`
	`168`	`+ const size = this.host.getFileSize ? this.host.getFileSize(tempFileName \|\| this.fileName) : getText().length;`
	`169`	`+ return size > maxFileSize ? "" : getText();`
`167`	`170`	`}`
`168`	`171`
`169`	`172`	`private switchToScriptVersionCache(): ScriptVersionCache {`