Rename command, and no need to return the bound span

microsoft · andrewbranch · Apr 14, 2022 · Feb 25, 2022 · Mar 1, 2022 · Mar 2, 2022
commit e302f56b62b097ca3ba340f6479c3199772e7b2d
diff --git a/src/harness/client.ts b/src/harness/client.ts
@@ -332,24 +332,21 @@ namespace ts.server {
             }));
         }
 
-        getSourceDefinitionAndBoundSpan(fileName: string, position: number): DefinitionInfoAndBoundSpan {
+        getSourceDefinitionAndBoundSpan(fileName: string, position: number): DefinitionInfo[] {
             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 request = this.processRequest<protocol.FindSourceDefinitionRequest>(CommandNames.FindSourceDefinition, args);
+            const response = this.processResponse<protocol.DefinitionResponse>(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)
-            };
+            return body.map(entry => ({
+                containerKind: ScriptElementKind.unknown,
+                containerName: "",
+                fileName: entry.file,
+                textSpan: this.decodeSpan(entry),
+                kind: ScriptElementKind.unknown,
+                name: "",
+                unverified: entry.unverified,
+            }));
         }
 
         getImplementationAtPosition(fileName: string, position: number): ImplementationLocation[] {

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

diff --git a/src/server/session.ts b/src/server/session.ts
@@ -1229,14 +1229,11 @@ namespace ts.server {
             };
         }
 
-        private getSourceDefinitionAndBoundSpan(args: protocol.FileLocationRequestArgs, simplifiedResult: boolean): protocol.DefinitionInfoAndBoundSpan | DefinitionInfoAndBoundSpan {
+        private findSourceDefinition(args: protocol.FileLocationRequestArgs): readonly protocol.DefinitionInfo[] {
             const { file, project } = this.getFileAndProject(args);
             const position = this.getPositionInFile(args, file);
-            const scriptInfo = Debug.checkDefined(project.getScriptInfo(file));
-
-            const unmappedDefinitionAndBoundSpan = project.getLanguageService().getDefinitionAndBoundSpan(file, position);
-            let definitions = this.mapDefinitionInfoLocations(unmappedDefinitionAndBoundSpan?.definitions || emptyArray, project).slice();
-            let textSpan = unmappedDefinitionAndBoundSpan?.textSpan;
+            const unmappedDefinitions = project.getLanguageService().getDefinitionAtPosition(file, position);
+            let definitions: readonly DefinitionInfo[] = this.mapDefinitionInfoLocations(unmappedDefinitions || emptyArray, project).slice();
             const needsJsResolution = this.projectService.serverMode === LanguageServiceMode.Semantic && (
                 !some(definitions, d => toNormalizedPath(d.fileName) !== file && !d.isAmbient) ||
                 some(definitions, d => !!d.failedAliasResolution));
@@ -1246,10 +1243,7 @@ namespace ts.server {
                 definitions?.forEach(d => definitionSet.add(d));
                 const noDtsProject = project.getNoDtsResolutionProject([file]);
                 const ls = noDtsProject.getLanguageService();
-                const definitionAndBoundSpan = ls.getDefinitionAndBoundSpan(file, position, /*searchOtherFilesOnly*/ true);
-                textSpan ||= definitionAndBoundSpan?.textSpan;
-                const jsDefinitions = definitionAndBoundSpan
-                    ?.definitions
+                const jsDefinitions = ls.getDefinitionAtPosition(file, position, /*searchOtherFilesOnly*/ true)
                     ?.filter(d => toNormalizedPath(d.fileName) !== file);
                 if (some(jsDefinitions)) {
                     for (const jsDefinition of jsDefinitions) {
@@ -1282,23 +1276,8 @@ namespace ts.server {
                 definitions = arrayFrom(definitionSet.values());
             }
 
-            if (!textSpan) {
-                return { definitions: emptyArray, textSpan: undefined! };
-            }
-
             definitions = definitions.filter(d => !d.isAmbient && !d.failedAliasResolution);
-
-            if (simplifiedResult) {
-                return {
-                    definitions: this.mapDefinitionInfo(definitions, project),
-                    textSpan: toProtocolTextSpan(textSpan, scriptInfo)
-                };
-            }
-
-            return {
-                definitions: definitions.map(Session.mapToOriginalLocation),
-                textSpan,
-            };
+            return this.mapDefinitionInfo(definitions, project);
 
             function findImplementationFileFromDtsFileName(fileName: string, resolveFromFile: string, auxiliaryProject: Project) {
                 const nodeModulesPathParts = getNodeModulePathParts(fileName);
@@ -1348,7 +1327,6 @@ namespace ts.server {
                 const ls = project.getLanguageService();
                 const program = ls.getProgram()!;
                 const initialNode = getTouchingPropertyName(program.getSourceFile(file)!, position);
-                textSpan = createTextSpanFromNode(initialNode); // TODO remove me
                 if ((isStringLiteralLike(initialNode) || isIdentifier(initialNode)) && isAccessExpression(initialNode.parent)) {
                     return forEachNameInAccessChainWalkingLeft(initialNode, nameInChain => {
                         if (nameInChain === initialNode) return undefined;
@@ -2933,11 +2911,8 @@ namespace ts.server {
             [CommandNames.DefinitionAndBoundSpanFull]: (request: protocol.DefinitionAndBoundSpanRequest) => {
                 return this.requiredResponse(this.getDefinitionAndBoundSpan(request.arguments, /*simplifiedResult*/ false));
             },
-            [CommandNames.SourceDefinitionAndBoundSpan]: (request: protocol.SourceDefinitionAndBoundSpanRequest) => {
-                return this.requiredResponse(this.getSourceDefinitionAndBoundSpan(request.arguments, /*simplifiedResult*/ true));
-            },
-            [CommandNames.SourceDefinitionAndBoundSpanFull]: (request: protocol.SourceDefinitionAndBoundSpanRequest) => {
-                return this.requiredResponse(this.getSourceDefinitionAndBoundSpan(request.arguments, /*simplifiedResult*/ false));
+            [CommandNames.FindSourceDefinition]: (request: protocol.FindSourceDefinitionRequest) => {
+                return this.requiredResponse(this.findSourceDefinition(request.arguments));
             },
             [CommandNames.EmitOutput]: (request: protocol.EmitOutputRequest) => {
                 return this.requiredResponse(this.getEmitOutput(request.arguments));

diff --git a/src/services/goToDefinition.ts b/src/services/goToDefinition.ts
@@ -265,8 +265,8 @@ namespace ts.GoToDefinition {
         return undefined;
     }
 
-    export function getDefinitionAndBoundSpan(program: Program, sourceFile: SourceFile, position: number, searchOtherFilesOnly?: boolean): DefinitionInfoAndBoundSpan | undefined {
-        const definitions = getDefinitionAtPosition(program, sourceFile, position, searchOtherFilesOnly);
+    export function getDefinitionAndBoundSpan(program: Program, sourceFile: SourceFile, position: number): DefinitionInfoAndBoundSpan | undefined {
+        const definitions = getDefinitionAtPosition(program, sourceFile, position);
 
         if (!definitions || definitions.length === 0) {
             return undefined;

diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1773,9 +1773,9 @@ namespace ts {
             return GoToDefinition.getDefinitionAtPosition(program, getValidSourceFile(fileName), position, searchOtherFilesOnly);
         }
 
-        function getDefinitionAndBoundSpan(fileName: string, position: number, searchOtherFilesOnly?: boolean): DefinitionInfoAndBoundSpan | undefined {
+        function getDefinitionAndBoundSpan(fileName: string, position: number): DefinitionInfoAndBoundSpan | undefined {
             synchronizeHostData();
-            return GoToDefinition.getDefinitionAndBoundSpan(program, getValidSourceFile(fileName), position, searchOtherFilesOnly);
+            return GoToDefinition.getDefinitionAndBoundSpan(program, getValidSourceFile(fileName), position);
         }
 
         function getTypeDefinitionAtPosition(fileName: string, position: number): readonly DefinitionInfo[] | undefined {

diff --git a/src/services/types.ts b/src/services/types.ts
@@ -476,9 +476,6 @@ namespace ts {
         // eslint-disable-next-line @typescript-eslint/unified-signatures
         getDefinitionAtPosition(fileName: string, position: number, searchOtherFilesOnly: boolean): readonly DefinitionInfo[] | undefined;
         getDefinitionAtPosition(fileName: string, position: number): readonly DefinitionInfo[] | undefined;
-        /*@internal*/
-        // eslint-disable-next-line @typescript-eslint/unified-signatures
-        getDefinitionAndBoundSpan(fileName: string, position: number, searchOtherFilesOnly: boolean): DefinitionInfoAndBoundSpan | undefined;
         getDefinitionAndBoundSpan(fileName: string, position: number): DefinitionInfoAndBoundSpan | undefined;
         getTypeDefinitionAtPosition(fileName: string, position: number): readonly DefinitionInfo[] | undefined;
         getImplementationAtPosition(fileName: string, position: number): readonly ImplementationLocation[] | undefined;