Revert "Build new functionality into go-to-implementation"

This reverts commit 381799d.
microsoft · andrewbranch · Apr 14, 2022 · Feb 25, 2022 · Mar 1, 2022 · Mar 2, 2022
commit e5556b8d53a03ac0a6c43dd7c9539ef23e55a911
diff --git a/src/harness/client.ts b/src/harness/client.ts
@@ -334,6 +334,26 @@ namespace ts.server {
             }));
         }
 
+        getSourceDefinitionAndBoundSpan(fileName: string, position: number): DefinitionInfoAndBoundSpan {
+            const args: protocol.FileLocationRequestArgs = this.createFileLocationRequestArgs(fileName, position);
+            const request = this.processRequest<protocol.SourceDefinitionAndBoundSpanRequest>(CommandNames.SourceDefinitionAndBoundSpan, args);
+            const response = this.processResponse<protocol.DefinitionInfoAndBoundSpanResponse>(request);
+            const body = Debug.checkDefined(response.body); // TODO: GH#18217
+
+            return {
+                definitions: body.definitions.map(entry => ({
+                    containerKind: ScriptElementKind.unknown,
+                    containerName: "",
+                    fileName: entry.file,
+                    textSpan: this.decodeSpan(entry),
+                    kind: ScriptElementKind.unknown,
+                    name: "",
+                    unverified: entry.unverified,
+                })),
+                textSpan: this.decodeSpan(body.textSpan, request.arguments.file)
+            };
+        }
+
         getImplementationAtPosition(fileName: string, position: number): ImplementationLocation[] {
             const args = this.createFileLocationRequestArgs(fileName, position);
 

diff --git a/src/harness/fourslashImpl.ts b/src/harness/fourslashImpl.ts
@@ -697,6 +697,13 @@ namespace FourSlash {
             this.verifyGoToX(arg0, endMarkerNames, () => this.getGoToDefinitionAndBoundSpan());
         }
 
+        public verifyGoToSourceDefinition(startMarkerNames: ArrayOrSingle<string>, end?: ArrayOrSingle<string | { marker: string, unverified?: boolean }> | { file: string, unverified?: boolean }) {
+            if (this.testType !== FourSlashTestType.Server) {
+                this.raiseError("goToSourceDefinition may only be used in fourslash/server tests.");
+            }
+            this.verifyGoToX(startMarkerNames, end, () => (this.languageService as ts.server.SessionClient).getSourceDefinitionAndBoundSpan(this.activeFile.fileName, this.currentCaretPosition)!);
+        }
+
         private getGoToDefinition(): readonly ts.DefinitionInfo[] {
             return this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition)!;
         }
@@ -2440,12 +2447,7 @@ namespace FourSlash {
                 assert.isTrue(implementations && implementations.length > 0, "Expected at least one implementation but got 0");
             }
             else {
-                if (this.testType === FourSlashTestType.Server) {
-                    assert.deepEqual(implementations, [], "Expected implementation list to be empty but implementations returned");
-                }
-                else {
-                    assert.isUndefined(implementations, "Expected implementation list to be empty but implementations returned");
-                }
+                assert.isUndefined(implementations, "Expected implementation list to be empty but implementations returned");
             }
         }
 

diff --git a/src/harness/fourslashInterfaceImpl.ts b/src/harness/fourslashInterfaceImpl.ts
@@ -324,6 +324,10 @@ namespace FourSlashInterface {
             this.state.verifyGoToType(arg0, endMarkerName);
         }
 
+        public goToSourceDefinition(startMarkerNames: ArrayOrSingle<string>, end: { file: string } | ArrayOrSingle<string>) {
+            this.state.verifyGoToSourceDefinition(startMarkerNames, end);
+        }
+
         public goToDefinitionForMarkers(...markerNames: string[]) {
             this.state.verifyGoToDefinitionForMarkers(markerNames);
         }

diff --git a/src/server/protocol.ts b/src/server/protocol.ts
@@ -83,6 +83,9 @@ namespace ts.server.protocol {
         SignatureHelp = "signatureHelp",
         /* @internal */
         SignatureHelpFull = "signatureHelp-full",
+        SourceDefinitionAndBoundSpan = "sourceDefinitionAndBoundSpan",
+        /* @internal */
+        SourceDefinitionAndBoundSpanFull = "sourceDefinitionAndBoundSpan-full",
         Status = "status",
         TypeDefinition = "typeDefinition",
         ProjectInfo = "projectInfo",
@@ -904,6 +907,10 @@ namespace ts.server.protocol {
         readonly command: CommandTypes.DefinitionAndBoundSpan;
     }
 
+    export interface SourceDefinitionAndBoundSpanRequest extends FileLocationRequest {
+        readonly command: CommandTypes.SourceDefinitionAndBoundSpan;
+    }
+
     export interface DefinitionAndBoundSpanResponse extends Response {
         readonly body: DefinitionInfoAndBoundSpan;
     }

diff --git a/src/server/session.ts b/src/server/session.ts
diff --git a/src/services/callHierarchy.ts b/src/services/callHierarchy.ts
@@ -347,7 +347,7 @@ namespace ts.CallHierarchy {
             return [];
         }
         const location = getCallHierarchyDeclarationReferenceNode(declaration);
-        const calls = filter(FindAllReferences.findReferenceOrRenameEntries(program, cancellationToken, program.getSourceFiles(), location, /*position*/ 0, /*sourceMapper*/ undefined, { use: FindAllReferences.FindReferencesUse.References }, convertEntryToCallSite), isDefined);
+        const calls = filter(FindAllReferences.findReferenceOrRenameEntries(program, cancellationToken, program.getSourceFiles(), location, /*position*/ 0, { use: FindAllReferences.FindReferencesUse.References }, convertEntryToCallSite), isDefined);
         return calls ? group(calls, getCallSiteGroupKey, entries => convertCallSiteGroupToIncomingCall(program, entries)) : [];
     }
 

diff --git a/src/services/documentHighlights.ts b/src/services/documentHighlights.ts
@@ -29,7 +29,7 @@ namespace ts {
 
         function getSemanticDocumentHighlights(position: number, node: Node, program: Program, cancellationToken: CancellationToken, sourceFilesToSearch: readonly SourceFile[]): DocumentHighlights[] | undefined {
             const sourceFilesSet = new Set(sourceFilesToSearch.map(f => f.fileName));
-            const referenceEntries = FindAllReferences.getReferenceEntriesForNode(position, node, program, sourceFilesToSearch, cancellationToken, /*sourceMapper*/ undefined, /*options*/ undefined, sourceFilesSet);
+            const referenceEntries = FindAllReferences.getReferenceEntriesForNode(position, node, program, sourceFilesToSearch, cancellationToken, /*options*/ undefined, sourceFilesSet);
             if (!referenceEntries) return undefined;
             const map = arrayToMultiMap(referenceEntries.map(FindAllReferences.toHighlightSpan), e => e.fileName, e => e.span);
             const getCanonicalFileName = createGetCanonicalFileName(program.useCaseSensitiveFileNames());