Fix windows impl

kkawakam · Aug 31, 2024 · 7465673 · 7465673
1 parent 2f77007
commit 7465673
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/error.rs b/src/error.rs
@@ -125,7 +125,7 @@ impl From<std::string::FromUtf8Error> for ReadlineError {
     }
 }
 
-#[cfg(unix)]
+#[cfg(any(unix, all(feature = "split-highlight", not(feature = "ansi-str"))))]
 impl From<fmt::Error> for ReadlineError {
     fn from(err: fmt::Error) -> Self {
         Self::Io(io::Error::new(io::ErrorKind::Other, err))

diff --git a/src/tty/windows.rs b/src/tty/windows.rs
@@ -449,7 +449,22 @@ impl Renderer for ConsoleRenderer {
             // append the prompt
             col = self.wrap_at_eol(&highlighter.highlight_prompt(prompt, default_prompt), col);
             // append the input line
-            col = self.wrap_at_eol(&highlighter.highlight(line, line.pos()), col);
+            cfg_if::cfg_if! {
+                if #[cfg(not(feature = "split-highlight"))] {
+                    col = self.wrap_at_eol(&highlighter.highlight(line, line.pos()), col);
+                } else if #[cfg(feature = "ansi-str")] {
+                    col = self.wrap_at_eol(&highlighter.highlight(line, line.pos()), col);
+                } else {
+                    use std::fmt::Write;
+                    use crate::highlight::{Style, StyledBlock};
+                    for sb in highlighter.highlight_line(line, line.pos()) {
+                        let style = sb.style();
+                        write!(self.buffer, "{}", style.start())?;
+                        col = self.wrap_at_eol(sb.text(), col);
+                        write!(self.buffer, "{}", style.end())?;
+                    }
+                }
+            }
         } else if self.colors_enabled {
             // append the prompt
             col = self.wrap_at_eol(prompt, col);