Skip to content

Commit c88377a

Browse files
Andymrcrane
Andy
authored andcommitted
Make RenameInfo a union (microsoft#27382) (microsoft#27392)
1 parent e2e866c commit c88377a

File tree

5 files changed

+2
-16
lines changed

5 files changed

+2
-16
lines changed

src/harness/client.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -431,17 +431,13 @@ namespace ts.server {
431431
return renameInfo;
432432
}
433433

434-
getSmartSelectionRange() {
435-
return notImplemented();
436-
}
437-
438434
findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[] {
439435
if (!this.lastRenameEntry ||
440436
this.lastRenameEntry.inputs.fileName !== fileName ||
441437
this.lastRenameEntry.inputs.position !== position ||
442438
this.lastRenameEntry.inputs.findInStrings !== findInStrings ||
443439
this.lastRenameEntry.inputs.findInComments !== findInComments) {
444-
this.getRenameInfo(fileName, position, { allowRenameOfImportPath: true }, findInStrings, findInComments);
440+
this.getRenameInfo(fileName, position, findInStrings, findInComments);
445441
}
446442

447443
return this.lastRenameEntry!.locations;

src/server/session.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,7 @@ namespace ts.server {
12691269
if (info.canRename) {
12701270
const { canRename, fileToRename, displayName, fullDisplayName, kind, kindModifiers, triggerSpan } = info;
12711271
return identity<protocol.RenameInfoSuccess>(
1272-
{ canRename, fileToRename, displayName, fullDisplayName, kind, kindModifiers, triggerSpan: toProcolTextSpan(triggerSpan, scriptInfo) });
1272+
{ canRename, fileToRename, displayName, fullDisplayName, kind, kindModifiers, triggerSpan: this.toLocationTextSpan(triggerSpan, scriptInfo) });
12731273
}
12741274
else {
12751275
return info;

src/services/types.ts

-4
Original file line numberDiff line numberDiff line change
@@ -847,10 +847,6 @@ namespace ts {
847847
localizedErrorMessage: string;
848848
}
849849

850-
export interface RenameInfoOptions {
851-
readonly allowRenameOfImportPath?: boolean;
852-
}
853-
854850
export interface SignatureHelpParameter {
855851
name: string;
856852
documentation: SymbolDisplayPart[];

tests/baselines/reference/api/tsserverlibrary.d.ts

-3
Original file line numberDiff line numberDiff line change
@@ -5365,9 +5365,6 @@ declare namespace ts {
53655365
canRename: false;
53665366
localizedErrorMessage: string;
53675367
}
5368-
interface RenameInfoOptions {
5369-
readonly allowRenameOfImportPath?: boolean;
5370-
}
53715368
interface SignatureHelpParameter {
53725369
name: string;
53735370
documentation: SymbolDisplayPart[];

tests/baselines/reference/api/typescript.d.ts

-3
Original file line numberDiff line numberDiff line change
@@ -5365,9 +5365,6 @@ declare namespace ts {
53655365
canRename: false;
53665366
localizedErrorMessage: string;
53675367
}
5368-
interface RenameInfoOptions {
5369-
readonly allowRenameOfImportPath?: boolean;
5370-
}
53715368
interface SignatureHelpParameter {
53725369
name: string;
53735370
documentation: SymbolDisplayPart[];

0 commit comments

Comments
 (0)