diff --git a/crates/parser/src/shortcuts.rs b/crates/parser/src/shortcuts.rs
index 7040608a9f7..b038d44fe08 100644
--- a/crates/parser/src/shortcuts.rs
+++ b/crates/parser/src/shortcuts.rs
@@ -50,6 +50,7 @@ impl<'a> LexedStr<'a> {
         res
     }
 
+    /// NB: only valid to call with Output from Reparser/TopLevelEntry.
     pub fn intersperse_trivia(
         &self,
         output: &crate::Output,
@@ -76,7 +77,7 @@ impl<'a> LexedStr<'a> {
                 builder.eat_trivias();
                 (builder.sink)(StrStep::Exit);
             }
-            State::PendingEnter | State::Normal => (),
+            State::PendingEnter | State::Normal => unreachable!(),
         }
 
         let is_eof = builder.pos == builder.lexed.len();
@@ -100,8 +101,9 @@ enum State {
 impl Builder<'_, '_> {
     fn token(&mut self, kind: SyntaxKind, n_tokens: u8) {
         match mem::replace(&mut self.state, State::Normal) {
+            State::PendingEnter => unreachable!(),
             State::PendingExit => (self.sink)(StrStep::Exit),
-            State::PendingEnter | State::Normal => (),
+            State::Normal => (),
         }
         self.eat_trivias();
         self.do_token(kind, n_tokens as usize);
diff --git a/crates/parser/src/tests/entries.rs b/crates/parser/src/tests/entries.rs
index 93e8136263e..947922d8b32 100644
--- a/crates/parser/src/tests/entries.rs
+++ b/crates/parser/src/tests/entries.rs
@@ -1,4 +1,4 @@
-use crate::{LexedStr, PrefixEntryPoint, StrStep};
+use crate::{LexedStr, PrefixEntryPoint, Step};
 
 #[test]
 fn vis() {
@@ -30,12 +30,25 @@ fn stmt() {
 fn check_prefix(entry: PrefixEntryPoint, input: &str, prefix: &str) {
     let lexed = LexedStr::new(input);
     let input = lexed.to_input();
-    let output = entry.parse(&input);
 
-    let mut buf = String::new();
-    lexed.intersperse_trivia(&output, &mut |step| match step {
-        StrStep::Token { kind: _, text } => buf.push_str(text),
-        _ => (),
-    });
-    assert_eq!(buf.trim(), prefix)
+    let mut n_tokens = 0;
+    for step in entry.parse(&input).iter() {
+        match step {
+            Step::Token { n_input_tokens, .. } => n_tokens += n_input_tokens as usize,
+            Step::Enter { .. } | Step::Exit | Step::Error { .. } => (),
+        }
+    }
+
+    let mut i = 0;
+    loop {
+        if n_tokens == 0 {
+            break;
+        }
+        if !lexed.kind(i).is_trivia() {
+            n_tokens -= 1;
+        }
+        i += 1;
+    }
+    let buf = &lexed.as_str()[..lexed.text_start(i)];
+    assert_eq!(buf, prefix);
 }