Unnamed repository; edit this file 'description' to name the repository.
Merge #11177
11177: internal: dont descend into comments r=Veykril a=jhgg fixes #11176 Co-authored-by: Jake Heinz <[email protected]>
bors[bot] 2022-01-03
parent abbc7e3 · parent 04decd5 · commit 8e9ccbf
-rw-r--r--crates/ide/src/syntax_highlighting.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs
index 28c7c546ff..f20d629fbf 100644
--- a/crates/ide/src/syntax_highlighting.rs
+++ b/crates/ide/src/syntax_highlighting.rs
@@ -282,7 +282,10 @@ fn traverse(
// only attempt to descend if we are inside a macro call or attribute
// as calling `descend_into_macros_single` gets rather expensive if done for every single token
- let descend_token = current_macro_call.is_some() || current_attr_call.is_some();
+ // additionally, do not descend into comments, descending maps down to doc attributes which get
+ // tagged as string literals.
+ let descend_token = (current_macro_call.is_some() || current_attr_call.is_some())
+ && element.kind() != COMMENT;
let element_to_highlight = if descend_token {
let token = match &element {
NodeOrToken::Node(_) => continue,