feat: Add proc macro semantic token type #16808
Merged
+56
−14
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
Veykril
reviewed
Mar 11, 2024
crates/hir/src/semantics.rs
Outdated
Comment on lines
1240
to
1245
| let sa = match self.analyze(macro_call.syntax()) { | ||
| Some(it) => it, | ||
| None => return false, | ||
| }; | ||
| let macro_call = self.find_file(macro_call.syntax()).with_value(macro_call); | ||
| sa.is_proc_macro_call(self.db, macro_call) |
There was a problem hiding this comment.
Suggested change
| let sa = match self.analyze(macro_call.syntax()) { | |
| Some(it) => it, | |
| None => return false, | |
| }; | |
| let macro_call = self.find_file(macro_call.syntax()).with_value(macro_call); | |
| sa.is_proc_macro_call(self.db, macro_call) | |
| self.resolve_macro_call(macro_call).map_or(false, |m| matches!(m.id, MacroId::ProcMacroId(..)) |
No need for SourceAnalyzer::is_proc_macro_call then
Comment on lines
525
to
527
| if inside_proc_macro_call { | ||
| highlight |= HlMod::ProcMacro | ||
| } else { | ||
| highlight |= HlMod::Macro | ||
| } |
There was a problem hiding this comment.
Suggested change
| if inside_proc_macro_call { | |
| highlight |= HlMod::ProcMacro | |
| } else { | |
| highlight |= HlMod::Macro | |
| } | |
| if inside_proc_macro_call { | |
| highlight |= HlMod::ProcMacro | |
| } | |
| highlight |= HlMod::Macro |
I think this makes more sense, that way one doesn't have to handle the proc macro modifier specifically if they are only interested in macros in general
ShoyuVanilla
force-pushed
the
proc-macro-sem-token
branch
from
d6e4d6f
to
fc11216
Compare
|
Thanks! |
|
☀️ Test successful - checks-actions |
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.
Closes #11529