language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 20:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Highlight Self as a keyword by default

Browse source
This commit is contained in:
Lukas Wirth 2022-03-06 00:12:10 +01:00
parent 0bb631bf71
commit e5bb661b7a
5 changed files with 94 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/syntax/src/ast/node_ext.rs
View file

@ -34,6 +34,10 @@ impl ast::NameRef {
pub fn as_tuple_field(&self) -> Option<usize> {
self.text().parse().ok()
}
pub fn token_kind(&self) -> SyntaxKind {
self.syntax().first_token().map_or(SyntaxKind::ERROR, |it| it.kind())
}
}
fn text_of_first_token(node: &SyntaxNode) -> TokenText<'_> {
@ -215,11 +219,11 @@ impl ast::PathSegment {
pub fn kind(&self) -> Option<PathSegmentKind> {
let res = if let Some(name_ref) = self.name_ref() {
match name_ref.syntax().first_token().map(|it| it.kind()) {
Some(T![Self]) => PathSegmentKind::SelfTypeKw,
Some(T![self]) => PathSegmentKind::SelfKw,
Some(T![super]) => PathSegmentKind::SuperKw,
Some(T![crate]) => PathSegmentKind::CrateKw,
match name_ref.token_kind() {
T![Self] => PathSegmentKind::SelfTypeKw,
T![self] => PathSegmentKind::SelfKw,
T![super] => PathSegmentKind::SuperKw,
T![crate] => PathSegmentKind::CrateKw,
_ => PathSegmentKind::Name(name_ref),
}
} else {