replace hardcodes 'useCaseSensitiveFileNames=false' in services with actual value, use specialized map lookup methods instead of generic 'getOrCreate*'

vladima · vladima · commit 8177bd4da076 · 2016-09-30T13:19:54.000-07:00
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -2045,4 +2045,22 @@ namespace ts.projectSystem {
             assert.equal(snap.getLength(), expectedLength, "Incorrect snapshot size");
         }
     });
+
+    describe("Language service", () => {
+        it("should work correctly on case-sensitive file systems", () => {
+            const lib = {
+                path: "/a/Lib/lib.d.ts",
+                content: "let x: number"
+            };
+            const f = {
+                path: "/a/b/app.ts",
+                content: "let x = 1;"
+            };
+            const host = createServerHost([lib, f], { executingFilePath: "/a/Lib/tsc.js", useCaseSensitiveFileNames: true });
+            const projectService = createProjectService(host);
+            projectService.openClientFile(f.path);
+            projectService.checkNumberOfProjects({ inferredProjects: 1 });
+            projectService.inferredProjects[0].getLanguageService().getProgram();
+        });
+    });
 }
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1001,9 +1001,14 @@ namespace ts.server {
         }
 
         getScriptInfoForNormalizedPath(fileName: NormalizedPath) {
-            return this.filenameToScriptInfo.get(normalizedPathToPath(fileName, this.host.getCurrentDirectory(), this.toCanonicalFileName));
+            return this.getScriptInfoForPath(normalizedPathToPath(fileName, this.host.getCurrentDirectory(), this.toCanonicalFileName));
         }
 
+        getScriptInfoForPath(fileName: Path) {
+            return this.filenameToScriptInfo.get(fileName);
+        }
+
+
         setHostConfiguration(args: protocol.ConfigureRequestArguments) {
             if (args.file) {
                 const info = this.getScriptInfoForNormalizedPath(toNormalizedPath(args.file));
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -215,7 +215,13 @@ namespace ts.server {
         }
 
         getScriptInfos() {
-            return map(this.program.getSourceFiles(), sourceFile => this.getScriptInfoLSHost(sourceFile.path));
+            return map(this.program.getSourceFiles(), sourceFile => {
+                const scriptInfo = this.projectService.getScriptInfoForPath(sourceFile.path);
+                if (!scriptInfo) {
+                    Debug.assert(false, `scriptInfo for a file '${sourceFile.fileName}' is missing.`);
+                }
+                return scriptInfo;
+            });
         }
 
         getFileEmitOutput(info: ScriptInfo, emitOnlyDtsFiles: boolean) {
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -947,7 +947,7 @@ namespace ts {
 
         let lastTypesRootVersion = 0;
 
-        const useCaseSensitivefileNames = false;
+        const useCaseSensitivefileNames = host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames();
         const cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
 
         const currentDirectory = host.getCurrentDirectory();

Original file line number	Diff line number	Diff line change
`@@ -1001,9 +1001,14 @@ namespace ts.server {`
`1001`	`1001`	`}`
`1002`	`1002`
`1003`	`1003`	`getScriptInfoForNormalizedPath(fileName: NormalizedPath) {`
`1004`		`- return this.filenameToScriptInfo.get(normalizedPathToPath(fileName, this.host.getCurrentDirectory(), this.toCanonicalFileName));`
	`1004`	`+ return this.getScriptInfoForPath(normalizedPathToPath(fileName, this.host.getCurrentDirectory(), this.toCanonicalFileName));`
`1005`	`1005`	`}`
`1006`	`1006`
	`1007`	`+ getScriptInfoForPath(fileName: Path) {`
	`1008`	`+ return this.filenameToScriptInfo.get(fileName);`
	`1009`	`+ }`
	`1010`	`+`
	`1011`	`+`
`1007`	`1012`	`setHostConfiguration(args: protocol.ConfigureRequestArguments) {`
`1008`	`1013`	`if (args.file) {`
`1009`	`1014`	`const info = this.getScriptInfoForNormalizedPath(toNormalizedPath(args.file));`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,13 @@ namespace ts.server {`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`getScriptInfos() {`
`218`		`- return map(this.program.getSourceFiles(), sourceFile => this.getScriptInfoLSHost(sourceFile.path));`
	`218`	`+ return map(this.program.getSourceFiles(), sourceFile => {`
	`219`	`+ const scriptInfo = this.projectService.getScriptInfoForPath(sourceFile.path);`
	`220`	`+ if (!scriptInfo) {`
	`221`	+ Debug.assert(false, `scriptInfo for a file '${sourceFile.fileName}' is missing.`);
	`222`	`+ }`
	`223`	`+ return scriptInfo;`
	`224`	`+ });`
`219`	`225`	`}`
`220`	`226`
`221`	`227`	`getFileEmitOutput(info: ScriptInfo, emitOnlyDtsFiles: boolean) {`