Isolate terminal probe parser

Author: tyx3211

crates/edit/src/bin/edit/main.rs

@@ -87,11 +87,9 @@ fn run() -> apperr::Result<()> {
     // As such, we call this after `handle_args`.
     sys::switch_modes()?;
 
-    let mut vt_parser = vt::Parser::new();
-    let mut input_parser = input::Parser::new();
     let mut tui = Tui::new()?;
 
-    let _restore = setup_terminal(&mut tui, &mut state, &mut vt_parser);
+    let _restore = setup_terminal(&mut tui, &mut state);
 
     state.menubar_color_bg = tui.indexed(IndexedColor::Background).oklab_blend(tui.indexed_alpha(
         IndexedColor::BrightBlue,
@@ -115,6 +113,11 @@ fn run() -> apperr::Result<()> {
 
     sys::inject_window_size_into_stdin();
 
+    // Startup probing may leave partial terminal responses in the probe parser.
+    // Start application input parsing with an independent parser lifecycle.
+    let mut vt_parser = vt::Parser::new();
+    let mut input_parser = input::Parser::new();
+
     #[cfg(feature = "debug-latency")]
     let mut last_latency_width = 0;
 
@@ -565,7 +568,7 @@ impl Drop for RestoreModes {
     }
 }
 
-fn setup_terminal(tui: &mut Tui, state: &mut State, vt_parser: &mut vt::Parser) -> RestoreModes {
+fn setup_terminal(tui: &mut Tui, state: &mut State) -> RestoreModes {
     sys::write_stdout(concat!(
         // 1049: Alternative Screen Buffer
         //   I put the ASB switch in the beginning, just in case the terminal performs
@@ -597,6 +600,7 @@ fn setup_terminal(tui: &mut Tui, state: &mut State, vt_parser: &mut vt::Parser)
     let mut indexed_colors = framebuffer::DEFAULT_THEME;
     let mut color_responses = 0;
     let mut ambiguous_width = 1;
+    let mut vt_parser = vt::Parser::new();
 
     while !done {
         let scratch = scratch_arena(None);

crates/edit/src/input.rs

@@ -592,3 +592,42 @@ impl<'input> Stream<'_, '_, 'input> {
         Some(Input::Mouse(mouse))
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn parse_resize<'a>(
+        vt_parser: &mut vt::Parser,
+        input_parser: &mut Parser,
+        input: &'a str,
+    ) -> Option<Size> {
+        input_parser.parse(vt_parser.parse(input)).find_map(|input| match input {
+            Input::Resize(size) => Some(size),
+            _ => None,
+        })
+    }
+
+    #[test]
+    fn partial_osc_parser_state_does_not_emit_resize() {
+        let mut vt_parser = vt::Parser::new();
+        let mut stream = vt_parser.parse("\x1b]4;0;rgb:0c0c/0c0c/0c0c\x1b");
+        while stream.next().is_some() {}
+        drop(stream);
+
+        let mut input_parser = Parser::new();
+        let resize = parse_resize(&mut vt_parser, &mut input_parser, "\x1b[8;40;127t");
+
+        assert_eq!(resize, None);
+    }
+
+    #[test]
+    fn fresh_parser_parses_synthetic_resize() {
+        let mut vt_parser = vt::Parser::new();
+        let mut input_parser = Parser::new();
+
+        let resize = parse_resize(&mut vt_parser, &mut input_parser, "\x1b[8;40;127t");
+
+        assert_eq!(resize, Some(Size { width: 127, height: 40 }));
+    }
+}