From 8177bd4da076be73d07bd3dba8c16a88aac3ba58 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladima@microsoft.com>
Date: Fri, 30 Sep 2016 13:19:54 -0700
Subject: [PATCH] replace hardcodes 'useCaseSensitiveFileNames=false' in
 services with actual value, use specialized map lookup methods instead of
 generic 'getOrCreate*'

---
 src/harness/unittests/tsserverProjectSystem.ts | 18 ++++++++++++++++++
 src/server/editorServices.ts                   |  7 ++++++-
 src/server/project.ts                          |  8 +++++++-
 src/services/services.ts                       |  2 +-
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index c459d2afac2..988e87284c3 100644
--- 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();
+        });
+    });
 }
\ No newline at end of file
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 707f286a9b5..2b28e66bf88 100644
--- 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
index 01858b4cc68..b59efb03cfd 100644
--- 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
index eb103cebb11..b50e1d3313d 100644
--- 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();