language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 05:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Collapse TokenMap and RevTokenMap

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-18 16:08:41 +03:00
parent 789a0d2a64
commit 2b6f1ab0e2
4 changed files with 105 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_hir_expand/src/lib.rs
View file

@ -159,7 +159,7 @@ pub struct ExpansionInfo {
macro_def: Arc<(db::TokenExpander, mbe::TokenMap)>,
macro_arg: Arc<(tt::Subtree, mbe::TokenMap)>,
exp_map: Arc<mbe::RevTokenMap>,
exp_map: Arc<mbe::TokenMap>,
}
impl ExpansionInfo {
@ -186,7 +186,7 @@ impl ExpansionInfo {
mbe::Origin::Def => (&self.macro_def.1, &self.def),
};
let range = token_map.relative_range_of(token_id)?;
let range = token_map.range_by_token(token_id)?;
let token = algo::find_covering_element(
tt.ast.syntax(),
range + tt.ast.syntax().text_range().start(),