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

use macros database in analysis

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-31 19:19:50 +03:00
parent d753656192
commit 57030f587b
6 changed files with 70 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,13 +15,13 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Cancelable<Vec<Hi
.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().syntax())
if let Some((off, exp)) = crate::macros::expand(db, file_id, macro_call) {
let mapped_ranges = ra_editor::highlight(exp.syntax().borrowed())
.into_iter()
.filter_map(|r| {
let mapped_range = exp.map_range_back(r.range)?;
let res = HighlightedRange {
range: mapped_range,
range: mapped_range + off,
tag: r.tag,
};
Some(res)