1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
use syntax::{
ast::{self, edit::AstNodeEdit, make},
AstNode,
};
use crate::{AssistContext, AssistId, AssistKind, Assists};
// Assist: add_braces
//
// Adds braces to lambda and match arm expressions.
//
// ```
// fn foo(n: i32) -> i32 {
// match n {
// 1 =>$0 n + 1,
// _ => 0
// }
// }
// ```
// ->
// ```
// fn foo(n: i32) -> i32 {
// match n {
// 1 => {
// n + 1
// },
// _ => 0
// }
// }
// ```
pub(crate) fn add_braces(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
let (expr_type, expr) = get_replacement_node(ctx)?;
acc.add(
AssistId("add_braces", AssistKind::RefactorRewrite),
match expr_type {
ParentType::ClosureExpr => "Add braces to closure body",
ParentType::MatchArmExpr => "Add braces to arm expression",
},
expr.syntax().text_range(),
|builder| {
let block_expr = AstNodeEdit::indent(
&make::block_expr(None, Some(expr.clone())),
AstNodeEdit::indent_level(&expr),
);
builder.replace(expr.syntax().text_range(), block_expr.syntax().text());
},
)
}
enum ParentType {
MatchArmExpr,
ClosureExpr,
}
fn get_replacement_node(ctx: &AssistContext<'_>) -> Option<(ParentType, ast::Expr)> {
if let Some(match_arm) = ctx.find_node_at_offset::<ast::MatchArm>() {
let match_arm_expr = match_arm.expr()?;
if matches!(match_arm_expr, ast::Expr::BlockExpr(_)) {
return None;
}
return Some((ParentType::MatchArmExpr, match_arm_expr));
} else if let Some(closure_expr) = ctx.find_node_at_offset::<ast::ClosureExpr>() {
let body = closure_expr.body()?;
if matches!(body, ast::Expr::BlockExpr(_)) {
return None;
}
return Some((ParentType::ClosureExpr, body));
}
None
}
#[cfg(test)]
mod tests {
use crate::tests::{check_assist, check_assist_not_applicable};
use super::*;
#[test]
fn suggest_add_braces_for_closure() {
check_assist(
add_braces,
r#"
fn foo() {
t(|n|$0 n + 100);
}
"#,
r#"
fn foo() {
t(|n| {
n + 100
});
}
"#,
);
}
#[test]
fn no_assist_for_closures_with_braces() {
check_assist_not_applicable(
add_braces,
r#"
fn foo() {
t(|n|$0 { n + 100 });
}
"#,
);
}
#[test]
fn suggest_add_braces_for_match() {
check_assist(
add_braces,
r#"
fn foo() {
match n {
Some(n) $0=> 29,
_ => ()
};
}
"#,
r#"
fn foo() {
match n {
Some(n) => {
29
},
_ => ()
};
}
"#,
);
}
#[test]
fn no_assist_for_match_with_braces() {
check_assist_not_applicable(
add_braces,
r#"
fn foo() {
match n {
Some(n) $0=> { return 29; },
_ => ()
};
}
"#,
);
}
}
|
