Skip to content

Add default varname for TryEnum postfix completion #21212

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

Merged
ChayimFriedman2 merged 1 commit into from
Dec 21, 2025
+70 −21
Merged

Add default varname for TryEnum postfix completion #21212

Show file tree
Hide file tree
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
76 changes: 58 additions & 18 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 @@ -8,16 +8,18 @@ use ide_db::{
RootDatabase, SnippetCap,
documentation::{Documentation, HasDocs},
imports::insert_use::ImportScope,
syntax_helpers::suggest_name::NameGenerator,
text_edit::TextEdit,
ty_filter::TryEnum,
};
use itertools::Itertools;
use stdx::never;
use syntax::{
SmolStr,
SyntaxKind::{EXPR_STMT, STMT_LIST},
T, TextRange, TextSize, ToSmolStr,
ast::{self, AstNode, AstToken},
match_ast,
format_smolstr, match_ast,
};

use crate::{
Expand Down Expand Up @@ -117,29 +119,34 @@ pub(crate) fn complete_postfix(
if let Some(parent_expr) = ast::Expr::cast(parent) {
is_in_cond = is_in_condition(&parent_expr);
}
let placeholder = suggest_receiver_name(dot_receiver, "0", &ctx.sema);
match &try_enum {
Some(try_enum) if is_in_cond => match try_enum {
TryEnum::Result => {
postfix_snippet("let", "let Ok(_)", &format!("let Ok($0) = {receiver_text}"))
.add_to(acc, ctx.db);
postfix_snippet(
"let",
"let Ok(_)",
&format!("let Ok({placeholder}) = {receiver_text}"),
)
.add_to(acc, ctx.db);
postfix_snippet(
"letm",
"let Ok(mut _)",
&format!("let Ok(mut $0) = {receiver_text}"),
&format!("let Ok(mut {placeholder}) = {receiver_text}"),
)
.add_to(acc, ctx.db);
}
TryEnum::Option => {
postfix_snippet(
"let",
"let Some(_)",
&format!("let Some($0) = {receiver_text}"),
&format!("let Some({placeholder}) = {receiver_text}"),
)
.add_to(acc, ctx.db);
postfix_snippet(
"letm",
"let Some(mut _)",
&format!("let Some(mut $0) = {receiver_text}"),
&format!("let Some(mut {placeholder}) = {receiver_text}"),
)
.add_to(acc, ctx.db);
}
Expand Down Expand Up @@ -186,48 +193,53 @@ pub(crate) fn complete_postfix(
}
}
if let Some(try_enum) = &try_enum {
let placeholder = suggest_receiver_name(dot_receiver, "1", &ctx.sema);
match try_enum {
TryEnum::Result => {
postfix_snippet(
"ifl",
"if let Ok {}",
&format!("if let Ok($1) = {receiver_text} {{\n $0\n}}"),
&format!("if let Ok({placeholder}) = {receiver_text} {{\n $0\n}}"),
)
.add_to(acc, ctx.db);

postfix_snippet(
"lete",
"let Ok else {}",
&format!("let Ok($1) = {receiver_text} else {{\n $2\n}};\n$0"),
&format!(
"let Ok({placeholder}) = {receiver_text} else {{\n $2\n}};\n$0"
),
)
.add_to(acc, ctx.db);

postfix_snippet(
"while",
"while let Ok {}",
&format!("while let Ok($1) = {receiver_text} {{\n $0\n}}"),
&format!("while let Ok({placeholder}) = {receiver_text} {{\n $0\n}}"),
)
.add_to(acc, ctx.db);
}
TryEnum::Option => {
postfix_snippet(
"ifl",
"if let Some {}",
&format!("if let Some($1) = {receiver_text} {{\n $0\n}}"),
&format!("if let Some({placeholder}) = {receiver_text} {{\n $0\n}}"),
)
.add_to(acc, ctx.db);

postfix_snippet(
"lete",
"let Some else {}",
&format!("let Some($1) = {receiver_text} else {{\n $2\n}};\n$0"),
&format!(
"let Some({placeholder}) = {receiver_text} else {{\n $2\n}};\n$0"
),
)
.add_to(acc, ctx.db);

postfix_snippet(
"while",
"while let Some {}",
&format!("while let Some($1) = {receiver_text} {{\n $0\n}}"),
&format!("while let Some({placeholder}) = {receiver_text} {{\n $0\n}}"),
)
.add_to(acc, ctx.db);
}
Expand Down Expand Up @@ -302,6 +314,34 @@ pub(crate) fn complete_postfix(
}
}

fn suggest_receiver_name(
receiver: &ast::Expr,
n: &str,
sema: &Semantics<'_, RootDatabase>,
) -> SmolStr {
let placeholder = |name| format_smolstr!("${{{n}:{name}}}");

match receiver {
ast::Expr::PathExpr(path) => {
if let Some(name) = path.path().and_then(|it| it.as_single_name_ref()) {
return placeholder(name.text().as_str());
}
}
ast::Expr::RefExpr(it) => {
if let Some(receiver) = it.expr() {
return suggest_receiver_name(&receiver, n, sema);
}
}
_ => {}
}

let name = NameGenerator::new_with_names([].into_iter()).try_for_variable(receiver, sema);
match name {
Some(name) => placeholder(&name),
None => format_smolstr!("${n}"),
}
}

fn get_receiver_text(
sema: &Semantics<'_, RootDatabase>,
receiver: &ast::Expr,
Expand Down Expand Up @@ -616,7 +656,7 @@ fn main() {
r#"
fn main() {
let bar = Some(true);
if let Some($1) = bar {
if let Some(${1:bar}) = bar {
$0
}
}
Expand Down Expand Up @@ -666,7 +706,7 @@ fn main() {
r#"
fn main() {
let bar = Some(true);
if let Some($0) = bar
if let Some(${0:bar}) = bar
}
"#,
);
Expand All @@ -682,7 +722,7 @@ fn main() {
r#"
fn main() {
let bar = Some(true);
if true && let Some($0) = bar
if true && let Some(${0:bar}) = bar
}
"#,
);
Expand All @@ -698,7 +738,7 @@ fn main() {
r#"
fn main() {
let bar = Some(true);
if true && true && let Some($0) = bar
if true && true && let Some(${0:bar}) = bar
}
"#,
);
Expand All @@ -718,7 +758,7 @@ fn main() {
r#"
fn main() {
let bar = Some(true);
let Some($1) = bar else {
let Some(${1:bar}) = bar else {
$2
};
$0
Expand Down Expand Up @@ -792,7 +832,7 @@ fn main() {
r#"
fn main() {
let bar = &Some(true);
if let Some($1) = bar {
if let Some(${1:bar}) = bar {
$0
}
}
Expand Down
15 changes: 12 additions & 3 deletions crates/ide-db/src/syntax_helpers/suggest_name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,19 @@ impl NameGenerator {
expr: &ast::Expr,
sema: &Semantics<'_, RootDatabase>,
) -> SmolStr {
self.try_for_variable(expr, sema).unwrap_or(SmolStr::new_static("var_name"))
}

/// Similar to `for_variable`, but fallback returns `None`
pub fn try_for_variable(
&mut self,
expr: &ast::Expr,
sema: &Semantics<'_, RootDatabase>,
) -> Option<SmolStr> {
// `from_param` does not benefit from stripping it need the largest
// context possible so we check firstmost
if let Some(name) = from_param(expr, sema) {
return self.suggest_name(&name);
return Some(self.suggest_name(&name));
}

let mut next_expr = Some(expr.clone());
Expand All @@ -209,7 +218,7 @@ impl NameGenerator {
.or_else(|| from_type(&expr, sema))
.or_else(|| from_field_name(&expr));
if let Some(name) = name {
return self.suggest_name(&name);
return Some(self.suggest_name(&name));
}

match expr {
Expand All @@ -229,7 +238,7 @@ impl NameGenerator {
}
}

self.suggest_name("var_name")
None
}

/// Insert a name into the pool
Expand Down