Remove secondary reference lookup implementation (microsoft#32016)

weswigham · web-flow · commit 1cbace6eee82 · 2019-06-21T13:26:29.000-07:00
* Remove secondary reference lookup implementation

* Remove TODO
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -725,7 +725,8 @@ namespace ts {
             fileExists: f => host.fileExists(f),
             directoryExists: host.directoryExists && (f => host.directoryExists!(f)),
             useCaseSensitiveFileNames: () => host.useCaseSensitiveFileNames(),
-            getProgramBuildInfo: returnUndefined
+            getProgramBuildInfo: returnUndefined,
+            getSourceFileFromReference: returnUndefined,
         };
         emitFiles(
             notImplementedResolver,
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1442,7 +1442,8 @@ namespace ts {
                 },
                 ...(host.directoryExists ? { directoryExists: f => host.directoryExists!(f) } : {}),
                 useCaseSensitiveFileNames: () => host.useCaseSensitiveFileNames(),
-                getProgramBuildInfo: () => program.getProgramBuildInfo && program.getProgramBuildInfo()
+                getProgramBuildInfo: () => program.getProgramBuildInfo && program.getProgramBuildInfo(),
+                getSourceFileFromReference: (file, ref) => program.getSourceFileFromReference(file, ref),
             };
         }
 
@@ -2127,7 +2128,7 @@ namespace ts {
         }
 
         /** This should have similar behavior to 'processSourceFile' without diagnostics or mutation. */
-        function getSourceFileFromReference(referencingFile: SourceFile, ref: FileReference): SourceFile | undefined {
+        function getSourceFileFromReference(referencingFile: SourceFile | UnparsedSource, ref: FileReference): SourceFile | undefined {
             return getSourceFileFromReferenceWorker(resolveTripleslashReference(ref.fileName, referencingFile.fileName), fileName => filesByName.get(toPath(fileName)) || undefined);
         }
 
diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts
@@ -348,7 +348,7 @@ namespace ts {
         function collectReferences(sourceFile: SourceFile | UnparsedSource, ret: Map<SourceFile>) {
             if (noResolve || (!isUnparsedSource(sourceFile) && isSourceFileJS(sourceFile))) return ret;
             forEach(sourceFile.referencedFiles, f => {
-                const elem = tryResolveScriptReference(host, sourceFile, f);
+                const elem = host.getSourceFileFromReference(sourceFile, f);
                 if (elem) {
                     ret.set("" + getOriginalNodeId(elem), elem);
                 }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2975,7 +2975,7 @@ namespace ts {
         // For testing purposes only.
         /* @internal */ structureIsReused?: StructureIsReused;
 
-        /* @internal */ getSourceFileFromReference(referencingFile: SourceFile, ref: FileReference): SourceFile | undefined;
+        /* @internal */ getSourceFileFromReference(referencingFile: SourceFile | UnparsedSource, ref: FileReference): SourceFile | undefined;
         /* @internal */ getLibFileFromReference(ref: FileReference): SourceFile | undefined;
 
         /** Given a source file, get the name of the package it was imported from. */
@@ -5399,6 +5399,7 @@ namespace ts {
 
         writeFile: WriteFileCallback;
         getProgramBuildInfo(): ProgramBuildInfo | undefined;
+        getSourceFileFromReference: Program["getSourceFileFromReference"];
     }
 
     export interface TransformationContext {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -2611,13 +2611,6 @@ namespace ts {
         return undefined;
     }
 
-    export function tryResolveScriptReference(host: ScriptReferenceHost, sourceFile: SourceFile | UnparsedSource, reference: FileReference) {
-        if (!host.getCompilerOptions().noResolve) {
-            const referenceFileName = isRootedDiskPath(reference.fileName) ? reference.fileName : combinePaths(getDirectoryPath(sourceFile.fileName), reference.fileName);
-            return host.getSourceFile(referenceFileName);
-        }
-    }
-
     export function getAncestor(node: Node | undefined, kind: SyntaxKind): Node | undefined {
         while (node) {
             if (node.kind === kind) {
diff --git a/src/services/goToDefinition.ts b/src/services/goToDefinition.ts
@@ -108,7 +108,7 @@ namespace ts.GoToDefinition {
     export function getReferenceAtPosition(sourceFile: SourceFile, position: number, program: Program): { fileName: string, file: SourceFile } | undefined {
         const referencePath = findReferenceInPosition(sourceFile.referencedFiles, position);
         if (referencePath) {
-            const file = tryResolveScriptReference(program, sourceFile, referencePath);
+            const file = program.getSourceFileFromReference(sourceFile, referencePath);
             return file && { fileName: referencePath.fileName, file };
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1442,7 +1442,8 @@ namespace ts {`
`1442`	`1442`	`},`
`1443`	`1443`	`...(host.directoryExists ? { directoryExists: f => host.directoryExists!(f) } : {}),`
`1444`	`1444`	`useCaseSensitiveFileNames: () => host.useCaseSensitiveFileNames(),`
`1445`		`- getProgramBuildInfo: () => program.getProgramBuildInfo && program.getProgramBuildInfo()`
	`1445`	`+ getProgramBuildInfo: () => program.getProgramBuildInfo && program.getProgramBuildInfo(),`
	`1446`	`+ getSourceFileFromReference: (file, ref) => program.getSourceFileFromReference(file, ref),`
`1446`	`1447`	`};`
`1447`	`1448`	`}`
`1448`	`1449`
`@@ -2127,7 +2128,7 @@ namespace ts {`
`2127`	`2128`	`}`
`2128`	`2129`
`2129`	`2130`	`/** This should have similar behavior to 'processSourceFile' without diagnostics or mutation. */`
`2130`		`- function getSourceFileFromReference(referencingFile: SourceFile, ref: FileReference): SourceFile \| undefined {`
	`2131`	`+ function getSourceFileFromReference(referencingFile: SourceFile \| UnparsedSource, ref: FileReference): SourceFile \| undefined {`
`2131`	`2132`	`return getSourceFileFromReferenceWorker(resolveTripleslashReference(ref.fileName, referencingFile.fileName), fileName => filesByName.get(toPath(fileName)) \|\| undefined);`
`2132`	`2133`	`}`
`2133`	`2134`
Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ namespace ts {`
`348`	`348`	`function collectReferences(sourceFile: SourceFile \| UnparsedSource, ret: Map<SourceFile>) {`
`349`	`349`	`if (noResolve \|\| (!isUnparsedSource(sourceFile) && isSourceFileJS(sourceFile))) return ret;`
`350`	`350`	`forEach(sourceFile.referencedFiles, f => {`
`351`		`- const elem = tryResolveScriptReference(host, sourceFile, f);`
	`351`	`+ const elem = host.getSourceFileFromReference(sourceFile, f);`
`352`	`352`	`if (elem) {`
`353`	`353`	`ret.set("" + getOriginalNodeId(elem), elem);`
`354`	`354`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ namespace ts.GoToDefinition {`
`108`	`108`	`export function getReferenceAtPosition(sourceFile: SourceFile, position: number, program: Program): { fileName: string, file: SourceFile } \| undefined {`
`109`	`109`	`const referencePath = findReferenceInPosition(sourceFile.referencedFiles, position);`
`110`	`110`	`if (referencePath) {`
`111`		`- const file = tryResolveScriptReference(program, sourceFile, referencePath);`
	`111`	`+ const file = program.getSourceFileFromReference(sourceFile, referencePath);`
`112`	`112`	`return file && { fileName: referencePath.fileName, file };`
`113`	`113`	`}`
`114`	`114`