language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Replace SyntaxKind usage with T! macro where applicable

Browse source
This commit is contained in:
Lukas Wirth 2021-01-10 16:40:52 +01:00
parent e1430d822e
commit e618d12903
12 changed files with 50 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/assists/src/handlers/remove_dbg.rs
View file

@ -1,6 +1,6 @@
use syntax::{
ast::{self, AstNode},
match_ast, SyntaxElement, SyntaxKind, TextRange, TextSize, T,
match_ast, SyntaxElement, TextRange, TextSize, T,
};
use crate::{AssistContext, AssistId, AssistKind, Assists};
@ -136,14 +136,14 @@ 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
&& symbol_kind != SyntaxKind::COLON // paths
&& (symbol_kind != SyntaxKind::DOT // field/method access
&& symbol_kind != T![:] // paths
&& (symbol_kind != T![.] // field/method access
|| macro_contents // range expressions consist of two SyntaxKind::Dot in macro invocations
.peek()
.map(|element| element.kind() == SyntaxKind::DOT)
.map(|element| element.kind() == T![.])
.unwrap_or(false))
&& symbol_kind != SyntaxKind::QUESTION // try operator
&& (symbol_kind.is_punct() || symbol_kind == SyntaxKind::AS_KW)
&& symbol_kind != T![?] // try operator
&& (symbol_kind.is_punct() || symbol_kind == T![as])
{
return true;
}