[Rust] Refactor path matching #3854
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
Move some context to related ones and add section headers. This commit does not claim to be an accurate grouping, but some grouping for now is better than none. Additionally, the `statements-block` context was replaced with a `block` context that pops after matching, following the plural vs singular naming convention.
Rewrite type and identifier matching to fix problems with properly highlighting function calls. Not all cases are implemented yet, but this is a significant improvement over the previous situation. - The generics meta scope doesn't cover the preceding identifier anymore. - `meta.path` now spans the entire path, including the last segment. - The explicit `types` context is used in a couple more newly introduced contexts, i.e. for variable type declarations and `type` variables. A test file concerning identifier paths and function calls has been added. Some plural-vs-singular renaming has also been done, but not to all contexts.
deathaxe
reviewed
Oct 27, 2023
FichteFoll
force-pushed
the
pr/rust/paths
branch
from
ba69306 to
20ff4fa
Compare
deathaxe
approved these changes
Oct 30, 2023
|
Looks fine generally, I don't approve the |
|
Those in the test cases? They don't matter. I actually got used to add those final scope suffixes everywhere. |
|
I also came to like them because they indicate that a scope test tests the "full" scope name, i.e. it breaks when you add more to a scope but don't update the tests. It's also no extra effort for me to add them initially because PackageDev does all the work. |
keith-hall
approved these changes
Jan 15, 2024
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.
See the individual commits for details.
In this PR, I have rewritten path matching in Rust to
support.functionscopes in function callsf32::from(…))meta.pathspan the entire "path", as specified in the scope naming docsmeta.genericnot span the type it is being generic overpunctuation.accessorfor sub-path accessFixes a few outstanding issues from #2305 (such as #2305 (comment), highlighting of
unionas a function name, which is a soft-keyword).In addition, the syntax definition file has been restructured a bit by organizing related contexts in sections.