microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-10 18:04:18 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Lookup files by resolved Path and not by fileName in sourcemapDecoder when querying program (#25908)

Browse Source 
* Check if the file returned by the program actually refers to the same file as we intend

* Simplify
This commit is contained in:
Wesley Wigham
2018-07-24 15:44:22 -07:00
committed by GitHub
parent f6d3ac9b5d
commit 23eb591e01
3 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/sourcemapDecoder.ts
View File

@@ -98,10 +98,10 @@ namespace ts.sourcemaps {
function getSourceFileLike(fileName: string, location: string): SourceFileLike | undefined {
// Lookup file in program, if provided
const file = program && program.getSourceFile(fileName);
const path = toPath(fileName, location, host.getCanonicalFileName);
const file = program && program.getSourceFile(path);
if (!file) {
// Otherwise check the cache (which may hit disk)
const path = toPath(fileName, location, host.getCanonicalFileName);
return fallbackCache.get(path);
}
return file;

2
src/harness/fourslash.ts
View File

@@ -709,7 +709,7 @@ namespace FourSlash {
ts.zipWith(endMarkers, definitions, (endMarker, definition, i) => {
const marker = this.getMarkerByName(endMarker);
if (marker.fileName !== definition.fileName || marker.position !== definition.textSpan.start) {
if (ts.comparePaths(marker.fileName, definition.fileName, /*ignoreCase*/ true) !== ts.Comparison.EqualTo || marker.position !== definition.textSpan.start) {
this.raiseError(`${testName} failed for definition ${endMarker} (${i}): expected ${marker.fileName} at ${marker.position}, got ${definition.fileName} at ${definition.textSpan.start}`);
}
});