`496c7e2`

Fix terminal bracketed paste handling

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 weeks ago

SHA: 496c7e27d69625a7a2a4f0fff578586890f076bd
Parents: d8851a8
Tree: fe7dd4a

3 changed files

Status	File	+	-
M	`src/editor/state.rs`	1	1
M	`src/terminal/panel.rs`	39	0
M	`src/terminal/screen.rs`	5	0

src/editor/state.rsmodified

          // Route paste to terminal when terminal has focus.
          if self.focus == Focus::Terminal && self.terminal.visible {
 -            self.terminal.send_input(text.as_bytes())?;
 +            self.terminal.send_paste(text.as_bytes())?;
              return Ok(());
+         }

src/terminal/panel.rsmodified

          Ok(())
+     }
 +    /// Send pasted input, honoring bracketed paste mode when requested by the app.
 +    fn send_paste(&mut self, data: &[u8]) -> Result<()> {
 +        let payload = if self.screen.bracketed_paste_enabled() {
 +            encode_bracketed_paste(data)
 +        } else {
 +            data.to_vec()
 +        };
 +        self.send_input(&payload)
 +    }
++
      /// Resize this session
      fn resize(&mut self, width: u16, height: u16) {
          self.screen.resize(width, height);
          Ok(())
+     }
 +    /// Send pasted input to the active terminal session.
 +    pub fn send_paste(&mut self, data: &[u8]) -> Result<()> {
 +        if let Some(session) = self.sessions.get_mut(self.active_session) {
 +            session.send_paste(data)?;
 +        }
 +        Ok(())
 +    }
++
      /// Send a key to the active terminal
      pub fn send_key(&mut self, key: &crossterm::event::KeyEvent) -> Result<()> {
          use crossterm::event::{KeyCode, KeyModifiers};
+         }
+     }
+ }
++
 +fn encode_bracketed_paste(data: &[u8]) -> Vec<u8> {
 +    let mut wrapped = Vec::with_capacity(data.len() + 12);
 +    wrapped.extend_from_slice(b"\x1b[200~");
 +    wrapped.extend_from_slice(data);
 +    wrapped.extend_from_slice(b"\x1b[201~");
 +    wrapped
 +}
++
 +#[cfg(test)]
 +mod tests {
 +    use super::encode_bracketed_paste;
++
 +    #[test]
 +    fn bracketed_paste_wraps_raw_bytes() {
 +        assert_eq!(
 +            encode_bracketed_paste(b"line 1\nline 2"),
 +            b"\x1b[200~line 1\nline 2\x1b[201~"
 +        );
 +    }
 +}

src/terminal/screen.rsmodified

          std::mem::take(&mut self.response_queue)
+     }
 +    /// Whether the application running in the terminal has enabled bracketed paste.
 +    pub fn bracketed_paste_enabled(&self) -> bool {
 +        self.bracketed_paste
 +    }
++
      /// Enter alternate screen buffer
      fn enter_alt_screen(&mut self) {
          if !self.using_alt_screen {