Skip to content

Commit 474ebd6

Browse files
committed
add let and letm postfix to turn expressions into variables
Signed-off-by: Benjamin Coenen <[email protected]>
1 parent 775c691 commit 474ebd6

File tree

2 files changed

+56
-11
lines changed

2 files changed

+56
-11
lines changed

crates/completion/src/completions/postfix.rs

Lines changed: 54 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ mod format_like;
55
use ide_db::ty_filter::TryEnum;
66
use syntax::{
77
ast::{self, AstNode, AstToken},
8+
SyntaxKind::BLOCK_EXPR,
89
TextRange, TextSize,
910
};
1011
use text_edit::TextEdit;
@@ -220,17 +221,29 @@ pub(crate) fn complete_postfix(acc: &mut Completions, ctx: &CompletionContext) {
220221
)
221222
.add_to(acc);
222223

223-
postfix_snippet(ctx, cap, &dot_receiver, "let", "let", &format!("let $0 = {};", receiver_text))
224-
.add_to(acc);
225-
postfix_snippet(
226-
ctx,
227-
cap,
228-
&dot_receiver,
229-
"letm",
230-
"let mut",
231-
&format!("let mut $0 = {};", receiver_text),
232-
)
233-
.add_to(acc);
224+
let parent_node = dot_receiver.syntax().parent().and_then(|p| p.parent());
225+
if let Some(parent) = parent_node {
226+
if parent.kind() == BLOCK_EXPR {
227+
postfix_snippet(
228+
ctx,
229+
cap,
230+
&dot_receiver,
231+
"let",
232+
"let",
233+
&format!("let $0 = {};", receiver_text),
234+
)
235+
.add_to(acc);
236+
postfix_snippet(
237+
ctx,
238+
cap,
239+
&dot_receiver,
240+
"letm",
241+
"let mut",
242+
&format!("let mut $0 = {};", receiver_text),
243+
)
244+
.add_to(acc);
245+
}
246+
}
234247

235248
if let ast::Expr::Literal(literal) = dot_receiver.clone() {
236249
if let Some(literal_text) = ast::String::cast(literal.token()) {
@@ -321,6 +334,36 @@ fn main() {
321334
);
322335
}
323336

337+
#[test]
338+
fn postfix_completion_works_for_function_calln() {
339+
check(
340+
r#"
341+
fn foo(elt: bool) -> bool {
342+
!elt
343+
}
344+
345+
fn main() {
346+
let bar = true;
347+
foo(bar.<|>)
348+
}
349+
"#,
350+
expect![[r#"
351+
sn box Box::new(expr)
352+
sn call function(expr)
353+
sn dbg dbg!(expr)
354+
sn dbgr dbg!(&expr)
355+
sn if if expr {}
356+
sn match match expr {}
357+
sn not !expr
358+
sn ok Ok(expr)
359+
sn ref &expr
360+
sn refm &mut expr
361+
sn some Some(expr)
362+
sn while while expr {}
363+
"#]],
364+
);
365+
}
366+
324367
#[test]
325368
fn postfix_type_filtering() {
326369
check(

crates/completion/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ pub use crate::{
4444
// - `expr.while` -> `while expr {}` or `while let ... {}` for `Option` or `Result`
4545
// - `expr.ref` -> `&expr`
4646
// - `expr.refm` -> `&mut expr`
47+
// - `expr.let` -> `let <|> = expr;`
48+
// - `expr.letm` -> `let mut <|> = expr;`
4749
// - `expr.not` -> `!expr`
4850
// - `expr.dbg` -> `dbg!(expr)`
4951
// - `expr.dbgr` -> `dbg!(&expr)`

0 commit comments

Comments
 (0)