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

Goto definition works inside macros

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-16 16:49:26 +03:00
parent 786cae520a
commit 2eaa8c94a8
4 changed files with 77 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -160,6 +160,15 @@ pub struct ExpansionInfo {
}
impl ExpansionInfo {
pub fn translate_offset(&self, offset: TextUnit) -> Option<TextUnit> {
let offset = offset.checked_sub(self.arg_start.1)?;
let token_id = self.macro_arg.1.token_by_offset(offset)?;
let token_id = tt::TokenId(token_id.0 + self.shift);
let (r, _) = self.exp_map.ranges.iter().find(|(_, tid)| *tid == token_id)?;
Some(r.start())
}
pub fn find_range(&self, from: TextRange) -> Option<(HirFileId, TextRange)> {
let token_id = look_in_rev_map(&self.exp_map, from)?;