Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add parent links

Browse source
This commit is contained in:
Aleksey Kladov 2018-07-30 12:44:14 +03:00
parent 423298dddd
commit a2a810f118
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yellow/red.rs
View file

@ -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)
}
}

8
src/yellow/syntax.rs
View file

@ -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() }
}