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

Use METHOD semantic token type

Browse source
This commit is contained in:
Laurențiu Nicola 2020-12-04 18:27:10 +02:00
parent 070ecef249
commit 72f013b3b9
8 changed files with 45 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -726,7 +726,7 @@ fn highlight_method_call(
method_call: &ast::MethodCallExpr,
) -> Option<Highlight> {
let func = sema.resolve_method_call(&method_call)?;
let mut h = HighlightTag::Function.into();
let mut h = HighlightTag::Method.into();
if func.is_unsafe(sema.db) || sema.is_unsafe_method_call(&method_call) {
h |= HighlightModifier::Unsafe;
}
@ -755,13 +755,18 @@ fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
Definition::ModuleDef(def) => match def {
hir::ModuleDef::Module(_) => HighlightTag::Module,
hir::ModuleDef::Function(func) => {
let mut h = HighlightTag::Function.into();
let mut h = if func.as_assoc_item(db).is_some() {
if func.self_param(db).is_none() {
Highlight::from(HighlightTag::Method) | HighlightModifier::Static
} else {
HighlightTag::Method.into()
}
} else {
HighlightTag::Function.into()
};
if func.is_unsafe(db) {
h |= HighlightModifier::Unsafe;
}
if func.as_assoc_item(db).is_some() && func.self_param(db).is_none() {
h |= HighlightModifier::Static;
}
return h;
}
hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HighlightTag::Struct,