Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #22345 from A4-Tacks/lete-no-newline
minor: no add newline when `.lete` not in tail_expr
A4-Tacks 3 weeks ago
parent 3151400 · parent 57c530a · commit 9f890c5
-rw-r--r--crates/ide-completion/src/completions/postfix.rs30
1 files changed, 24 insertions, 6 deletions
diff --git a/crates/ide-completion/src/completions/postfix.rs b/crates/ide-completion/src/completions/postfix.rs
index 0cb39dd108..540089cf91 100644
--- a/crates/ide-completion/src/completions/postfix.rs
+++ b/crates/ide-completion/src/completions/postfix.rs
@@ -259,7 +259,7 @@ pub(crate) fn complete_postfix(
postfix_snippet(
"lete",
"let Ok else {}",
- format!("let Ok({placeholder}) = {receiver_text} else {{\n $2\n}};\n$0"),
+ format!("let Ok({placeholder}) = {receiver_text} else {{\n $2\n}};$0"),
)
.add_to(acc, ctx.db);
@@ -281,9 +281,7 @@ pub(crate) fn complete_postfix(
postfix_snippet(
"lete",
"let Some else {}",
- format!(
- "let Some({placeholder}) = {receiver_text} else {{\n $2\n}};\n$0"
- ),
+ format!("let Some({placeholder}) = {receiver_text} else {{\n $2\n}};$0"),
)
.add_to(acc, ctx.db);
@@ -1101,8 +1099,28 @@ fn main() {
let bar = Some(true);
let Some(${1:bar}) = bar else {
$2
-};
-$0
+};$0
+}
+"#,
+ );
+
+ check_edit(
+ "lete",
+ r#"
+//- minicore: option
+fn main() {
+ let bar = Some(true);
+ bar.$0
+ other();
+}
+"#,
+ r#"
+fn main() {
+ let bar = Some(true);
+ let Some(${1:bar}) = bar else {
+ $2
+};$0
+ other();
}
"#,
);