fix(tuikit): reset attrs on exit

e2e/src/lib.rs

@@ -14,6 +14,8 @@ use which::which;
 
 pub static SK: &str = "SKIM_DEFAULT_OPTIONS= SKIM_DEFAULT_COMMAND= cargo run --package skim --release --";
 
+const TIMEOUT: usize = 30; // seconds
+
 pub fn sk(outfile: &str, opts: &[&str]) -> String {
     format!(
         "{} {} > {}.part; mv {}.part {}",
@@ -29,7 +31,7 @@ fn wait<F, T>(pred: F) -> Result<T>
 where
     F: Fn() -> Result<T>,
 {
-    for _ in 1..2000 {
+    for _ in 1..(TIMEOUT * 20) {
         if let Ok(t) = pred() {
             return Ok(t);
         }
@@ -49,6 +51,8 @@ pub enum Keys<'a> {
     Left,
     Right,
     BSpace,
+    Up,
+    Down,
 }
 
 impl Display for Keys<'_> {
@@ -64,6 +68,8 @@ impl Display for Keys<'_> {
             BTab => write!(f, "BTab"),
             Left => write!(f, "Left"),
             Right => write!(f, "Right"),
+            Up => write!(f, "Up"),
+            Down => write!(f, "Down"),
             BSpace => write!(f, "BSpace"),
         }
     }
@@ -130,10 +136,15 @@ impl TmuxController {
     }
 
     // Returns the lines in reverted order
-    pub fn capture(&self) -> Result<Vec<String>> {
+    fn _capture(&self, capture_ansi: bool) -> Result<Vec<String>> {
         let tempfile = wait(|| {
             let tempfile = self.tempfile()?;
-            Self::run(&["capture-pane", "-b", &self.window, "-t", &format!("{}.0", self.window)])?;
+            let win_str = format!("{}.0", self.window);
+            let mut capture_cmd = vec!["capture-pane", "-b", &self.window, "-t", &win_str];
+            if capture_ansi {
+                capture_cmd.push("-e")
+            }
+            Self::run(&capture_cmd)?;
             Self::run(&["save-buffer", "-b", &self.window, &tempfile])?;
             Ok(tempfile)
         })?;
@@ -151,6 +162,13 @@ impl TmuxController {
             .collect())
     }
 
+    pub fn capture(&self) -> Result<Vec<String>> {
+        self._capture(false)
+    }
+    pub fn capture_ansi(&self) -> Result<Vec<String>> {
+        self._capture(true)
+    }
+
     pub fn until<F>(&self, pred: F) -> Result<()>
     where
         F: Fn(&[String]) -> bool,

e2e/tests/ansi.rs

@@ -0,0 +1,24 @@
+use e2e::SK;
+use e2e::TmuxController;
+use std::io::Result;
+
+#[test]
+pub fn reset_after_exit_height() -> Result<()> {
+    let tmux = TmuxController::new()?;
+    let _ = tmux.send_keys(&[
+        e2e::Keys::Str(&format!("echo -e '1\n2' | {SK} --height 10")),
+        e2e::Keys::Enter,
+    ])?;
+    tmux.until(|l| l.len() > 0 && l[0] == ">")?;
+    tmux.send_keys(&[e2e::Keys::Up])?;
+    tmux.until(|l| l.len() > 3 && l[3] == "> 2")?;
+    tmux.send_keys(&[e2e::Keys::Enter])?;
+    tmux.until(|l| l[0].contains("$"))?;
+    let lines = tmux.capture_ansi()?;
+    println!("Lines: {:?}", lines);
+
+    // Ensure we properly reset the color after exiting, at least the foreground color
+    assert!(lines[1].contains("\u{1b}[39m2") || lines[1].contains("\u{1b}[0m2"));
+
+    Ok(())
+}

skim-tuikit/src/term.rs

@@ -696,6 +696,7 @@ impl TermLock {
                     output.write("\n");
                 }
             }
+            output.reset_attributes();
             output.flush();
         }
         Ok(())

skim/examples/default.rs

@@ -0,0 +1,28 @@
+extern crate skim;
+use skim::prelude::*;
+use std::io::Cursor;
+
+pub fn main() {
+    let options = SkimOptionsBuilder::default()
+        .height("50%".to_string())
+        .multi(true)
+        .build()
+        .unwrap();
+
+    let input = "aaaaa\nbbbb\nccc".to_string();
+
+    // `SkimItemReader` is a helper to turn any `BufRead` into a stream of `SkimItem`
+    // `SkimItem` was implemented for `AsRef<str>` by default
+    let item_reader = SkimItemReader::default();
+    let items = item_reader.of_bufread(Cursor::new(input));
+
+    // `run_with` would read and show items from the stream
+    let selected_items = Skim::run_with(&options, Some(items))
+        .map(|out| out.selected_items)
+        .unwrap_or_else(|| Vec::new());
+
+    println!("{}", "\n".repeat(6));
+    for item in selected_items.iter() {
+        println!("{:?}", item.output().chars().collect::<Vec<char>>());
+    }
+}