1 files changed, 35 insertions, 6 deletions

diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index 742755142..c08d32d08 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -18,10 +18,39 @@ fn from_events_to_file(
 ) -> File {
     let mut builder = FileBuilder::new(text);
     let mut idx = 0;
-    for event in events {
+
+    let mut holes = Vec::new();
+    let mut forward_parents = Vec::new();
+
+    for (i, event) in events.iter().enumerate() {
+        if holes.last() == Some(&i) {
+            holes.pop();
+            continue
+        }
+
         match event {
-            Event::Start { kind } => builder.start_internal(kind),
-            Event::Finish => {
+            &Event::Start { kind, forward_parent } => {
+                forward_parents.clear();
+                let mut idx = i;
+                loop {
+                    let (kind, fwd) = match events[idx] {
+                        Event::Start { kind, forward_parent } => (kind, forward_parent),
+                        _ => unreachable!(),
+                    };
+                    forward_parents.push((idx, kind));
+                    if let Some(fwd) = fwd {
+                        idx += fwd as usize;
+                    } else {
+                        break;
+                    }
+                }
+                for &(idx, kind) in forward_parents.iter().into_iter().rev() {
+                    builder.start_internal(kind);
+                    holes.push(idx);
+                }
+                holes.pop();
+            }
+            &Event::Finish => {
                 while idx < tokens.len() {
                     let token = tokens[idx];
                     if is_insignificant(token.kind) {
@@ -33,7 +62,7 @@ fn from_events_to_file(
                 }
                 builder.finish_internal()
             },
-            Event::Token { kind, mut n_raw_tokens } => loop {
+            &Event::Token { kind, mut n_raw_tokens } => loop {
                 let token = tokens[idx];
                 if !is_insignificant(token.kind) {
                     n_raw_tokens -= 1;
@@ -44,8 +73,8 @@ fn from_events_to_file(
                     break;
                 }
             },
-            Event::Error { message } => builder.error().message(message).emit(),
-
+            &Event::Error { ref message } =>
+                builder.error().message(message.clone()).emit(),
         }
     }
     builder.finish()