language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: Fix completions for locals not working properly inside macro calls

Browse source
This commit is contained in:
Lukas Wirth 2022-06-27 14:39:44 +02:00
parent b74e96f509
commit bdbffdd463
3 changed files with 45 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ide-completion/src/context.rs
View file

@ -506,7 +506,11 @@ impl<'a> CompletionContext<'a> {
let original_token = original_file.syntax().token_at_offset(offset).left_biased()?;
let token = sema.descend_into_macros_single(original_token.clone());
let scope = sema.scope_at_offset(&token.parent()?, offset)?;
// adjust for macro input, this still fails if there is no token written yet
let scope_offset = if original_token == token { offset } else { token.text_range().end() };
let scope = sema.scope_at_offset(&token.parent()?, scope_offset)?;
let krate = scope.krate();
let module = scope.module();