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

restructure a bit

Browse source
This commit is contained in:
Ekaterina Babshukova 2019-10-12 18:47:17 +03:00
parent 0dd08b8023
commit d26d0ada50
11 changed files with 869 additions and 699 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_ide_api/src/syntax_highlighting.rs
View file

@ -14,7 +14,7 @@ use ra_syntax::{
use crate::{
db::RootDatabase,
name_kind::{classify_name_ref, NameKind::*},
references::{classify_name_ref, NameKind::*},
FileId,
};
@ -101,10 +101,8 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
continue;
}
if let Some(name_ref) = node.as_node().cloned().and_then(ast::NameRef::cast) {
// FIXME: try to reuse the SourceAnalyzers
let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
let name_kind = classify_name_ref(db, file_id, &analyzer, &name_ref)
.and_then(|d| Some(d.item));
let name_kind =
classify_name_ref(db, file_id, &name_ref).and_then(|d| Some(d.item));
match name_kind {
Some(Macro(_)) => "macro",
Some(FieldAccess(_)) => "field",
@ -131,6 +129,8 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
Some(calc_binding_hash(file_id, &text, *shadow_count))
}
let analyzer =
hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
if is_variable_mutable(db, &analyzer, ptr.to_node(&root)) {
"variable.mut"
} else {