language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-03 21:25:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #18889 from ChayimFriedman2/subtle-completion

Browse source 
fix: Fix actual token lookup in completion's `expand()`
This commit is contained in:
Lukas Wirth 2025-01-09 12:12:38 +00:00 • committed by GitHub
commit cc016df54b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/ide-completion/src/context/analysis.rs
View file

@ -123,10 +123,11 @@ fn expand(
) -> Option<ExpansionResult> { ) -> Option<ExpansionResult> {
let _p = tracing::info_span!("CompletionContext::expand").entered(); let _p = tracing::info_span!("CompletionContext::expand").entered();
// Left biased since there may already be an identifier token there, and we appended to it.
if !sema.might_be_inside_macro_call(&fake_ident_token) if !sema.might_be_inside_macro_call(&fake_ident_token)
&& original_file && original_file
.token_at_offset(original_offset + relative_offset) .token_at_offset(original_offset + relative_offset)
.right_biased() .left_biased()
.is_some_and(|original_token| !sema.might_be_inside_macro_call(&original_token)) .is_some_and(|original_token| !sema.might_be_inside_macro_call(&original_token))
{ {
// Recursion base case. // Recursion base case.