Add sourceOf project reference redirect to filesByName list for redirect path so that module symbol is correctly resolved

sheetalkamat · sheetalkamat · commit 012ecdacde36 · 2019-06-26T14:56:21.000-07:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1411,6 +1411,13 @@ namespace ts {
             for (const newSourceFile of newSourceFiles) {
                 const filePath = newSourceFile.path;
                 addFileToFilesByName(newSourceFile, filePath, newSourceFile.resolvedPath);
+                if (useSourceOfReference) {
+                    const redirectProject = getProjectReferenceRedirectProject(newSourceFile.fileName);
+                    if (redirectProject && !(redirectProject.commandLine.options.outFile || redirectProject.commandLine.options.out)) {
+                        const redirect = getProjectReferenceOutputName(redirectProject, newSourceFile.fileName);
+                        addFileToFilesByName(newSourceFile, toPath(redirect), /*redirectedPath*/ undefined);
+                    }
+                }
                 // Set the file as found during node modules search if it was found that way in old progra,
                 if (oldProgram.isSourceFileFromExternalLibrary(oldProgram.getSourceFileByPath(filePath)!)) {
                     sourceFilesFoundSearchingNodeModules.set(filePath, true);
@@ -2240,9 +2247,11 @@ namespace ts {
             if (useSourceOfReference) {
                 const source = getSourceOfProjectReferenceRedirect(fileName);
                 if (source) {
-                    return isString(source) ?
+                    const file = isString(source) ?
                         findSourceFile(source, toPath(source), isDefaultLib, ignoreNoDefaultLib, refFile, refPos, refEnd, packageId) :
                         undefined;
+                    if (file) addFileToFilesByName(file, path, /*redirectedPath*/ undefined);
+                    return file;
                 }
             }
             const originalFileName = fileName;
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1148,10 +1148,11 @@ namespace ts {
             useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
             getCurrentDirectory: () => currentDirectory,
             getProgram,
-            fileExists: host.fileExists && (f => host.fileExists!(f)),
-            readFile: host.readFile && ((f, encoding) => host.readFile!(f, encoding)),
-            getDocumentPositionMapper: host.getDocumentPositionMapper && ((generatedFileName, sourceFileName) => host.getDocumentPositionMapper!(generatedFileName, sourceFileName)),
-            getSourceFileLike: host.getSourceFileLike && (f => host.getSourceFileLike!(f)),
+            fileExists: maybeBind(host, host.fileExists),
+            readFile: maybeBind(host, host.readFile),
+            getDocumentPositionMapper: maybeBind(host, host.getDocumentPositionMapper),
+            useSourceInsteadOfReferenceRedirect: maybeBind(host, host.useSourceInsteadOfReferenceRedirect),
+            getSourceFileLike: maybeBind(host, host.getSourceFileLike),
             log
         });
 
diff --git a/src/services/sourcemaps.ts b/src/services/sourcemaps.ts
@@ -17,6 +17,7 @@ namespace ts {
         readFile?(path: string, encoding?: string): string | undefined;
         getSourceFileLike?(fileName: string): SourceFileLike | undefined;
         getDocumentPositionMapper?(generatedFileName: string, sourceFileName?: string): DocumentPositionMapper | undefined;
+        /* @internal */ useSourceInsteadOfReferenceRedirect?(): boolean;
         log(s: string): void;
     }
 
@@ -70,6 +71,11 @@ namespace ts {
             if (!sourceFile) return undefined;
 
             const program = host.getProgram()!;
+            // If this is source file of project reference source (instead of redirect) there is no generated position
+            if (host.useSourceInsteadOfReferenceRedirect &&
+                host.useSourceInsteadOfReferenceRedirect() &&
+                program.getResolvedProjectReferenceToRedirect(sourceFile.fileName)) return undefined;
+
             const options = program.getCompilerOptions();
             const outPath = options.outFile || options.out;
 
diff --git a/src/testRunner/unittests/tsserver/projectReferences.ts b/src/testRunner/unittests/tsserver/projectReferences.ts
