Include triggerSpan in protocol.RenameInfo (microsoft#27160)

Andy · web-flow · commit fc54a2c0a7cf · 2018-09-17T15:00:41.000-07:00
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
@@ -1123,6 +1123,9 @@ namespace ts.server.protocol {
          * Optional modifiers for the kind (such as 'public').
          */
         kindModifiers: string;
+
+        /** Span of text to rename. */
+        triggerSpan: TextSpan;
     }
 
     /**
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -1161,13 +1161,12 @@ namespace ts.server {
             if (!simplifiedResult) return locations;
 
             const defaultProject = this.getDefaultProject(args);
-            const renameInfo = Session.mapRenameInfo(defaultProject.getLanguageService().getRenameInfo(file, position));
+            const renameInfo: protocol.RenameInfo = this.mapRenameInfo(defaultProject.getLanguageService().getRenameInfo(file, position), Debug.assertDefined(this.projectService.getScriptInfo(file)));
             return { info: renameInfo, locs: this.toSpanGroups(locations) };
         }
 
-        // strips 'triggerSpan'
-        private static mapRenameInfo({ canRename, localizedErrorMessage, displayName, fullDisplayName, kind, kindModifiers }: RenameInfo): protocol.RenameInfo {
-            return { canRename, localizedErrorMessage, displayName, fullDisplayName, kind, kindModifiers };
+        private mapRenameInfo({ canRename, localizedErrorMessage, displayName, fullDisplayName, kind, kindModifiers, triggerSpan }: RenameInfo, scriptInfo: ScriptInfo): protocol.RenameInfo {
+            return { canRename, localizedErrorMessage, displayName, fullDisplayName, kind, kindModifiers, triggerSpan: this.toLocationTextSpan(triggerSpan, scriptInfo) };
         }
 
         private toSpanGroups(locations: ReadonlyArray<RenameLocation>): ReadonlyArray<protocol.SpanGroup> {
diff --git a/src/testRunner/unittests/tsserverProjectSystem.ts b/src/testRunner/unittests/tsserverProjectSystem.ts
@@ -456,7 +456,7 @@ namespace ts.projectSystem {
     function protocolFileLocationFromSubstring(file: File, substring: string): protocol.FileLocationRequestArgs {
         return { file: file.path, ...protocolLocationFromSubstring(file.content, substring) };
     }
-    function protocolFileSpanFromSubstring(file: File, substring: string, options?: SpanFromSubstringOptions) {
+    function protocolFileSpanFromSubstring(file: File, substring: string, options?: SpanFromSubstringOptions): protocol.FileSpan {
         return { file: file.path, ...protocolTextSpanFromSubstring(file.content, substring, options) };
     }
     function documentSpanFromSubstring(file: File, substring: string, options?: SpanFromSubstringOptions): DocumentSpan {
@@ -8287,7 +8287,8 @@ namespace ts.projectSystem {
                 protocolTextSpanFromSubstring(aFile.content, "C"),
                 protocolTextSpanFromSubstring(aFile.content, "C", { index: 1 }),
             ];
-            const cLocs: protocol.TextSpan[] = [protocolTextSpanFromSubstring(cFile.content, "C")];
+            const span = protocolTextSpanFromSubstring(cFile.content, "C");
+            const cLocs: protocol.TextSpan[] = [span];
             assert.deepEqual<protocol.RenameResponseBody | undefined>(response, {
                 info: {
                     canRename: true,
@@ -8296,6 +8297,7 @@ namespace ts.projectSystem {
                     kind: ScriptElementKind.constElement,
                     kindModifiers: ScriptElementKindModifier.exportedModifier,
                     localizedErrorMessage: undefined,
+                    triggerSpan: span,
                 },
                 locs: [
                     { file: aFc, locs: cLocs },
@@ -10063,6 +10065,7 @@ declare class TestLib {
                     kind: ScriptElementKind.alias,
                     kindModifiers: ScriptElementKindModifier.none,
                     localizedErrorMessage: undefined,
+                    triggerSpan: protocolTextSpanFromSubstring(userTs.content, "fnA", { index: 1 }),
                 },
                 locs: [renameUserTs(userTs), renameATs(aTs)],
             });
@@ -10081,6 +10084,7 @@ declare class TestLib {
                     kind: ScriptElementKind.functionElement,
                     kindModifiers: ScriptElementKindModifier.exportedModifier,
                     localizedErrorMessage: undefined,
+                    triggerSpan: protocolTextSpanFromSubstring(aTs.content, "fnA"),
                 },
                 locs: [renameATs(aTs), renameUserTs(userTs)],
             });
@@ -10109,6 +10113,7 @@ declare class TestLib {
                     kind: ScriptElementKind.alias,
                     kindModifiers: ScriptElementKindModifier.none,
                     localizedErrorMessage: undefined,
+                    triggerSpan: protocolTextSpanFromSubstring(userTs.content, "fnB", { index: 1 }),
                 },
                 locs: [
                     {
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -6455,6 +6455,8 @@ declare namespace ts.server.protocol {
          * Optional modifiers for the kind (such as 'public').
          */
         kindModifiers: string;
+        /** Span of text to rename. */
+        triggerSpan: TextSpan;
     }
     /**
      *  A group of text spans, all in 'file'.
@@ -8733,7 +8735,7 @@ declare namespace ts.server {
         private getProjects;
         private getDefaultProject;
         private getRenameLocations;
-        private static mapRenameInfo;
+        private mapRenameInfo;
         private toSpanGroups;
         private getReferences;
         /**

Original file line number	Diff line number	Diff line change
`@@ -1123,6 +1123,9 @@ namespace ts.server.protocol {`
`1123`	`1123`	`* Optional modifiers for the kind (such as 'public').`
`1124`	`1124`	`*/`
`1125`	`1125`	`kindModifiers: string;`
	`1126`	`+`
	`1127`	`+ /** Span of text to rename. */`
	`1128`	`+ triggerSpan: TextSpan;`
`1126`	`1129`	`}`
`1127`	`1130`
`1128`	`1131`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1161,13 +1161,12 @@ namespace ts.server {`
`1161`	`1161`	`if (!simplifiedResult) return locations;`
`1162`	`1162`
`1163`	`1163`	`const defaultProject = this.getDefaultProject(args);`
`1164`		`- const renameInfo = Session.mapRenameInfo(defaultProject.getLanguageService().getRenameInfo(file, position));`
	`1164`	`+ const renameInfo: protocol.RenameInfo = this.mapRenameInfo(defaultProject.getLanguageService().getRenameInfo(file, position), Debug.assertDefined(this.projectService.getScriptInfo(file)));`
`1165`	`1165`	`return { info: renameInfo, locs: this.toSpanGroups(locations) };`
`1166`	`1166`	`}`
`1167`	`1167`
`1168`		`- // strips 'triggerSpan'`
`1169`		`- private static mapRenameInfo({ canRename, localizedErrorMessage, displayName, fullDisplayName, kind, kindModifiers }: RenameInfo): protocol.RenameInfo {`
`1170`		`- return { canRename, localizedErrorMessage, displayName, fullDisplayName, kind, kindModifiers };`
	`1168`	`+ private mapRenameInfo({ canRename, localizedErrorMessage, displayName, fullDisplayName, kind, kindModifiers, triggerSpan }: RenameInfo, scriptInfo: ScriptInfo): protocol.RenameInfo {`
	`1169`	`+ return { canRename, localizedErrorMessage, displayName, fullDisplayName, kind, kindModifiers, triggerSpan: this.toLocationTextSpan(triggerSpan, scriptInfo) };`
`1171`	`1170`	`}`
`1172`	`1171`
`1173`	`1172`	`private toSpanGroups(locations: ReadonlyArray<RenameLocation>): ReadonlyArray<protocol.SpanGroup> {`