2020-08-12 11:26:51 -05:00
|
|
|
use syntax::{
|
2019-02-07 12:00:58 -06:00
|
|
|
ast::{self, AstNode},
|
2020-10-06 06:21:22 -05:00
|
|
|
SyntaxElement, SyntaxKind, TextRange, TextSize, T,
|
2019-02-07 12:00:58 -06:00
|
|
|
};
|
|
|
|
|
2020-06-28 17:36:05 -05:00
|
|
|
use crate::{AssistContext, AssistId, AssistKind, Assists};
|
2019-10-27 04:22:53 -05:00
|
|
|
|
|
|
|
// Assist: remove_dbg
|
|
|
|
//
|
|
|
|
// Removes `dbg!()` macro call.
|
|
|
|
//
|
|
|
|
// ```
|
|
|
|
// fn main() {
|
|
|
|
// <|>dbg!(92);
|
|
|
|
// }
|
|
|
|
// ```
|
|
|
|
// ->
|
|
|
|
// ```
|
|
|
|
// fn main() {
|
|
|
|
// 92;
|
|
|
|
// }
|
|
|
|
// ```
|
2020-05-06 11:45:35 -05:00
|
|
|
pub(crate) fn remove_dbg(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
|
2019-10-27 03:48:40 -05:00
|
|
|
let macro_call = ctx.find_node_at_offset::<ast::MacroCall>()?;
|
2020-09-10 06:14:24 -05:00
|
|
|
let new_contents = adjusted_macro_contents(¯o_call)?;
|
2019-02-07 12:00:58 -06:00
|
|
|
|
2020-09-10 06:14:24 -05:00
|
|
|
let macro_text_range = macro_call.syntax().text_range();
|
2020-07-29 16:12:53 -05:00
|
|
|
let macro_end = if macro_call.semicolon_token().is_some() {
|
2020-09-10 06:14:24 -05:00
|
|
|
macro_text_range.end() - TextSize::of(';')
|
2020-07-29 16:12:53 -05:00
|
|
|
} else {
|
2020-09-10 06:14:24 -05:00
|
|
|
macro_text_range.end()
|
2020-07-27 16:17:15 -05:00
|
|
|
};
|
2019-02-07 12:00:58 -06:00
|
|
|
|
2020-09-10 06:14:24 -05:00
|
|
|
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);
|
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
2019-02-07 12:00:58 -06:00
|
|
|
|
2020-09-10 06:14:24 -05:00
|
|
|
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();
|
2020-09-11 14:16:22 -05:00
|
|
|
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)
|
2020-09-10 06:14:24 -05:00
|
|
|
} else {
|
2020-09-11 14:16:22 -05:00
|
|
|
macro_text_in_brackets.to_string()
|
|
|
|
})
|
2019-02-07 12:00:58 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Verifies that the given macro_call actually matches the given name
|
2020-09-10 06:14:24 -05:00
|
|
|
/// 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>> {
|
2019-02-07 12:00:58 -06:00
|
|
|
let path = macro_call.path()?;
|
|
|
|
let name_ref = path.segment()?.name_ref()?;
|
|
|
|
|
2019-02-11 10:18:27 -06:00
|
|
|
// Make sure it is actually a dbg-macro call, dbg followed by !
|
2019-03-30 05:25:53 -05:00
|
|
|
let excl = path.syntax().next_sibling_or_token()?;
|
2019-05-15 07:35:47 -05:00
|
|
|
if name_ref.text() != macro_name || excl.kind() != T![!] {
|
2019-02-07 12:00:58 -06:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
2020-09-10 06:14:24 -05:00
|
|
|
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()?;
|
2019-02-07 12:00:58 -06:00
|
|
|
|
2020-09-10 06:14:24 -05:00
|
|
|
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,
|
|
|
|
}
|
2019-02-07 12:00:58 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-10 06:14:24 -05:00
|
|
|
fn needs_parentheses_around_macro_contents(macro_contents: Vec<SyntaxElement>) -> bool {
|
|
|
|
if macro_contents.len() < 2 {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
let mut unpaired_brackets_in_contents = Vec::new();
|
|
|
|
for element in macro_contents {
|
|
|
|
match element.kind() {
|
2020-09-11 14:16:22 -05:00
|
|
|
T!['('] | T!['['] | T!['{'] => unpaired_brackets_in_contents.push(element),
|
2020-09-10 06:14:24 -05:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
2020-09-11 14:16:22 -05:00
|
|
|
symbol_kind => {
|
|
|
|
let symbol_not_in_bracket = unpaired_brackets_in_contents.is_empty();
|
2020-10-06 06:21:22 -05:00
|
|
|
if symbol_not_in_bracket
|
2020-10-25 09:12:21 -05:00
|
|
|
// paths
|
2020-10-06 06:21:22 -05:00
|
|
|
&& symbol_kind != SyntaxKind::COLON
|
2020-10-25 09:12:21 -05:00
|
|
|
// field/method access
|
2020-10-25 08:27:32 -05:00
|
|
|
&& symbol_kind != SyntaxKind::DOT
|
2020-10-25 09:12:21 -05:00
|
|
|
// try operator
|
|
|
|
&& symbol_kind != SyntaxKind::QUESTION
|
|
|
|
&& (symbol_kind.is_punct() || symbol_kind == SyntaxKind::AS_KW)
|
2020-10-06 06:21:22 -05:00
|
|
|
{
|
2020-09-11 14:16:22 -05:00
|
|
|
return true;
|
2020-09-10 06:14:24 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
!unpaired_brackets_in_contents.is_empty()
|
|
|
|
}
|
|
|
|
|
2019-02-07 12:00:58 -06:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2020-05-06 03:16:55 -05:00
|
|
|
use crate::tests::{check_assist, check_assist_not_applicable, check_assist_target};
|
2019-02-07 12:00:58 -06:00
|
|
|
|
2020-08-19 11:44:33 -05:00
|
|
|
use super::*;
|
|
|
|
|
2019-02-07 12:00:58 -06:00
|
|
|
#[test]
|
|
|
|
fn test_remove_dbg() {
|
2020-05-20 16:14:31 -05:00
|
|
|
check_assist(remove_dbg, "<|>dbg!(1 + 1)", "1 + 1");
|
2019-02-07 12:00:58 -06:00
|
|
|
|
2020-05-20 16:14:31 -05:00
|
|
|
check_assist(remove_dbg, "dbg!<|>((1 + 1))", "(1 + 1)");
|
2019-02-07 12:00:58 -06:00
|
|
|
|
2020-05-20 16:14:31 -05:00
|
|
|
check_assist(remove_dbg, "dbg!(1 <|>+ 1)", "1 + 1");
|
2019-02-07 12:00:58 -06:00
|
|
|
|
2020-05-20 16:14:31 -05:00
|
|
|
check_assist(remove_dbg, "let _ = <|>dbg!(1 + 1)", "let _ = 1 + 1");
|
2019-02-07 12:00:58 -06:00
|
|
|
|
|
|
|
check_assist(
|
|
|
|
remove_dbg,
|
|
|
|
"
|
|
|
|
fn foo(n: usize) {
|
|
|
|
if let Some(_) = dbg!(n.<|>checked_sub(4)) {
|
|
|
|
// ...
|
|
|
|
}
|
|
|
|
}
|
|
|
|
",
|
|
|
|
"
|
|
|
|
fn foo(n: usize) {
|
2020-05-20 16:14:31 -05:00
|
|
|
if let Some(_) = n.checked_sub(4) {
|
2019-02-07 12:00:58 -06:00
|
|
|
// ...
|
|
|
|
}
|
|
|
|
}
|
|
|
|
",
|
|
|
|
);
|
2020-10-06 06:21:22 -05:00
|
|
|
|
|
|
|
check_assist(remove_dbg, "<|>dbg!(Foo::foo_test()).bar()", "Foo::foo_test().bar()");
|
2019-02-07 12:00:58 -06:00
|
|
|
}
|
2020-07-27 15:28:41 -05:00
|
|
|
|
2019-02-07 12:00:58 -06:00
|
|
|
#[test]
|
|
|
|
fn test_remove_dbg_with_brackets_and_braces() {
|
2020-05-20 16:14:31 -05:00
|
|
|
check_assist(remove_dbg, "dbg![<|>1 + 1]", "1 + 1");
|
|
|
|
check_assist(remove_dbg, "dbg!{<|>1 + 1}", "1 + 1");
|
2019-02-07 12:00:58 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#[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");
|
|
|
|
}
|
2019-02-08 17:34:05 -06:00
|
|
|
|
|
|
|
#[test]
|
2020-07-27 15:28:41 -05:00
|
|
|
fn test_remove_dbg_target() {
|
2019-02-08 17:34:05 -06:00
|
|
|
check_assist_target(
|
|
|
|
remove_dbg,
|
|
|
|
"
|
|
|
|
fn foo(n: usize) {
|
|
|
|
if let Some(_) = dbg!(n.<|>checked_sub(4)) {
|
|
|
|
// ...
|
|
|
|
}
|
|
|
|
}
|
|
|
|
",
|
|
|
|
"dbg!(n.checked_sub(4))",
|
|
|
|
);
|
|
|
|
}
|
2020-07-24 12:57:40 -05:00
|
|
|
|
|
|
|
#[test]
|
2020-07-27 15:28:41 -05:00
|
|
|
fn test_remove_dbg_keep_semicolon() {
|
2020-07-24 12:57:40 -05:00
|
|
|
// https://github.com/rust-analyzer/rust-analyzer/issues/5129#issuecomment-651399779
|
|
|
|
// not quite though
|
2020-07-27 16:17:15 -05:00
|
|
|
// adding a comment at the end of the line makes
|
|
|
|
// the ast::MacroCall to include the semicolon at the end
|
2020-07-29 16:12:53 -05:00
|
|
|
check_assist(
|
|
|
|
remove_dbg,
|
|
|
|
r#"let res = <|>dbg!(1 * 20); // needless comment"#,
|
|
|
|
r#"let res = 1 * 20; // needless comment"#,
|
|
|
|
);
|
2020-07-24 12:57:40 -05:00
|
|
|
}
|
|
|
|
|
2020-09-10 06:14:24 -05:00
|
|
|
#[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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
",
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2020-07-24 12:57:40 -05:00
|
|
|
#[test]
|
2020-07-27 15:28:41 -05:00
|
|
|
fn test_remove_dbg_keep_expression() {
|
2020-07-29 16:12:53 -05:00
|
|
|
check_assist(
|
|
|
|
remove_dbg,
|
|
|
|
r#"let res = <|>dbg!(a + b).foo();"#,
|
|
|
|
r#"let res = (a + b).foo();"#,
|
|
|
|
);
|
2020-09-10 16:20:13 -05:00
|
|
|
|
|
|
|
check_assist(remove_dbg, r#"let res = <|>dbg!(2 + 2) * 5"#, r#"let res = (2 + 2) * 5"#);
|
2020-09-11 14:16:22 -05:00
|
|
|
check_assist(remove_dbg, r#"let res = <|>dbg![2 + 2] * 5"#, r#"let res = (2 + 2) * 5"#);
|
2020-07-24 12:57:40 -05:00
|
|
|
}
|
2020-07-27 15:28:41 -05:00
|
|
|
|
2020-10-25 08:27:32 -05:00
|
|
|
#[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;"#);
|
|
|
|
}
|
|
|
|
|
2020-07-27 15:28:41 -05:00
|
|
|
#[test]
|
|
|
|
fn test_remove_dbg_from_inside_fn() {
|
2020-07-29 16:12:53 -05:00
|
|
|
check_assist_target(
|
|
|
|
remove_dbg,
|
|
|
|
r#"
|
2020-07-27 15:28:41 -05:00
|
|
|
fn square(x: u32) -> u32 {
|
|
|
|
x * x
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let x = square(dbg<|>!(5 + 10));
|
2020-07-29 16:12:53 -05:00
|
|
|
println!("{}", x);
|
|
|
|
}"#,
|
|
|
|
"dbg!(5 + 10)",
|
|
|
|
);
|
2020-07-27 15:28:41 -05:00
|
|
|
|
2020-07-29 16:12:53 -05:00
|
|
|
check_assist(
|
|
|
|
remove_dbg,
|
|
|
|
r#"
|
|
|
|
fn square(x: u32) -> u32 {
|
|
|
|
x * x
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let x = square(dbg<|>!(5 + 10));
|
|
|
|
println!("{}", x);
|
|
|
|
}"#,
|
|
|
|
r#"
|
2020-07-27 15:28:41 -05:00
|
|
|
fn square(x: u32) -> u32 {
|
|
|
|
x * x
|
|
|
|
}
|
|
|
|
|
|
|
|
fn main() {
|
|
|
|
let x = square(5 + 10);
|
2020-07-29 16:12:53 -05:00
|
|
|
println!("{}", x);
|
|
|
|
}"#,
|
|
|
|
);
|
2020-07-27 15:28:41 -05:00
|
|
|
}
|
2020-10-25 09:12:21 -05:00
|
|
|
|
|
|
|
#[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]
|
|
|
|
#[ignore] // FIXME: we encounter SyntaxKind::DOT instead of SyntaxKind::DOT2 causing this to fail
|
|
|
|
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();"#,
|
|
|
|
);
|
|
|
|
}
|
2019-02-07 12:00:58 -06:00
|
|
|
}
|