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

Add public semantic token modifier for public items

Browse source
This commit is contained in:
Aramis Razzaghipour 2021-05-28 09:25:32 +10:00
parent 3762cb4535
commit 3e7472f76c
No known key found for this signature in database
GPG key ID: F788F7E990136003
9 changed files with 67 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
//! Computes color for a single element.
use hir::{AsAssocItem, Semantics};
use hir::{AsAssocItem, HasVisibility, Semantics};
use ide_db::{
defs::{Definition, NameClass, NameRefClass},
RootDatabase, SymbolKind,
@ -439,9 +439,12 @@ fn highlight_def(db: &RootDatabase, krate: Option<hir::Crate>, def: Definition)
let is_from_other_crate = def.module(db).map(hir::Module::krate) != krate;
let is_builtin_type = matches!(def, Definition::ModuleDef(hir::ModuleDef::BuiltinType(_)));
let is_public = def.visibility(db) == Some(hir::Visibility::Public);
if is_from_other_crate && !is_builtin_type {
h |= HlMod::Library;
match (is_from_other_crate, is_builtin_type, is_public) {
(true, false, _) => h |= HlMod::Library,
(false, _, true) => h |= HlMod::Public,
_ => {}
}
h
@ -475,8 +478,14 @@ fn highlight_method_call(
if func.as_assoc_item(sema.db).and_then(|it| it.containing_trait(sema.db)).is_some() {
h |= HlMod::Trait;
}
if Some(func.module(sema.db).krate()) != krate {
let is_from_other_crate = Some(func.module(sema.db).krate()) != krate;
let is_public = func.visibility(sema.db) == hir::Visibility::Public;
if is_from_other_crate {
h |= HlMod::Library;
} else if is_public {
h |= HlMod::Public;
}
if let Some(self_param) = func.self_param(sema.db) {