language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-31 20:09:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix IDE resolution of use inside a body

Browse source 
We stopped the expression search too early because `use` is an item.
This commit is contained in:
Chayim Refael Friedman 2025-02-04 18:30:50 +02:00
parent 0fd4fc3522
commit 134b6f2228
2 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/hir/src/source_analyzer.rs
View file

@ -1252,7 +1252,11 @@ fn scope_for(
node: InFile<&SyntaxNode>,
) -> Option<ScopeId> {
node.ancestors_with_macros(db.upcast())
.take_while(|it| !ast::Item::can_cast(it.kind()) || ast::MacroCall::can_cast(it.kind()))
.take_while(|it| {
!ast::Item::can_cast(it.kind())
|| ast::MacroCall::can_cast(it.kind())
|| ast::Use::can_cast(it.kind())
})
.filter_map(|it| it.map(ast::Expr::cast).transpose())
.filter_map(|it| source_map.node_expr(it.as_ref())?.as_expr())
.find_map(|it| scopes.scope_for(it))