language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

8024: Updated the implementation for trait modifier.

Browse source 
Fixed the test cases.
This commit is contained in:
Chetan Khilosiya 2021-03-31 00:03:01 +05:30
parent f269fe7156
commit 56f624532a
6 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/ide/src/syntax_highlighting/highlight.rs
View file

@ -276,6 +276,11 @@ fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
hir::ModuleDef::Function(func) => {
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Function));
if let Some(item) = func.as_assoc_item(db) {
h |= HlMod::Associated;
if func.self_param(db).is_none() {
h |= HlMod::Static
}
match item.container(db) {
AssocItemContainer::Impl(i) => {
if i.target_trait(db).is_some() {
@ -288,12 +293,6 @@ fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
}
}
if func.as_assoc_item(db).is_some() {
h |= HlMod::Associated;
if func.self_param(db).is_none() {
h |= HlMod::Static
}
}
if func.is_unsafe(db) {
h |= HlMod::Unsafe;
}
@ -305,9 +304,20 @@ fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
hir::ModuleDef::Variant(_) => HlTag::Symbol(SymbolKind::Variant),
hir::ModuleDef::Const(konst) => {
let mut h = Highlight::new(HlTag::Symbol(SymbolKind::Const));
if konst.as_assoc_item(db).is_some() {
h |= HlMod::Associated
if let Some(item) = konst.as_assoc_item(db) {
h |= HlMod::Associated;
match item.container(db) {
AssocItemContainer::Impl(i) => {
if i.target_trait(db).is_some() {
h |= HlMod::Trait;
}
}
AssocItemContainer::Trait(_t) => {
h |= HlMod::Trait;
}
}
}
return h;
}
hir::ModuleDef::Trait(_) => HlTag::Symbol(SymbolKind::Trait),
@ -375,7 +385,7 @@ fn highlight_method_call(
if func.is_unsafe(sema.db) || sema.is_unsafe_method_call(&method_call) {
h |= HlMod::Unsafe;
}
if let Some(_t) = func.as_assoc_item(sema.db)?.containing_trait(sema.db) {
if func.as_assoc_item(sema.db).and_then(|it| it.containing_trait(sema.db)).is_some() {
h |= HlMod::Trait
}