1 files changed, 10 insertions, 14 deletions

diff --git a/src/yellow/builder.rs b/src/yellow/builder.rs
index 346d561cd..73b4b5ff9 100644
--- a/src/yellow/builder.rs
+++ b/src/yellow/builder.rs
@@ -1,13 +1,12 @@
-use std::sync::Arc;
 use {
     SyntaxKind, TextRange, TextUnit,
-    yellow::{SyntaxNode, GreenNode, SyntaxError},
+    yellow::{SyntaxNode, GreenNode, GreenNodeBuilder, SyntaxError},
     parser::Sink
 };
 
 pub(crate) struct GreenBuilder {
     text: String,
-    stack: Vec<GreenNode>,
+    stack: Vec<GreenNodeBuilder>,
     pos: TextUnit,
     root: Option<GreenNode>,
     errors: Vec<SyntaxError>,
@@ -33,24 +32,21 @@ impl Sink for GreenBuilder {
     fn leaf(&mut self, kind: SyntaxKind, len: TextUnit) {
         let range = TextRange::offset_len(self.pos, len);
         self.pos += len;
-        let text = self.text[range].to_owned();
+        let text = &self.text[range];
+        let leaf = GreenNodeBuilder::new_leaf(kind, text);
         let parent = self.stack.last_mut().unwrap();
-        if kind.is_trivia() {
-            parent.push_trivia(kind, text);
-        } else {
-            let node = GreenNode::new_leaf(kind, text);
-            parent.push_child(Arc::new(node));
-        }
+        parent.push_child(leaf)
     }
 
     fn start_internal(&mut self, kind: SyntaxKind) {
-        self.stack.push(GreenNode::new_branch(kind))
+        self.stack.push(GreenNodeBuilder::new_internal(kind))
     }
 
     fn finish_internal(&mut self) {
-        let node = self.stack.pop().unwrap();
+        let builder = self.stack.pop().unwrap();
+        let node = builder.build();
         if let Some(parent) = self.stack.last_mut() {
-            parent.push_child(Arc::new(node))
+            parent.push_child(node);
         } else {
             self.root = Some(node);
         }
@@ -61,7 +57,7 @@ impl Sink for GreenBuilder {
     }
 
     fn finish(self) -> SyntaxNode {
-        SyntaxNode::new(Arc::new(self.root.unwrap()), self.errors)
+        SyntaxNode::new(self.root.unwrap(), self.errors)
     }
 }