Skip skipped events when peeking at next event

1 files changed, 6 insertions, 1 deletions

diff --git a/src/focaccia/deterministic.py b/src/focaccia/deterministic.py
index c4d37ad..9db79b7 100644
--- a/src/focaccia/deterministic.py
+++ b/src/focaccia/deterministic.py
@@ -334,7 +334,12 @@ finally:
             if self.matched_count is None:
                 raise ValueError('Cannot get next event with unsynchronized event matcher')
             if self.matched_count < len(self.events):
-                return self.events[self.matched_count]
+                count = self.matched_count
+                while count in self.skipped_events:
+                    count += 1
+                if count < len(self.events):
+                    return self.events[count]
+                return None
             return None
 
         def match_pair(self, event: Event | None):