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
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
|
use syntax::{
ast::{self, AstNode},
SyntaxElement, SyntaxKind, TextRange, TextSize, T,
};
use crate::{AssistContext, AssistId, AssistKind, Assists};
// Assist: remove_dbg
//
// Removes `dbg!()` macro call.
//
// ```
// fn main() {
// <|>dbg!(92);
// }
// ```
// ->
// ```
// fn main() {
// 92;
// }
// ```
pub(crate) fn remove_dbg(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
let macro_call = ctx.find_node_at_offset::<ast::MacroCall>()?;
let new_contents = adjusted_macro_contents(¯o_call)?;
let macro_text_range = macro_call.syntax().text_range();
let macro_end = if macro_call.semicolon_token().is_some() {
macro_text_range.end() - TextSize::of(';')
} else {
macro_text_range.end()
};
acc.add(
AssistId("remove_dbg", AssistKind::Refactor),
"Remove dbg!()",
macro_text_range,
|builder| {
builder.replace(TextRange::new(macro_text_range.start(), macro_end), new_contents);
},
)
}
fn adjusted_macro_contents(macro_call: &ast::MacroCall) -> Option<String> {
let contents = get_valid_macrocall_contents(¯o_call, "dbg")?;
let macro_text_with_brackets = macro_call.token_tree()?.syntax().text();
let macro_text_in_brackets = macro_text_with_brackets.slice(TextRange::new(
TextSize::of('('),
macro_text_with_brackets.len() - TextSize::of(')'),
));
let is_leaf = macro_call.syntax().next_sibling().is_none();
Some(if !is_leaf && needs_parentheses_around_macro_contents(contents) {
format!("({})", macro_text_in_brackets)
} else {
macro_text_in_brackets.to_string()
})
}
/// Verifies that the given macro_call actually matches the given name
/// and contains proper ending tokens, then returns the contents between the ending tokens
fn get_valid_macrocall_contents(
macro_call: &ast::MacroCall,
macro_name: &str,
) -> Option<Vec<SyntaxElement>> {
let path = macro_call.path()?;
let name_ref = path.segment()?.name_ref()?;
// Make sure it is actually a dbg-macro call, dbg followed by !
let excl = path.syntax().next_sibling_or_token()?;
if name_ref.text() != macro_name || excl.kind() != T![!] {
return None;
}
let mut children_with_tokens = macro_call.token_tree()?.syntax().children_with_tokens();
let first_child = children_with_tokens.next()?;
let mut contents_between_brackets = children_with_tokens.collect::<Vec<_>>();
let last_child = contents_between_brackets.pop()?;
if contents_between_brackets.is_empty() {
None
} else {
match (first_child.kind(), last_child.kind()) {
(T!['('], T![')']) | (T!['['], T![']']) | (T!['{'], T!['}']) => {
Some(contents_between_brackets)
}
_ => None,
}
}
}
fn needs_parentheses_around_macro_contents(macro_contents: Vec<SyntaxElement>) -> bool {
if macro_contents.len() < 2 {
return false;
}
let mut macro_contents = macro_contents.into_iter().peekable();
let mut unpaired_brackets_in_contents = Vec::new();
while let Some(element) = macro_contents.next() {
match element.kind() {
T!['('] | T!['['] | T!['{'] => unpaired_brackets_in_contents.push(element),
T![')'] => {
if !matches!(unpaired_brackets_in_contents.pop(), Some(correct_bracket) if correct_bracket.kind() == T!['('])
{
return true;
}
}
T![']'] => {
if !matches!(unpaired_brackets_in_contents.pop(), Some(correct_bracket) if correct_bracket.kind() == T!['['])
{
return true;
}
}
T!['}'] => {
if !matches!(unpaired_brackets_in_contents.pop(), Some(correct_bracket) if correct_bracket.kind() == T!['{'])
{
return true;
}
}
symbol_kind => {
let symbol_not_in_bracket = unpaired_brackets_in_contents.is_empty();
if symbol_not_in_bracket
&& symbol_kind != SyntaxKind::COLON // paths
&& (symbol_kind != SyntaxKind::DOT // field/method access
|| macro_contents // range expressions consist of two SyntaxKind::Dot in macro invocations
.peek()
.map(|element| element.kind() == SyntaxKind::DOT)
.unwrap_or(false))
&& symbol_kind != SyntaxKind::QUESTION // try operator
&& (symbol_kind.is_punct() || symbol_kind == SyntaxKind::AS_KW)
{
return true;
}
}
}
}
!unpaired_brackets_in_contents.is_empty()
}
#[cfg(test)]
mod tests {
use crate::tests::{check_assist, check_assist_not_applicable, check_assist_target};
use super::*;
#[test]
fn test_remove_dbg() {
check_assist(remove_dbg, "<|>dbg!(1 + 1)", "1 + 1");
check_assist(remove_dbg, "dbg!<|>((1 + 1))", "(1 + 1)");
check_assist(remove_dbg, "dbg!(1 <|>+ 1)", "1 + 1");
check_assist(remove_dbg, "let _ = <|>dbg!(1 + 1)", "let _ = 1 + 1");
check_assist(
remove_dbg,
"
fn foo(n: usize) {
if let Some(_) = dbg!(n.<|>checked_sub(4)) {
// ...
}
}
",
"
fn foo(n: usize) {
if let Some(_) = n.checked_sub(4) {
// ...
}
}
",
);
check_assist(remove_dbg, "<|>dbg!(Foo::foo_test()).bar()", "Foo::foo_test().bar()");
}
#[test]
fn test_remove_dbg_with_brackets_and_braces() {
check_assist(remove_dbg, "dbg![<|>1 + 1]", "1 + 1");
check_assist(remove_dbg, "dbg!{<|>1 + 1}", "1 + 1");
}
#[test]
fn test_remove_dbg_not_applicable() {
check_assist_not_applicable(remove_dbg, "<|>vec![1, 2, 3]");
check_assist_not_applicable(remove_dbg, "<|>dbg(5, 6, 7)");
check_assist_not_applicable(remove_dbg, "<|>dbg!(5, 6, 7");
}
#[test]
fn test_remove_dbg_target() {
check_assist_target(
remove_dbg,
"
fn foo(n: usize) {
if let Some(_) = dbg!(n.<|>checked_sub(4)) {
// ...
}
}
",
"dbg!(n.checked_sub(4))",
);
}
#[test]
fn test_remove_dbg_keep_semicolon() {
// https://github.com/rust-analyzer/rust-analyzer/issues/5129#issuecomment-651399779
// not quite though
// adding a comment at the end of the line makes
// the ast::MacroCall to include the semicolon at the end
check_assist(
remove_dbg,
r#"let res = <|>dbg!(1 * 20); // needless comment"#,
r#"let res = 1 * 20; // needless comment"#,
);
}
#[test]
fn remove_dbg_from_non_leaf_simple_expression() {
check_assist(
remove_dbg,
"
fn main() {
let mut a = 1;
while dbg!<|>(a) < 10000 {
a += 1;
}
}
",
"
fn main() {
let mut a = 1;
while a < 10000 {
a += 1;
}
}
",
);
}
#[test]
fn test_remove_dbg_keep_expression() {
check_assist(
remove_dbg,
r#"let res = <|>dbg!(a + b).foo();"#,
r#"let res = (a + b).foo();"#,
);
check_assist(remove_dbg, r#"let res = <|>dbg!(2 + 2) * 5"#, r#"let res = (2 + 2) * 5"#);
check_assist(remove_dbg, r#"let res = <|>dbg![2 + 2] * 5"#, r#"let res = (2 + 2) * 5"#);
}
#[test]
fn test_remove_dbg_method_chaining() {
check_assist(
remove_dbg,
r#"let res = <|>dbg!(foo().bar()).baz();"#,
r#"let res = foo().bar().baz();"#,
);
check_assist(
remove_dbg,
r#"let res = <|>dbg!(foo.bar()).baz();"#,
r#"let res = foo.bar().baz();"#,
);
}
#[test]
fn test_remove_dbg_field_chaining() {
check_assist(remove_dbg, r#"let res = <|>dbg!(foo.bar).baz;"#, r#"let res = foo.bar.baz;"#);
}
#[test]
fn test_remove_dbg_from_inside_fn() {
check_assist_target(
remove_dbg,
r#"
fn square(x: u32) -> u32 {
x * x
}
fn main() {
let x = square(dbg<|>!(5 + 10));
println!("{}", x);
}"#,
"dbg!(5 + 10)",
);
check_assist(
remove_dbg,
r#"
fn square(x: u32) -> u32 {
x * x
}
fn main() {
let x = square(dbg<|>!(5 + 10));
println!("{}", x);
}"#,
r#"
fn square(x: u32) -> u32 {
x * x
}
fn main() {
let x = square(5 + 10);
println!("{}", x);
}"#,
);
}
#[test]
fn test_remove_dbg_try_expr() {
check_assist(
remove_dbg,
r#"let res = <|>dbg!(result?).foo();"#,
r#"let res = result?.foo();"#,
);
}
#[test]
fn test_remove_dbg_await_expr() {
check_assist(
remove_dbg,
r#"let res = <|>dbg!(fut.await).foo();"#,
r#"let res = fut.await.foo();"#,
);
}
#[test]
fn test_remove_dbg_as_cast() {
check_assist(
remove_dbg,
r#"let res = <|>dbg!(3 as usize).foo();"#,
r#"let res = (3 as usize).foo();"#,
);
}
#[test]
fn test_remove_dbg_index_expr() {
check_assist(
remove_dbg,
r#"let res = <|>dbg!(array[3]).foo();"#,
r#"let res = array[3].foo();"#,
);
check_assist(
remove_dbg,
r#"let res = <|>dbg!(tuple.3).foo();"#,
r#"let res = tuple.3.foo();"#,
);
}
#[test]
fn test_remove_dbg_range_expr() {
check_assist(
remove_dbg,
r#"let res = <|>dbg!(foo..bar).foo();"#,
r#"let res = (foo..bar).foo();"#,
);
check_assist(
remove_dbg,
r#"let res = <|>dbg!(foo..=bar).foo();"#,
r#"let res = (foo..=bar).foo();"#,
);
}
}
|