Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #22304 from A4-Tacks/toggle-delim-wrong-parent
fix: Fix offer on unrelated for toggle_macro_delimiter
| -rw-r--r-- | crates/ide-assists/src/handlers/toggle_macro_delimiter.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ide-assists/src/handlers/toggle_macro_delimiter.rs b/crates/ide-assists/src/handlers/toggle_macro_delimiter.rs index 1dec094d9a..e1ac9ea135 100644 --- a/crates/ide-assists/src/handlers/toggle_macro_delimiter.rs +++ b/crates/ide-assists/src/handlers/toggle_macro_delimiter.rs @@ -45,7 +45,8 @@ pub(crate) fn toggle_macro_delimiter(acc: &mut Assists, ctx: &AssistContext<'_, let ltoken = token_tree.left_delimiter_token()?; let rtoken = token_tree.right_delimiter_token()?; - if !is_macro_call(&token_tree)? { + if is_macro_call(&token_tree) != Some(true) { + cov_mark::hit!(toggle_macro_delimiter_is_not_macro_call); return None; } @@ -111,7 +112,6 @@ fn is_macro_call(token_tree: &ast::TokenTree) -> Option<bool> { return Some(true); } - let token_tree = ast::TokenTree::cast(parent)?; let prev = previous_non_trivia_token(token_tree.syntax().clone())?; let prev_prev = previous_non_trivia_token(prev.clone())?; Some(prev.kind() == T![!] && prev_prev.kind() == SyntaxKind::IDENT) @@ -374,6 +374,7 @@ mod abc { #[test] fn test_unrelated_par() { + cov_mark::check!(toggle_macro_delimiter_is_not_macro_call); check_assist_not_applicable( toggle_macro_delimiter, r#" @@ -383,8 +384,7 @@ macro_rules! prt { }}; } -prt!(($03 + 5)); - +prt!((3 + 5$0)); "#, ) } |