fix: Properly account for editions in names #17905
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
rustbot
added
the
S-waiting-on-review
ChayimFriedman2
changed the title
ChayimFriedman2
force-pushed
the
edition-dependent-raw-keyword
branch
from
a7462d0 to
9d3cd5a
Compare
|
I didn't know we run Clippy! |
Veykril
reviewed
Aug 16, 2024
ChayimFriedman2
force-pushed
the
edition-dependent-raw-keyword
branch
2 times, most recently
from
3ef8fe7 to
28f004a
Compare
|
Fixed all comments. |
ChayimFriedman2
force-pushed
the
edition-dependent-raw-keyword
branch
from
28f004a to
e610a81
Compare
Veykril
reviewed
Aug 16, 2024
|
r=me with that last thing fixed, thanks! |
|
✌️ @ChayimFriedman2, you can now approve this pull request! If @Veykril told you to " |
This PR touches a lot of parts. But the main changes are changing `hir_expand::Name` to be raw edition-dependently and only when necessary (unrelated to how the user originally wrote the identifier), and changing `is_keyword()` and `is_raw_identifier()` to be edition-aware (this was done in rust-lang#17896, but the FIXMEs were fixed here). It is possible that I missed some cases, but most IDE parts should properly escape (or not escape) identifiers now. The rules of thumb are: - If we show the identifier to the user, its rawness should be determined by the edition of the edited crate. This is nice for IDE features, but really important for changes we insert to the source code. - For tests, I chose `Edition::CURRENT` (so we only have to (maybe) update tests when an edition becomes stable, to avoid churn). - For debugging tools (helper methods and logs), I used `Edition::LATEST`.
ChayimFriedman2
force-pushed
the
edition-dependent-raw-keyword
branch
from
e610a81 to
9d3368f
Compare
|
☀️ Test successful - checks-actions |
Turns out I was dumb, that function is something I introduced in a non yet merged branch of mine 🙃 apologies for that confusion |
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 PR touches a lot of parts. But the main changes are changing
hir_expand::Nameto be raw edition-dependently and only when necessary (unrelated to how the user originally wrote the identifier), and changingis_keyword()andis_raw_identifier()to be edition-aware (this was done in #17896, but the FIXMEs were fixed here).It is possible that I missed some cases, but most IDE parts should properly escape (or not escape) identifiers now.
The rules of thumb are:
Edition::CURRENT(so we only have to (maybe) update tests when an edition becomes stable, to avoid churn).Edition::LATEST.Reviewing notes:
This is a really big PR but most of it is mechanical translation. I changed
Namedisplayers to require an edition, and followed the compiler errors. Most methods just propagate the edition requirement. The interesting cases are mostly inide-assists, as sometimes the correct crate to fetch the edition from requires awareness (there may be two).ide-completionsandide-diagnosticswere solved pretty easily by introducing an edition field to their context.idecontains many features, for most of them it was propagated to the top level function and there the edition was fetched based on the file.I also fixed all FIXMEs from #17896. Some required introducing an edition parameter (usually not for many methods after the changes to
Name), some were changed to a new methodis_any_identifier()because they really want any possible keyword.Fixes #17895.
Fixes #17774.