Merge #2273

2273: goto in macro calls r=matklad a=matklad

![goto](https://user-images.githubusercontent.com/1711539/68984944-2a50ba80-0824-11ea-896c-c0ea8edcd0d6.gif)

This builds on the awesome infrastructure created by @edwin0cheng 

Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 9 insertions, 0 deletions

diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/ra_hir_expand/src/lib.rs
index 26531cb05..6bfbb2f79 100644
--- a/crates/ra_hir_expand/src/lib.rs
+++ b/crates/ra_hir_expand/src/lib.rs
@@ -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)?;