language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-30 07:07:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

9
crates/ide/src/references.rs
View file

@ -21,7 +21,7 @@ use ide_db::{
use syntax::{
algo::find_node_at_offset,
ast::{self, NameOwner},
match_ast, AstNode, SyntaxKind, SyntaxNode, TextRange, TokenAtOffset,
match_ast, AstNode, SyntaxNode, TextRange, TokenAtOffset, T,
};
use crate::{display::TryToNav, FilePosition, FileRange, NavigationTarget, RangeInfo, SymbolKind};
@ -203,7 +203,7 @@ fn get_struct_def_name_for_struct_literal_search(
position: FilePosition,
) -> Option<ast::Name> {
if let TokenAtOffset::Between(ref left, ref right) = syntax.token_at_offset(position.offset) {
if right.kind() != SyntaxKind::L_CURLY && right.kind() != SyntaxKind::L_PAREN {
if right.kind() != T!['{'] && right.kind() != T!['('] {
return None;
}
if let Some(name) =
@ -230,7 +230,7 @@ fn get_enum_def_name_for_struct_literal_search(
position: FilePosition,
) -> Option<ast::Name> {
if let TokenAtOffset::Between(ref left, ref right) = syntax.token_at_offset(position.offset) {
if right.kind() != SyntaxKind::L_CURLY && right.kind() != SyntaxKind::L_PAREN {
if right.kind() != T!['{'] && right.kind() != T!['('] {
return None;
}
if let Some(name) =
@ -255,8 +255,7 @@ fn try_find_self_references(
syntax: &SyntaxNode,
position: FilePosition,
) -> Option<RangeInfo<ReferenceSearchResult>> {
let self_token =
syntax.token_at_offset(position.offset).find(|t| t.kind() == SyntaxKind::SELF_KW)?;
let self_token = syntax.token_at_offset(position.offset).find(|t| t.kind() == T![self])?;
let parent = self_token.parent();
match_ast! {
match parent {

2
crates/ide/src/syntax_highlighting/macro_rules.rs
View file

@ -119,7 +119,7 @@ fn is_metavariable(element: SyntaxElement) -> Option<TextRange> {
let tok = element.as_token()?;
match tok.kind() {
kind if kind == SyntaxKind::IDENT || kind.is_keyword() => {
if let Some(_dollar) = tok.prev_token().filter(|t| t.kind() == SyntaxKind::DOLLAR) {
if let Some(_dollar) = tok.prev_token().filter(|t| t.kind() == T![$]) {
return Some(tok.text_range());
}
}