Merge pull request #20506 from Veykril/veykril/push-xlytslrrylzq

Fix panic in syntax_highlighting

crates/ide/src/syntax_highlighting.rs

@@ -452,10 +452,10 @@ fn traverse(
                 }
                 hl
             }
-            NodeOrToken::Token(token) => {
+            NodeOrToken::Token(token) => salsa::attach(sema.db, || {
                 highlight::token(sema, token, edition, &is_unsafe_node, tt_level > 0)
                     .zip(Some(None))
-            }
+            }),
         };
         if let Some((mut highlight, binding_hash)) = element {
             if is_unlinked && highlight.tag == HlTag::UnresolvedReference {

crates/ide/src/syntax_highlighting/inject.rs

@@ -5,7 +5,7 @@ use std::mem;
 use either::Either;
 use hir::{EditionedFileId, HirFileId, InFile, Semantics, sym};
 use ide_db::{
-    SymbolKind, active_parameter::ActiveParameter, defs::Definition,
+    SymbolKind, active_parameter::ActiveParameter, base_db::salsa, defs::Definition,
     documentation::docs_with_rangemap, rust_doc::is_rust_fence,
 };
 use syntax::{
@@ -126,6 +126,7 @@ pub(super) fn doc_comment(
 
     // Extract intra-doc links and emit highlights for them.
     if let Some((docs, doc_mapping)) = docs_with_rangemap(sema.db, &attributes) {
+        salsa::attach(sema.db, || {
             extract_definitions_from_docs(&docs)
                 .into_iter()
                 .filter_map(|(range, link, ns)| {
@@ -151,6 +152,7 @@ pub(super) fn doc_comment(
                             | HlMod::IntraDocLink,
                         binding_hash: None,
                     })
+                })
         });
     }