Merge pull request microsoft#9213 from zhengbli/fixRealPath

Zhengbo Li · web-flow · commit 7b3abc682b7c · 2016-06-20T14:07:09.000-07:00
ignore casing when converting a source file path to relative path
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -2330,7 +2330,9 @@ namespace ts {
 
     export function getSourceFilePathInNewDir(sourceFile: SourceFile, host: EmitHost, newDirPath: string) {
         let sourceFilePath = getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory());
-        sourceFilePath = sourceFilePath.replace(host.getCommonSourceDirectory(), "");
+        const commonSourceDirectory = host.getCommonSourceDirectory();
+        const isSourceFileInCommonSourceDirectory = host.getCanonicalFileName(sourceFilePath).indexOf(host.getCanonicalFileName(commonSourceDirectory)) === 0;
+        sourceFilePath = isSourceFileInCommonSourceDirectory ? sourceFilePath.substring(commonSourceDirectory.length) : sourceFilePath;
         return combinePaths(newDirPath, sourceFilePath);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2330,7 +2330,9 @@ namespace ts {`
`2330`	`2330`
`2331`	`2331`	`export function getSourceFilePathInNewDir(sourceFile: SourceFile, host: EmitHost, newDirPath: string) {`
`2332`	`2332`	`let sourceFilePath = getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory());`
`2333`		`- sourceFilePath = sourceFilePath.replace(host.getCommonSourceDirectory(), "");`
	`2333`	`+ const commonSourceDirectory = host.getCommonSourceDirectory();`
	`2334`	`+ const isSourceFileInCommonSourceDirectory = host.getCanonicalFileName(sourceFilePath).indexOf(host.getCanonicalFileName(commonSourceDirectory)) === 0;`
	`2335`	`+ sourceFilePath = isSourceFileInCommonSourceDirectory ? sourceFilePath.substring(commonSourceDirectory.length) : sourceFilePath;`
`2334`	`2336`	`return combinePaths(newDirPath, sourceFilePath);`
`2335`	`2337`	`}`
`2336`	`2338`