2 files changed, 15 insertions, 3 deletions

diff --git a/src/yellow/red.rs b/src/yellow/red.rs
index 3002153ca..e0fa27e5f 100644
--- a/src/yellow/red.rs
+++ b/src/yellow/red.rs
@@ -16,7 +16,7 @@ pub(crate) struct RedNode {
 
 #[derive(Debug)]
 struct ParentData {
-    parent: *const RedNode,
+    parent: ptr::NonNull<RedNode>,
     start_offset: TextUnit,
     index_in_parent: usize,
 }
@@ -30,7 +30,7 @@ impl RedNode {
 
     fn new_child(
         green: GreenNode,
-        parent: *const RedNode,
+        parent: ptr::NonNull<RedNode>,
         start_offset: TextUnit,
         index_in_parent: usize,
     ) -> RedNode {
@@ -76,10 +76,14 @@ impl RedNode {
             let green_children = self.green.children();
             let start_offset = self.start_offset()
                 + green_children[..idx].iter().map(|x| x.text_len()).sum::<TextUnit>();
-            let child = RedNode::new_child(green_children[idx].clone(), self, start_offset, idx);
+            let child = RedNode::new_child(green_children[idx].clone(), self.into(), start_offset, idx);
             children[idx] = Some(Box::new(child))
         }
         let child = children[idx].as_ref().unwrap();
         ptr::NonNull::from(&**child)
     }
+
+    pub(crate) fn parent(&self) -> Option<ptr::NonNull<RedNode>> {
+        Some(self.parent.as_ref()?.parent)
+    }
 }
diff --git a/src/yellow/syntax.rs b/src/yellow/syntax.rs
index c31b832d0..ae3302ed9 100644
--- a/src/yellow/syntax.rs
+++ b/src/yellow/syntax.rs
@@ -90,6 +90,14 @@ impl<ROOT: TreeRoot> SyntaxNode<ROOT> {
         res
     }
 
+    pub fn parent(&self) -> Option<SyntaxNode<ROOT>> {
+        let parent = self.red().parent()?;
+        Some(SyntaxNode {
+            root: self.root.clone(),
+            red: parent,
+        })
+    }
+
     fn red(&self) -> &RedNode {
         unsafe { self.red.as_ref() }
     }