language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: Recognize Self as a proper keyword

Browse source
This commit is contained in:
Lukas Wirth 2022-03-05 23:20:06 +01:00
parent 8f504dc873
commit c0d6471143
27 changed files with 98 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/hir_expand/src/mod_path.rs
View file

@ -5,7 +5,11 @@ use std::{
iter,
};
use crate::{db::AstDatabase, hygiene::Hygiene, name::Name};
use crate::{
db::AstDatabase,
hygiene::Hygiene,
name::{known, Name},
};
use base_db::CrateId;
use either::Either;
use syntax::{ast, AstNode};
@ -162,6 +166,15 @@ fn convert_path(
}
}
}
ast::PathSegmentKind::SelfTypeKw => {
let mut res = prefix.unwrap_or_else(|| {
ModPath::from_kind(
segment.coloncolon_token().map_or(PathKind::Plain, |_| PathKind::Abs),
)
});
res.segments.push(known::SELF_TYPE);
res
}
ast::PathSegmentKind::CrateKw => {
if prefix.is_some() {
return None;