Merge #1756

1756: Correctly build BodySourceMap for macro-expanded expressions r=flodiebold a=matklad

r? @flodiebold 

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

1 files changed, 3 insertions, 2 deletions

diff --git a/crates/ra_syntax/src/ptr.rs b/crates/ra_syntax/src/ptr.rs
index 80e55d2aa..992034ef0 100644
--- a/crates/ra_syntax/src/ptr.rs
+++ b/crates/ra_syntax/src/ptr.rs
@@ -15,8 +15,9 @@ impl SyntaxNodePtr {
         SyntaxNodePtr { range: node.text_range(), kind: node.kind() }
     }
 
-    pub fn to_node(self, parent: &SyntaxNode) -> SyntaxNode {
-        successors(Some(parent.clone()), |node| {
+    pub fn to_node(self, root: &SyntaxNode) -> SyntaxNode {
+        assert!(root.parent().is_none());
+        successors(Some(root.clone()), |node| {
             node.children().find(|it| self.range.is_subrange(&it.text_range()))
         })
         .find(|it| it.text_range() == self.range && it.kind() == self.kind)