Go all the way back to the original solution

weswigham · weswigham · commit ecd4435986be · 2015-11-12T16:22:35.000-08:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -910,7 +910,7 @@ namespace ts {
                     return;
                 }
 
-                const sourcePathComponents = getNormalizedPathComponents(getCanonicalFileName(sourceFile.fileName), currentDirectory);
+                const sourcePathComponents = getNormalizedPathComponents(sourceFile.fileName, currentDirectory);
                 sourcePathComponents.pop(); // The base file name is not part of the common directory path
 
                 if (!commonPathComponents) {
@@ -919,8 +919,9 @@ namespace ts {
                     return;
                 }
 
+                const caseSensitive = host.useCaseSensitiveFileNames();
                 for (let i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
-                    if (commonPathComponents[i] !== sourcePathComponents[i]) {
+                    if (caseSensitive ? commonPathComponents[i] !== sourcePathComponents[i] : commonPathComponents[i].toLocaleLowerCase() !== sourcePathComponents[i].toLocaleLowerCase()) {
                         if (i === 0) {
                             // Failed to find any common path component
                             return true;
@@ -947,9 +948,7 @@ namespace ts {
                 return currentDirectory;
             }
 
-            const path = getNormalizedPathFromPathComponents(commonPathComponents);
-            const relativePath = convertToRelativePath(path, currentDirectory, getCanonicalFileName);
-            return relativePath;
+            return getNormalizedPathFromPathComponents(commonPathComponents);
         }
 
         function checkSourceFilesBelongToPath(sourceFiles: SourceFile[], rootDirectory: string): boolean {

Original file line number	Diff line number	Diff line change
`@@ -910,7 +910,7 @@ namespace ts {`
`910`	`910`	`return;`
`911`	`911`	`}`
`912`	`912`
`913`		`- const sourcePathComponents = getNormalizedPathComponents(getCanonicalFileName(sourceFile.fileName), currentDirectory);`
	`913`	`+ const sourcePathComponents = getNormalizedPathComponents(sourceFile.fileName, currentDirectory);`
`914`	`914`	`sourcePathComponents.pop(); // The base file name is not part of the common directory path`
`915`	`915`
`916`	`916`	`if (!commonPathComponents) {`
`@@ -919,8 +919,9 @@ namespace ts {`
`919`	`919`	`return;`
`920`	`920`	`}`
`921`	`921`
	`922`	`+ const caseSensitive = host.useCaseSensitiveFileNames();`
`922`	`923`	`for (let i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {`
`923`		`- if (commonPathComponents[i] !== sourcePathComponents[i]) {`
	`924`	`+ if (caseSensitive ? commonPathComponents[i] !== sourcePathComponents[i] : commonPathComponents[i].toLocaleLowerCase() !== sourcePathComponents[i].toLocaleLowerCase()) {`
`924`	`925`	`if (i === 0) {`
`925`	`926`	`// Failed to find any common path component`
`926`	`927`	`return true;`
`@@ -947,9 +948,7 @@ namespace ts {`
`947`	`948`	`return currentDirectory;`
`948`	`949`	`}`
`949`	`950`
`950`		`- const path = getNormalizedPathFromPathComponents(commonPathComponents);`
`951`		`- const relativePath = convertToRelativePath(path, currentDirectory, getCanonicalFileName);`
`952`		`- return relativePath;`
	`951`	`+ return getNormalizedPathFromPathComponents(commonPathComponents);`
`953`	`952`	`}`
`954`	`953`
`955`	`954`	`function checkSourceFilesBelongToPath(sourceFiles: SourceFile[], rootDirectory: string): boolean {`