Store + use the resolved path of sourceFiles in proj. ref. scenarios

RyanCavanaugh · RyanCavanaugh · commit 7e9e29ce6421 · 2018-06-01T13:20:57.000-07:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -987,7 +987,7 @@ namespace ts {
 
             for (const oldSourceFile of oldSourceFiles) {
                 let newSourceFile = host.getSourceFileByPath
-                    ? host.getSourceFileByPath(oldSourceFile.fileName, oldSourceFile.path, options.target!, /*onError*/ undefined, shouldCreateNewSourceFile)
+                    ? host.getSourceFileByPath(oldSourceFile.fileName, oldSourceFile.resolvedPath || oldSourceFile.path, options.target!, /*onError*/ undefined, shouldCreateNewSourceFile)
                     : host.getSourceFile(oldSourceFile.fileName, options.target!, /*onError*/ undefined, shouldCreateNewSourceFile); // TODO: GH#18217
 
                 if (!newSourceFile) {
@@ -1991,6 +1991,7 @@ namespace ts {
             if (file) {
                 sourceFilesFoundSearchingNodeModules.set(path, currentNodeModulesDepth > 0);
                 file.path = path;
+                file.resolvedPath = toPath(fileName);
 
                 if (host.useCaseSensitiveFileNames()) {
                     const pathLowerCase = path.toLowerCase();
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2551,6 +2551,7 @@ namespace ts {
         fileName: string;
         /* @internal */ path: Path;
         text: string;
+        /* @internal */ resolvedPath: Path;
 
         /**
          * If two source files are for the same version of the same package, one will redirect to the other.
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -629,8 +629,8 @@ namespace ts.server {
                 return this.rootFiles;
             }
             return map(this.program.getSourceFiles(), sourceFile => {
-                const scriptInfo = this.projectService.getScriptInfoForPath(sourceFile.path);
-                Debug.assert(!!scriptInfo, "getScriptInfo", () => `scriptInfo for a file '${sourceFile.fileName}' Path: '${sourceFile.path}' is missing.`);
+                const scriptInfo = this.projectService.getScriptInfoForPath(sourceFile.resolvedPath || sourceFile.path);
+                Debug.assert(!!scriptInfo, "getScriptInfo", () => `scriptInfo for a file '${sourceFile.fileName}' Path: '${sourceFile.path}' / '${sourceFile.resolvedPath}' is missing.`);
                 return scriptInfo!;
             });
         }
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -540,6 +540,7 @@ namespace ts {
         public _declarationBrand: any;
         public fileName: string;
         public path: Path;
+        public resolvedPath: Path;
         public text: string;
         public scriptSnapshot: IScriptSnapshot;
         public lineMap: ReadonlyArray<number>;

Original file line number	Diff line number	Diff line change
`@@ -629,8 +629,8 @@ namespace ts.server {`
`629`	`629`	`return this.rootFiles;`
`630`	`630`	`}`
`631`	`631`	`return map(this.program.getSourceFiles(), sourceFile => {`
`632`		`- const scriptInfo = this.projectService.getScriptInfoForPath(sourceFile.path);`
`633`		- Debug.assert(!!scriptInfo, "getScriptInfo", () => `scriptInfo for a file '${sourceFile.fileName}' Path: '${sourceFile.path}' is missing.`);
	`632`	`+ const scriptInfo = this.projectService.getScriptInfoForPath(sourceFile.resolvedPath \|\| sourceFile.path);`
	`633`	+ Debug.assert(!!scriptInfo, "getScriptInfo", () => `scriptInfo for a file '${sourceFile.fileName}' Path: '${sourceFile.path}' / '${sourceFile.resolvedPath}' is missing.`);
`634`	`634`	`return scriptInfo!;`
`635`	`635`	`});`
`636`	`636`	`}`