Skip to content

Don't go past import in cross-project renaming #48758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gabritto merged 8 commits into from
May 3, 2022
Merged

Don't go past import in cross-project renaming #48758

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9acc88f
WIP
gabritto Feb 14, 2022
6804b7a
Merge branch 'main' into gabritto/issue45659
gabritto Apr 12, 2022
3242950
fix cross-project renaming logic
gabritto Apr 18, 2022
36af929
only use configure if prefix opt is defined
gabritto Apr 18, 2022
e0343f5
Merge branch 'main' into gabritto/issue45659
gabritto Apr 19, 2022
17ee2e1
refactor skipAlias into stopAtAlias
gabritto May 2, 2022
a6f2e0f
fix stopAtAlias
gabritto May 2, 2022
2d01675
update another stopAtAlias location
gabritto May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
only use configure if prefix opt is defined
  • Loading branch information
@gabritto
gabritto committed Apr 18, 2022
commit 36af929d74e1df06fc3b0f23b925a3991513fa5c
19 changes: 12 additions & 7 deletions src/harness/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,13 +479,18 @@ namespace ts.server {
this.lastRenameEntry.inputs.position !== position ||
this.lastRenameEntry.inputs.findInStrings !== findInStrings ||
this.lastRenameEntry.inputs.findInComments !== findInComments) {
// User preferences have to be set through the `Configure` command
this.configure({ providePrefixAndSuffixTextForRename });
// Options argument is not used, so don't pass in options
this.getRenameInfo(fileName, position, /*options*/{}, findInStrings, findInComments);
// Restore previous user preferences
if (this.preferences) {
this.configure(this.preferences);
if (providePrefixAndSuffixTextForRename !== undefined) {
// User preferences have to be set through the `Configure` command
this.configure({ providePrefixAndSuffixTextForRename });
// Options argument is not used, so don't pass in options
this.getRenameInfo(fileName, position, /*options*/{}, findInStrings, findInComments);
// Restore previous user preferences
if (this.preferences) {
this.configure(this.preferences);
}
}
else {
this.getRenameInfo(fileName, position, /*options*/{}, findInStrings, findInComments);
}
}

Expand Down
12 changes: 0 additions & 12 deletions src/services/services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1835,18 +1835,6 @@ namespace ts {
}
}

// function findRenameDefinition(fileName: string, position: number): DocumentPosition | undefined {
// const sourceFile = getValidSourceFile(fileName);
// const node = getAdjustedRenameLocation(getTouchingPropertyName(sourceFile, position));
// if (!Rename.nodeIsEligibleForRename(node)) return undefined;
// if (false) {
// // return something else
// }
// const infos = getDefinitionAtPosition(fileName, position);
// const info = infos && firstOrUndefined(infos);
// return info && !info.isLocal ? { fileName: info.fileName, pos: info.textSpan.start } : undefined;
// }

function getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[] | undefined {
synchronizeHostData();
return getReferencesWorker(getTouchingPropertyName(getValidSourceFile(fileName), position), position, { use: FindAllReferences.FindReferencesUse.References }, FindAllReferences.toReferenceEntry);
Expand Down