Skip to content

Commit 6fdf6b5

Browse files
authored
Merge pull request rust-lang#20735 from itsjunetime/fix_scip_salsa
fix SCIP panicking due to salsa not attaching
2 parents 4a39e59 + 1646027 commit 6fdf6b5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/tools/rust-analyzer/crates/ide/src/static_index.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ impl StaticIndex<'_> {
278278
for token in tokens {
279279
let range = token.text_range();
280280
let node = token.parent().unwrap();
281-
match get_definitions(&sema, token.clone()) {
281+
match salsa::attach(self.db, || get_definitions(&sema, token.clone())) {
282282
Some(it) => {
283283
for i in it {
284284
add_token(i, range, &node);

0 commit comments

Comments
 (0)