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

Add SelfParam to code_model

Browse source
This commit is contained in:
Aleksey Kladov 2020-08-19 15:16:24 +02:00
parent a3b0a3aeb8
commit b9b4693ce3
9 changed files with 62 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ide/src/syntax_highlighting.rs
View file

@ -4,7 +4,7 @@ mod injection;
#[cfg(test)]
mod tests;
use hir::{Mutability, Name, SelfKind, Semantics, VariantDef};
use hir::{Name, SelfKind, Semantics, VariantDef};
use ide_db::{
defs::{classify_name, classify_name_ref, Definition, NameClass, NameRefClass},
RootDatabase,
@ -761,17 +761,13 @@ fn highlight_name(
h |= HighlightModifier::Unsafe;
}
return if func.has_self_param(db) {
match func.mutability_of_self_param(db) {
Some(mutability) => match mutability {
Mutability::Mut => h | HighlightModifier::Mutable,
Mutability::Shared => h,
},
None => h,
}
} else {
h
};
match func.self_param(db) {
None => h,
Some(self_param) => match self_param.access(db) {
hir::Access::Exclusive => h | HighlightModifier::Mutable,
hir::Access::Shared | hir::Access::Owned => h,
},
}
});
}
hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HighlightTag::Struct,