nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 10:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add static semantic token modifier for associated functions with no &self

Browse Source 
refactor logic into code_model.rs

address comments
This commit is contained in:
Anatol Liu 2020-11-04 20:08:46 -08:00
parent 3aa0e40726
commit 90031a267a
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/hir/src/code_model.rs
View File

@ -789,11 +789,7 @@ impl Function {
} }
/// whether this function is associated with some trait/impl /// whether this function is associated with some trait/impl
pub fn is_associated(self, db: &dyn HirDatabase) -> bool { pub fn is_assoc_item(self, db: &dyn HirDatabase) -> bool {
if self.self_param(db).is_some() {
return false;
}
let fn_parent_kind = self let fn_parent_kind = self
.source(db) .source(db)
.value .value

2
crates/ide/src/syntax_highlighting.rs
View File

@ -746,7 +746,7 @@ fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
if func.is_unsafe(db) { if func.is_unsafe(db) {
h |= HighlightModifier::Unsafe; h |= HighlightModifier::Unsafe;
} }
if func.is_associated(db) { if func.is_assoc_item(db) && func.self_param(db).is_none() {
h |= HighlightModifier::Static; h |= HighlightModifier::Static;
} }
return h; return h;