From 053a2603e4bd5ec9caf40617b52136e5ef3fcf0a Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Thu, 11 Aug 2022 11:01:49 +0200
Subject: Add improved container exit injection

---
 src/subtokenize.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/subtokenize.rs')

diff --git a/src/subtokenize.rs b/src/subtokenize.rs
index e0465a0..3d923d3 100644
--- a/src/subtokenize.rs
+++ b/src/subtokenize.rs
@@ -94,9 +94,11 @@ pub fn subtokenize(events: &mut Vec<Event>, parse_state: &ParseState) -> bool {
                         tokenizer.define_skip(enter.point.clone());
                     }
 
+                    let end = &events[index + 1].point;
+
                     state = tokenizer.push(
-                        enter.point.index,
-                        events[index + 1].point.index,
+                        (enter.point.index, enter.point.vs),
+                        (end.index, end.vs),
                         match state {
                             State::Next(func) => func,
                             _ => unreachable!("cannot be ok/nok"),
@@ -140,11 +142,12 @@ pub fn divide_events(
     let mut old_prev: Option<usize> = None;
 
     while subindex < child_events.len() {
+        let current = &child_events[subindex].point;
+        let end = &events[link_index + 1].point;
+
         // Find the first event that starts after the end we’re looking
         // for.
-        if child_events[subindex].event_type == EventType::Enter
-            && child_events[subindex].point.index >= events[link_index + 1].point.index
-        {
+        if current.index > end.index || (current.index == end.index && current.vs > end.vs) {
             slices.push((link_index, slice_start));
             slice_start = subindex;
             link_index = events[link_index].link.as_ref().unwrap().next.unwrap();
-- 
cgit