Skip to content

fix: Add if..else completions in LetStmt and ArgList #20390

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion crates/ide-completion/src/completions/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ pub(crate) fn complete_expr_path(
after_if_expr,
in_condition,
incomplete_let,
in_value,
ref ref_expr_parent,
after_amp,
ref is_func_update,
Expand Down Expand Up @@ -361,10 +362,16 @@ pub(crate) fn complete_expr_path(
add_keyword("loop", "loop {\n $0\n}");
if in_match_guard {
add_keyword("if", "if $0");
} else if in_value {
add_keyword("if", "if $1 {\n $2\n} else {\n $0\n}");
} else {
add_keyword("if", "if $1 {\n $0\n}");
}
add_keyword("if let", "if let $1 = $2 {\n $0\n}");
if in_value {
add_keyword("if let", "if let $1 = $2 {\n $3\n} else {\n $0\n}");
} else {
add_keyword("if let", "if let $1 = $2 {\n $0\n}");
}
add_keyword("for", "for $1 in $2 {\n $0\n}");
add_keyword("true", "true");
add_keyword("false", "false");
Expand Down
116 changes: 116 additions & 0 deletions crates/ide-completion/src/completions/keyword.rs
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ fn main() {
r#"
fn main() {
let x = if $1 {
$2
} else {
$0
};
let y = 92;
Expand Down Expand Up @@ -335,6 +337,120 @@ fn main() {
)
}

#[test]
fn if_completion_in_parameter() {
check_edit(
"if",
r"
fn main() {
foo($0)
}
",
r"
fn main() {
foo(if $1 {
$2
} else {
$0
})
}
",
);

check_edit(
"if",
r"
fn main() {
foo($0, 2)
}
",
r"
fn main() {
foo(if $1 {
$2
} else {
$0
}, 2)
}
",
);

check_edit(
"if",
r"
fn main() {
foo(2, $0)
}
",
r"
fn main() {
foo(2, if $1 {
$2
} else {
$0
})
}
",
);

check_edit(
"if let",
r"
fn main() {
foo(2, $0)
}
",
r"
fn main() {
foo(2, if let $1 = $2 {
$3
} else {
$0
})
}
",
);
}

#[test]
fn if_completion_in_let_statement() {
check_edit(
"if",
r"
fn main() {
let x = $0;
}
",
r"
fn main() {
let x = if $1 {
$2
} else {
$0
};
}
",
);

check_edit(
"if let",
r"
fn main() {
let x = $0;
}
",
r"
fn main() {
let x = if let $1 = $2 {
$3
} else {
$0
};
}
",
);
}

#[test]
fn completes_let_in_block() {
check_edit(
Expand Down
1 change: 1 addition & 0 deletions crates/ide-completion/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ pub(crate) struct PathExprCtx<'db> {
/// Whether this expression is the direct condition of an if or while expression
pub(crate) in_condition: bool,
pub(crate) incomplete_let: bool,
pub(crate) in_value: bool,
pub(crate) ref_expr_parent: Option<ast::RefExpr>,
pub(crate) after_amp: bool,
/// The surrounding RecordExpression we are completing a functional update
Expand Down
2 changes: 2 additions & 0 deletions crates/ide-completion/src/context/analysis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1245,6 +1245,7 @@ fn classify_name_ref<'db>(
.parent()
.and_then(ast::LetStmt::cast)
.is_some_and(|it| it.semicolon_token().is_none());
let in_value = it.parent().and_then(Either::<ast::LetStmt, ast::ArgList>::cast).is_some();
let impl_ = fetch_immediate_impl(sema, original_file, expr.syntax());

let in_match_guard = match it.parent().and_then(ast::MatchArm::cast) {
Expand All @@ -1265,6 +1266,7 @@ fn classify_name_ref<'db>(
is_func_update,
innermost_ret_ty,
self_param,
in_value,
incomplete_let,
impl_,
in_match_guard,
Expand Down
Loading