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

generalize highlighting to work with nodes

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-31 19:06:00 +03:00
parent f1e8ebfbeb
commit 862c99d0d5
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_analysis/src/syntax_highlighting.rs
View file

@ -9,14 +9,14 @@ use crate::{
pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Cancelable<Vec<HighlightedRange>> {
let source_file = db.source_file(file_id);
let mut res = ra_editor::highlight(&source_file);
let mut res = ra_editor::highlight(source_file.syntax());
for macro_call in source_file
.syntax()
.descendants()
.filter_map(ast::MacroCall::cast)
{
if let Some(exp) = crate::macros::expand(db, file_id, macro_call) {
let mapped_ranges = ra_editor::highlight(exp.source_file())
let mapped_ranges = ra_editor::highlight(exp.source_file().syntax())
.into_iter()
.filter_map(|r| {
let mapped_range = exp.map_range_back(r.range)?;