language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use macro_rules shift to map text ranges

Browse source
This commit is contained in:
Edwin Cheng 2019-11-05 02:09:16 +08:00
parent 7e28924012
commit 604bdc6ffe
4 changed files with 26 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/ra_hir_expand/src/db.rs
View file

@ -151,10 +151,15 @@ pub(crate) fn parse_macro_with_info(
let arg_start = arg_tt.map(|t| t.syntax().text_range().start());
let def_start = def_tt.map(|t| t.syntax().text_range().start());
let arg_map =
arg_start.map(|start| exp_map.ranges(&expand_info.arg_map, start)).unwrap_or_default();
let def_map =
def_start.map(|start| exp_map.ranges(&expand_info.def_map, start)).unwrap_or_default();
let macro_rules = db.macro_def(loc.def).ok_or("Fail to find macro definition").ok()?.0;
let shift = macro_rules.shift();
let arg_map = arg_start
.map(|start| exp_map.map_ranges(&expand_info.arg_map, start, shift))
.unwrap_or_default();
let def_map = def_start
.map(|start| exp_map.map_ranges(&expand_info.def_map, start, 0))
.unwrap_or_default();
let info = ExpansionInfo { arg_map, def_map };