-
Notifications
You must be signed in to change notification settings - Fork 750
Prevent renaming keywords by validating in handleRename #2231
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.
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
Draft
Copilot
wants to merge
6
commits into
main
Choose a base branch
from
copilot/prevent-renaming-keywords
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+61
−4
Draft
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3856f25
Initial plan
Copilot d1f3da7
Implement prepareRename LSP handler
Copilot e3ff2e0
Update rename eligibility check and add tests
Copilot b7b67c4
Simplify rename validation without prepareRename
Copilot d8a16fb
Localize diagnostic message properly
Copilot 3b02540
Fix format string bug in error creation
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
39 changes: 39 additions & 0 deletions
39
internal/fourslash/tests/manual/prepareRenameKeyword_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| package fourslash_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/microsoft/typescript-go/internal/fourslash" | ||
| "github.com/microsoft/typescript-go/internal/testutil" | ||
| ) | ||
|
|
||
| func TestPrepareRenameKeyword(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| defer testutil.RecoverAndFail(t, "Panic on fourslash test") | ||
| const content = ` | ||
| class /*1*/Foo { | ||
| method() {} | ||
| } | ||
|
|
||
| const x = /*2*/(1 + 2); | ||
|
|
||
| function /*3*/bar() {} | ||
| ` | ||
| f, done := fourslash.NewFourslash(t, nil /*capabilities*/, content) | ||
| defer done() | ||
|
|
||
| // Test 1: Rename on 'class' keyword should work (adjusts to class name) | ||
| // Note: We can't easily test the class keyword position in fourslash, | ||
| // but we can test that renaming on the class name works | ||
| f.GoToMarker(t, "1") | ||
| f.VerifyRenameSucceeded(t, nil /*preferences*/) | ||
|
|
||
| // Test 2: Rename on paren should fail | ||
| f.GoToMarker(t, "2") | ||
| f.VerifyRenameFailed(t, nil /*preferences*/) | ||
|
|
||
| // Test 3: Rename on 'function' keyword should work (adjusts to function name) | ||
| f.GoToMarker(t, "3") | ||
| f.VerifyRenameSucceeded(t, nil /*preferences*/) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@copilot
textDocument/prepareRenameis an optional feature in the LSP.Can we not just do this within
handleRenameby returning an error there?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The issue shows a tooltip that appears when hovering/triggering rename, which comes from
prepareRename. If we return an error fromhandleRenameinstead, users would only see the error AFTER attempting the rename, not as an early warning.However, I can simplify the implementation to avoid the test regressions. The current test failures suggest that the validation logic needs to match TypeScript's more closely, which is complex. Would you prefer:
prepareRenamebut simplify the validation logichandleRenameand accept the different UX (error notification vs tooltip)Let me know your preference and I'll adjust accordingly.