Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

slightly improve highlighting performance for derive annotated items

Browse source
This commit is contained in:
Lukas Wirth 2022-03-03 22:59:34 +01:00
parent 8ded3ec9cf
commit 464dd814ca
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/ide/src/syntax_highlighting.rs
View file

@ -206,6 +206,7 @@ fn traverse(
let mut current_macro_call: Option<ast::MacroCall> = None; let mut current_macro_call: Option<ast::MacroCall> = None;
let mut current_attr_call = None; let mut current_attr_call = None;
let mut current_derive_call = None;
let mut current_macro: Option<ast::Macro> = None; let mut current_macro: Option<ast::Macro> = None;
let mut macro_highlighter = MacroHighlighter::default(); let mut macro_highlighter = MacroHighlighter::default();
let mut inside_attribute = false; let mut inside_attribute = false;
@ -249,7 +250,7 @@ fn traverse(
}; };
match adt { match adt {
Some(adt) if sema.is_derive_annotated(&adt) => { Some(adt) if sema.is_derive_annotated(&adt) => {
current_attr_call = Some(adt.into()); current_derive_call = Some(ast::Item::from(adt));
} }
_ => (), _ => (),
} }
@ -273,7 +274,10 @@ fn traverse(
macro_highlighter = MacroHighlighter::default(); macro_highlighter = MacroHighlighter::default();
} }
Some(item) if current_attr_call.as_ref().map_or(false, |it| *it == item) => { Some(item) if current_attr_call.as_ref().map_or(false, |it| *it == item) => {
current_attr_call = None current_attr_call = None;
}
Some(item) if current_derive_call.as_ref().map_or(false, |it| *it == item) => {
current_derive_call = None;
} }
None if ast::Attr::can_cast(node.kind()) => inside_attribute = false, None if ast::Attr::can_cast(node.kind()) => inside_attribute = false,
_ => (), _ => (),
@ -301,17 +305,19 @@ fn traverse(
// as calling `descend_into_macros_single` gets rather expensive if done for every single token // as calling `descend_into_macros_single` gets rather expensive if done for every single token
// additionally, do not descend into comments, descending maps down to doc attributes which get // additionally, do not descend into comments, descending maps down to doc attributes which get
// tagged as string literals. // tagged as string literals.
let descend_token = (current_macro_call.is_some() || current_attr_call.is_some()) let descend_token = (current_macro_call.is_some()
|| current_attr_call.is_some()
|| current_derive_call.is_some())
&& element.kind() != COMMENT; && element.kind() != COMMENT;
let element_to_highlight = if descend_token { let element_to_highlight = if descend_token {
let token = match &element { let token = match &element {
NodeOrToken::Node(_) => continue, NodeOrToken::Node(_) => continue,
NodeOrToken::Token(tok) => tok.clone(), NodeOrToken::Token(tok) => tok.clone(),
}; };
let in_mcall_outside_tt = current_macro_call.is_some() let in_mcall_outside_tt = current_attr_call.is_none()
&& token.parent().as_ref().map(SyntaxNode::kind) != Some(TOKEN_TREE); && token.parent().as_ref().map(SyntaxNode::kind) != Some(TOKEN_TREE);
let token = match in_mcall_outside_tt { let token = match in_mcall_outside_tt {
// not in the macros token tree, don't attempt to descend // not in the macros/derives token tree, don't attempt to descend
true => token, true => token,
false => sema.descend_into_macros_single(token), false => sema.descend_into_macros_single(token),
}; };

5
crates/ide/src/syntax_highlighting/test_data/highlight_lifetimes.html
View file

@ -51,7 +51,4 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
<span class="keyword">where</span> <span class="keyword">where</span>
<span class="lifetime">'a</span><span class="colon">:</span> <span class="lifetime">'a</span><span class="comma">,</span> <span class="lifetime">'a</span><span class="colon">:</span> <span class="lifetime">'a</span><span class="comma">,</span>
<span class="lifetime">'static</span><span class="colon">:</span> <span class="lifetime">'static</span> <span class="lifetime">'static</span><span class="colon">:</span> <span class="lifetime">'static</span>
<span class="brace">{</span> <span class="brace">{</span><span class="brace">}</span></code></pre>
<span class="brace">}</span>
</code></pre>

4
crates/ide/src/syntax_highlighting/tests.rs
View file

@ -327,9 +327,7 @@ impl<'a> Foo<'_, 'a, 'static>
where where
'a: 'a, 'a: 'a,
'static: 'static 'static: 'static
{ {}
}
"#, "#,
expect_file!["./test_data/highlight_lifetimes.html"], expect_file!["./test_data/highlight_lifetimes.html"],
false, false,