Merge pull request microsoft#31270 from ajafff/getParsedCommandLine-path

sheetalkamat · web-flow · commit 6c4876a00a1c · 2019-05-06T12:59:33.000-07:00
parseProjectReferenceConfigFile: always set SourceFile.path
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -2688,6 +2688,7 @@ namespace ts {
                     return undefined;
                 }
                 sourceFile = Debug.assertDefined(commandLine.options.configFile);
+                Debug.assert(!sourceFile.path || sourceFile.path === sourceFilePath);
                 addFileToFilesByName(sourceFile, sourceFilePath, /*redirectedPath*/ undefined);
             }
             else {
@@ -2699,11 +2700,12 @@ namespace ts {
                     projectReferenceRedirects.set(sourceFilePath, false);
                     return undefined;
                 }
-                sourceFile.path = sourceFilePath;
-                sourceFile.resolvedPath = sourceFilePath;
-                sourceFile.originalFileName = refPath;
                 commandLine = parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /*existingOptions*/ undefined, refPath);
             }
+            sourceFile.path = sourceFilePath;
+            sourceFile.resolvedPath = sourceFilePath;
+            sourceFile.originalFileName = refPath;
+
             const resolvedRef: ResolvedProjectReference = { commandLine, sourceFile };
             projectReferenceRedirects.set(sourceFilePath, resolvedRef);
             if (commandLine.projectReferences) {

Original file line number	Diff line number	Diff line change
`@@ -2688,6 +2688,7 @@ namespace ts {`
`2688`	`2688`	`return undefined;`
`2689`	`2689`	`}`
`2690`	`2690`	`sourceFile = Debug.assertDefined(commandLine.options.configFile);`
	`2691`	`+ Debug.assert(!sourceFile.path \|\| sourceFile.path === sourceFilePath);`
`2691`	`2692`	`addFileToFilesByName(sourceFile, sourceFilePath, /redirectedPath/ undefined);`
`2692`	`2693`	`}`
`2693`	`2694`	`else {`
`@@ -2699,11 +2700,12 @@ namespace ts {`
`2699`	`2700`	`projectReferenceRedirects.set(sourceFilePath, false);`
`2700`	`2701`	`return undefined;`
`2701`	`2702`	`}`
`2702`		`- sourceFile.path = sourceFilePath;`
`2703`		`- sourceFile.resolvedPath = sourceFilePath;`
`2704`		`- sourceFile.originalFileName = refPath;`
`2705`	`2703`	`commandLine = parseJsonSourceFileConfigFileContent(sourceFile, configParsingHost, basePath, /existingOptions/ undefined, refPath);`
`2706`	`2704`	`}`
	`2705`	`+ sourceFile.path = sourceFilePath;`
	`2706`	`+ sourceFile.resolvedPath = sourceFilePath;`
	`2707`	`+ sourceFile.originalFileName = refPath;`
	`2708`	`+`
`2707`	`2709`	`const resolvedRef: ResolvedProjectReference = { commandLine, sourceFile };`
`2708`	`2710`	`projectReferenceRedirects.set(sourceFilePath, resolvedRef);`
`2709`	`2711`	`if (commandLine.projectReferences) {`