mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't keep parens around in remove-dbg

Browse Source
This commit is contained in:
Lukas Wirth 2020-10-25 15:12:21 +01:00
parent 6675d4c576
commit 3182c06752
1 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
crates/assists/src/handlers/remove_dbg.rs
View File

@ -118,9 +118,13 @@ fn needs_parentheses_around_macro_contents(macro_contents: Vec<SyntaxElement>) -
symbol_kind => {
let symbol_not_in_bracket = unpaired_brackets_in_contents.is_empty();
if symbol_not_in_bracket
// paths
&& symbol_kind != SyntaxKind::COLON
// field/method access
&& symbol_kind != SyntaxKind::DOT
&& symbol_kind.is_punct()
// try operator
&& symbol_kind != SyntaxKind::QUESTION
&& (symbol_kind.is_punct() || symbol_kind == SyntaxKind::AS_KW)
{
return true;
}
@ -300,4 +304,60 @@ fn main() {
}"#,
);
}
#[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();"#,
);
}
}