Skip to content

fix: make postfix completion handle all references correctly #21036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: make postfix completion handle all references correctly #21036

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 76 additions & 4 deletions crates/ide-completion/src/completions/postfix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ use ide_db::{
text_edit::TextEdit,
ty_filter::TryEnum,
};
use itertools::Itertools;
use stdx::never;
use syntax::{
SyntaxKind::{EXPR_STMT, STMT_LIST},
T, TextRange, TextSize,
T, TextRange, TextSize, ToSmolStr,
ast::{self, AstNode, AstToken},
match_ast,
};
Expand Down Expand Up @@ -360,10 +361,18 @@ fn include_references(initial_element: &ast::Expr) -> (ast::Expr, String) {
resulting_element.syntax().parent().and_then(ast::RefExpr::cast)
{
found_ref_or_deref = true;
let exclusive = parent_ref_element.mut_token().is_some();
let last_child_or_token = parent_ref_element.syntax().last_child_or_token();
prefix.insert_str(
0,
parent_ref_element
.syntax()
.children_with_tokens()
.filter(|it| Some(it) != last_child_or_token.as_ref())
.format("")
.to_smolstr()
.as_str(),
);
resulting_element = ast::Expr::from(parent_ref_element);

prefix.insert_str(0, if exclusive { "&mut " } else { "&" });
}

if !found_ref_or_deref {
Expand Down Expand Up @@ -1005,6 +1014,20 @@ fn main() {
r#"fn main() { Ok(&&42) }"#,
);

check_edit_with_config(
CompletionConfig { snippets: vec![snippet.clone()], ..TEST_CONFIG },
"ok",
r#"fn main() { &raw mut 42.$0 }"#,
r#"fn main() { Ok(&raw mut 42) }"#,
);

check_edit_with_config(
CompletionConfig { snippets: vec![snippet.clone()], ..TEST_CONFIG },
"ok",
r#"fn main() { &raw const 42.$0 }"#,
r#"fn main() { Ok(&raw const 42) }"#,
);

check_edit_with_config(
CompletionConfig { snippets: vec![snippet], ..TEST_CONFIG },
"ok",
Expand All @@ -1031,6 +1054,55 @@ fn main() {
);
}

#[test]
fn postfix_custom_snippets_completion_for_reference_expr() {
// https://github.com/rust-lang/rust-analyzer/issues/21035
let snippet = Snippet::new(
&[],
&["group".into()],
&["(${receiver})".into()],
"",
&[],
crate::SnippetScope::Expr,
)
.unwrap();

check_edit_with_config(
CompletionConfig { snippets: vec![snippet.clone()], ..TEST_CONFIG },
"group",
r#"fn main() { &[1, 2, 3].g$0 }"#,
r#"fn main() { (&[1, 2, 3]) }"#,
);

check_edit_with_config(
CompletionConfig { snippets: vec![snippet.clone()], ..TEST_CONFIG },
"group",
r#"fn main() { &&foo(a, b, 1+1).$0 }"#,
r#"fn main() { (&&foo(a, b, 1+1)) }"#,
);

check_edit_with_config(
CompletionConfig { snippets: vec![snippet.clone()], ..TEST_CONFIG },
"group",
r#"fn main() { &mut Foo { a: 1, b: 2, c: 3 }.$0 }"#,
r#"fn main() { (&mut Foo { a: 1, b: 2, c: 3 }) }"#,
);

check_edit_with_config(
CompletionConfig { snippets: vec![snippet.clone()], ..TEST_CONFIG },
"group",
r#"fn main() { &raw mut Foo::new().$0 }"#,
r#"fn main() { (&raw mut Foo::new()) }"#,
);

check_edit_with_config(
CompletionConfig { snippets: vec![snippet.clone()], ..TEST_CONFIG },
"group",
r#"fn main() { &raw const Foo::bar::SOME_CONST.$0 }"#,
r#"fn main() { (&raw const Foo::bar::SOME_CONST) }"#,
);
}

#[test]
fn no_postfix_completions_in_if_block_that_has_an_else() {
check(
Expand Down