lsp: Rename correctly when conflicting #1334
Merged
Conversation
This file contains 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
charlieegan3
force-pushed
the
rename-conflict-lsp-2
branch
from
a217da3 to
9c948d5
Compare
anderseknert
approved these changes
Jan 14, 2025
There was a problem hiding this comment.
Left a couple of suggestions / questions, but beside that, LGTM!
One last thing — do we have existing tests that cover moving a file and applying another fix, like no-whitespace-comment? I know we had some issues with that in the past, as the other linters would not get notified of the rename. If we don't have that covered, it'd be good to test for!
I thought we did, but I have updated a fixer test now to cover this case in: |
charlieegan3
force-pushed
the
rename-conflict-lsp-2
branch
2 times, most recently
from
8ce3897 to
2bc0e1d
Compare
This updates the server's rename quick action to use the same name generation conflict resolution logic as the fixer. This is done by allowing the server's cache to be used as a new file provider and consolidating the logic for generating changes required for the templating worker and command worker. This also changes the inlay hints to exit early if the file is not parsed. This reduces errors in the server logs when working with empty files. Signed-off-by: Charlie Egan <[email protected]>
Signed-off-by: Charlie Egan <[email protected]>
Signed-off-by: Charlie Egan <[email protected]>
Signed-off-by: Charlie Egan <[email protected]>
This adapts the LSP and fixer to use the versionsMap functionality in the same way as the linter. Signed-off-by: Charlie Egan <[email protected]>
charlieegan3
force-pushed
the
rename-conflict-lsp-2
branch
from
2bc0e1d to
864a51b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This updates the server's rename quick action to use the same name generation conflict resolution logic as the fixer.
This is done by allowing the server's cache to be used as a new file provider and consolidating the logic for generating changes required for the templating worker and command worker. FixViolations is also added to support more targetted fixes.
This also changes the inlay hints to exit early if the file is not parsed. This reduces errors in the server logs when working with empty files.