about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorShoyu Vanilla (Flint) <modulo641@gmail.com>2025-09-25 10:30:12 +0000
committerGitHub <noreply@github.com>2025-09-25 10:30:12 +0000
commit6fdf6b53eb3366391cfb7a4e17efac1555b5c5ad (patch)
tree40f1b1690854502d31efcdbf104e8908faf956d2 /src/tools
parent4a39e597d20567578bfd2611e4da19ee68fd3a0b (diff)
parent16460273e0b980b8b34213eac9426066777a520b (diff)
downloadrust-6fdf6b53eb3366391cfb7a4e17efac1555b5c5ad.tar.gz
rust-6fdf6b53eb3366391cfb7a4e17efac1555b5c5ad.zip
Merge pull request #20735 from itsjunetime/fix_scip_salsa
fix SCIP panicking due to salsa not attaching
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/rust-analyzer/crates/ide/src/static_index.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/rust-analyzer/crates/ide/src/static_index.rs b/src/tools/rust-analyzer/crates/ide/src/static_index.rs
index 8214b4d1de2..9911b85799b 100644
--- a/src/tools/rust-analyzer/crates/ide/src/static_index.rs
+++ b/src/tools/rust-analyzer/crates/ide/src/static_index.rs
@@ -278,7 +278,7 @@ impl StaticIndex<'_> {
         for token in tokens {
             let range = token.text_range();
             let node = token.parent().unwrap();
-            match get_definitions(&sema, token.clone()) {
+            match salsa::attach(self.db, || get_definitions(&sema, token.clone())) {
                 Some(it) => {
                     for i in it {
                         add_token(i, range, &node);