1 files changed, 10 insertions, 53 deletions

diff --git a/src/yellow/syntax.rs b/src/yellow/syntax.rs
index 78fa5bf95..53d8c82b9 100644
--- a/src/yellow/syntax.rs
+++ b/src/yellow/syntax.rs
@@ -6,14 +6,13 @@ use std::{
 use {
     TextRange, TextUnit,
     SyntaxKind::{self, *},
-    yellow::{Ptr, RedNode, GreenNode, TextLen},
+    yellow::{Ptr, RedNode, GreenNode},
 };
 
 #[derive(Clone)]
 pub struct SyntaxNode {
     pub(crate) root: SyntaxRoot,
     red: Ptr<RedNode>,
-    trivia_pos: Option<(usize, usize)>,
 }
 
 #[derive(Clone)]
@@ -29,80 +28,38 @@ pub(crate) struct SyntaxError {
 }
 
 impl SyntaxNode {
-    pub(crate) fn new(root: Arc<GreenNode>, errors: Vec<SyntaxError>) -> SyntaxNode {
+    pub(crate) fn new(root: GreenNode, errors: Vec<SyntaxError>) -> SyntaxNode {
         let root = Arc::new(RedNode::new_root(root));
         let red = Ptr::new(&root);
         let root = SyntaxRoot { red: root, errors: Arc::new(errors) };
-        SyntaxNode { root, red, trivia_pos: None }
+        SyntaxNode { root, red }
     }
 
     pub fn kind(&self) -> SyntaxKind {
-        let green = self.red().green();
-        match self.trivia_pos {
-            None => green.kind(),
-            Some((i, j)) => green.nth_trivias(i)[j].kind
-        }
+        self.red().green().kind()
     }
 
     pub fn range(&self) -> TextRange {
         let red = self.red();
-        let green = red.green();
-        match self.trivia_pos {
-            None => TextRange::offset_len(red.start_offset(), red.green().text_len()),
-            Some((i, j)) => {
-                let trivias = green.nth_trivias(i);
-                let offset = if i == 0 {
-                    red.start_offset()
-                } else {
-                    let prev_child = red.nth_child(Ptr::clone(&self.red), i - 1);
-                    let mut offset = prev_child.start_offset() + prev_child.green().text_len();
-                    for k in 0..j {
-                        offset += &trivias[k].text_len();
-                    }
-                    offset
-                };
-                TextRange::offset_len(offset, trivias[j].text_len())
-            }
-        }
+        TextRange::offset_len(
+            red.start_offset(),
+            red.green().text_len(),
+        )
     }
 
     pub fn text(&self) -> String {
-        let green = self.red().green();
-        match self.trivia_pos {
-            None => green.text(),
-            Some((i, j)) => green.nth_trivias(i)[j].text.clone()
-        }
+        self.red().green().text()
     }
 
     pub fn children(&self) -> Vec<SyntaxNode> {
-        let mut res = Vec::new();
         let red = self.red();
-        let green = red.green();
-        if green.is_leaf() || self.trivia_pos.is_some() {
-            return Vec::new();
-        }
-        for (j, _) in green.nth_trivias(0).iter().enumerate() {
-            res.push(SyntaxNode {
-                root: self.root.clone(),
-                red: Ptr::clone(&self.red),
-                trivia_pos: Some((0, j)),
-            })
-        }
-
         let n_children = red.n_children();
+        let mut res = Vec::with_capacity(n_children);
         for i in 0..n_children {
             res.push(SyntaxNode {
                 root: self.root.clone(),
                 red: Ptr::new(&red.nth_child(Ptr::clone(&self.red), i)),
-                trivia_pos: None,
             });
-            for (j, _) in green.nth_trivias(i + 1).iter().enumerate() {
-                res.push(SyntaxNode {
-                    root: self.root.clone(),
-                    red: self.red.clone(),
-                    trivia_pos: Some((i + 1, j)),
-                })
-            }
         }
         res
     }