Auto merge of #17552 - Veykril:fn-param-comp-fix, r=Veykril

bors · bors · commit 69523cc8b8de · 2024-07-07T06:12:47.000Z
fix: Fix parameter completions using macro expanded source ranges Fixes #17550
diff --git a/crates/ide-completion/src/completions/fn_param.rs b/crates/ide-completion/src/completions/fn_param.rs
@@ -173,7 +173,8 @@ fn should_add_self_completions(
 }
 
 fn comma_wrapper(ctx: &CompletionContext<'_>) -> Option<(impl Fn(&str) -> String, TextRange)> {
-    let param = ctx.token.parent_ancestors().find(|node| node.kind() == SyntaxKind::PARAM)?;
+    let param =
+        ctx.original_token.parent_ancestors().find(|node| node.kind() == SyntaxKind::PARAM)?;
 
     let next_token_kind = {
         let t = param.last_token()?.next_token()?;

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,8 @@ fn should_add_self_completions(`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`fn comma_wrapper(ctx: &CompletionContext<'_>) -> Option<(impl Fn(&str) -> String, TextRange)> {`
`176`		`- let param = ctx.token.parent_ancestors().find(\|node\| node.kind() == SyntaxKind::PARAM)?;`
	`176`	`+ let param =`
	`177`	`+ ctx.original_token.parent_ancestors().find(\|node\| node.kind() == SyntaxKind::PARAM)?;`
`177`	`178`
`178`	`179`	`let next_token_kind = {`
`179`	`180`	`let t = param.last_token()?.next_token()?;`