Fix MaskingHighlighter

kkawakam · Aug 25, 2024 · 64051e1 · 64051e1
1 parent c9db271
commit 64051e1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/examples/read_password.rs b/examples/read_password.rs
@@ -27,11 +27,13 @@ impl Highlighter for MaskingHighlighter {
     ) -> impl Iterator<Item = impl 'l + rustyline::highlight::StyledBlock> {
         use unicode_width::UnicodeWidthStr;
         if self.masking {
-            [(rustyline::highlight::AnsiStyle::default(), " ")]
-                .repeat(line.width())
-                .into_iter()
+            vec![(
+                rustyline::highlight::AnsiStyle::default(),
+                " ".repeat(line.width()),
+            )]
+            .into_iter()
         } else {
-            vec![(rustyline::highlight::AnsiStyle::default(), line)].into_iter()
+            vec![(rustyline::highlight::AnsiStyle::default(), line.to_owned())].into_iter()
         }
     }
 

diff --git a/src/highlight.rs b/src/highlight.rs
@@ -99,6 +99,18 @@ impl StyledBlock for (AnsiStyle, &str) {
         &self.0
     }
 }
+#[cfg(all(feature = "split-highlight", not(feature = "ansi-str")))]
+impl StyledBlock for (AnsiStyle, String) {
+    type Style = AnsiStyle;
+
+    fn text(&self) -> &str {
+        &self.1
+    }
+
+    fn style(&self) -> &Self::Style {
+        &self.0
+    }
+}
 
 /// Syntax highlighter with [ANSI color](https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters).
 /// Rustyline will try to handle escape sequence for ANSI color on windows