Handle case sensitivity correctly in source map decoder

sheetalkamat · sheetalkamat · commit efe5dd6b6dfb · 2018-10-31T15:14:08.000-07:00
diff --git a/src/compiler/sourcemapDecoder.ts b/src/compiler/sourcemapDecoder.ts
@@ -57,6 +57,7 @@ namespace ts.sourcemaps {
         fileExists(path: string): boolean;
         getCanonicalFileName(path: string): string;
         log(text: string): void;
+        useCaseSensitiveFileNames: boolean;
     }
 
     export function decode(host: SourceMapDecodeHost, mapPath: string, map: SourceMapData, program?: Program, fallbackCache = createSourceFileLikeCache(host)): SourceMapper {
@@ -79,7 +80,7 @@ namespace ts.sourcemaps {
                 // if no exact match, closest is 2's compliment of result
                 targetIndex = ~targetIndex;
             }
-            if (!maps[targetIndex] || comparePaths(loc.fileName, maps[targetIndex].sourcePath, sourceRoot) !== 0) {
+            if (!maps[targetIndex] || comparePaths(loc.fileName, maps[targetIndex].sourcePath, sourceRoot, !host.useCaseSensitiveFileNames) !== 0) {
                 return loc;
             }
             return { fileName: toPath(map.file!, sourceRoot, host.getCanonicalFileName), position: maps[targetIndex].emittedPosition }; // Closest pos
@@ -129,7 +130,7 @@ namespace ts.sourcemaps {
         }
 
         function compareProcessedPositionSourcePositions(a: ProcessedSourceMapPosition, b: ProcessedSourceMapPosition) {
-            return comparePaths(a.sourcePath, b.sourcePath, sourceRoot) ||
+            return comparePaths(a.sourcePath, b.sourcePath, sourceRoot, !host.useCaseSensitiveFileNames) ||
                 compareValues(a.sourcePosition, b.sourcePosition);
         }
 
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1139,7 +1139,7 @@ namespace ts {
         const useCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames(host);
         const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
 
-        const sourceMapper = getSourceMapper(getCanonicalFileName, currentDirectory, log, host, () => program);
+        const sourceMapper = getSourceMapper(useCaseSensitiveFileNames, currentDirectory, log, host, () => program);
 
         function getValidSourceFile(fileName: string): SourceFile {
             const sourceFile = program.getSourceFile(fileName);
diff --git a/src/services/sourcemaps.ts b/src/services/sourcemaps.ts
@@ -13,12 +13,13 @@ namespace ts {
     }
 
     export function getSourceMapper(
-        getCanonicalFileName: GetCanonicalFileName,
+        useCaseSensitiveFileNames: boolean,
         currentDirectory: string,
         log: (message: string) => void,
         host: LanguageServiceHost,
         getProgram: () => Program,
     ): SourceMapper {
+        const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
         let sourcemappedFileCache: SourceFileLikeCache;
         return { tryGetOriginalLocation, tryGetGeneratedLocation, toLineColumnOffset, clearCache };
 
@@ -56,6 +57,7 @@ namespace ts {
             return file.sourceMapper = sourcemaps.decode({
                 readFile: s => host.readFile!(s), // TODO: GH#18217
                 fileExists: s => host.fileExists!(s), // TODO: GH#18217
+                useCaseSensitiveFileNames,
                 getCanonicalFileName,
                 log,
             }, mapFileName, maps, getProgram(), sourcemappedFileCache);
@@ -105,7 +107,11 @@ namespace ts {
 
         function tryGetGeneratedLocation(info: sourcemaps.SourceMappableLocation): sourcemaps.SourceMappableLocation | undefined {
             const program = getProgram();
-            const declarationPath = getDeclarationEmitOutputFilePathWorker(info.fileName, program.getCompilerOptions(), currentDirectory, program.getCommonSourceDirectory(), getCanonicalFileName);
+            const options = program.getCompilerOptions();
+            const outPath = options.outFile || options.out;
+            const declarationPath = outPath ?
+                removeFileExtension(outPath) + Extension.Dts :
+                getDeclarationEmitOutputFilePathWorker(info.fileName, program.getCompilerOptions(), currentDirectory, program.getCommonSourceDirectory(), getCanonicalFileName);
             if (declarationPath === undefined) return undefined;
             const declarationFile = getFile(declarationPath);
             if (!declarationFile) return undefined;

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ namespace ts.sourcemaps {`
`57`	`57`	`fileExists(path: string): boolean;`
`58`	`58`	`getCanonicalFileName(path: string): string;`
`59`	`59`	`log(text: string): void;`
	`60`	`+ useCaseSensitiveFileNames: boolean;`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`export function decode(host: SourceMapDecodeHost, mapPath: string, map: SourceMapData, program?: Program, fallbackCache = createSourceFileLikeCache(host)): SourceMapper {`
`@@ -79,7 +80,7 @@ namespace ts.sourcemaps {`
`79`	`80`	`// if no exact match, closest is 2's compliment of result`
`80`	`81`	`targetIndex = ~targetIndex;`
`81`	`82`	`}`
`82`		`- if (!maps[targetIndex] \|\| comparePaths(loc.fileName, maps[targetIndex].sourcePath, sourceRoot) !== 0) {`
	`83`	`+ if (!maps[targetIndex] \|\| comparePaths(loc.fileName, maps[targetIndex].sourcePath, sourceRoot, !host.useCaseSensitiveFileNames) !== 0) {`
`83`	`84`	`return loc;`
`84`	`85`	`}`
`85`	`86`	`return { fileName: toPath(map.file!, sourceRoot, host.getCanonicalFileName), position: maps[targetIndex].emittedPosition }; // Closest pos`
`@@ -129,7 +130,7 @@ namespace ts.sourcemaps {`
`129`	`130`	`}`
`130`	`131`
`131`	`132`	`function compareProcessedPositionSourcePositions(a: ProcessedSourceMapPosition, b: ProcessedSourceMapPosition) {`
`132`		`- return comparePaths(a.sourcePath, b.sourcePath, sourceRoot) \|\|`
	`133`	`+ return comparePaths(a.sourcePath, b.sourcePath, sourceRoot, !host.useCaseSensitiveFileNames) \|\|`
`133`	`134`	`compareValues(a.sourcePosition, b.sourcePosition);`
`134`	`135`	`}`
`135`	`136`