Merge pull request #199 from deg0nz/fix-fuzzy-select-active-item-colors

Fix: [Fuzzy-Select] Apply active style to active item
console-rs · May 29, 2022 · fa4c119 · fa4c119
2 parents 3f16bde + 5a7c2b0
commit fa4c119
Showing 1 changed file with 25 additions and 4 deletions.
diff --git a/src/theme.rs b/src/theme.rs
@@ -340,7 +340,7 @@ impl Default for ColorfulTheme {
             #[cfg(feature = "fuzzy-select")]
             fuzzy_cursor_style: Style::new().for_stderr().black().on_white(),
             #[cfg(feature = "fuzzy-select")]
-            fuzzy_match_highlight_style: Style::new().for_stderr().bold().yellow(),
+            fuzzy_match_highlight_style: Style::new().for_stderr().bold(),
             inline_selections: true,
         }
     }
@@ -625,15 +625,36 @@ impl Theme for ColorfulTheme {
         matcher: &SkimMatcherV2,
         search_term: &str,
     ) -> fmt::Result {
-        write!(f, "{} ", if active { ">" } else { " " })?;
+        write!(
+            f,
+            "{} ",
+            if active {
+                &self.active_item_prefix
+            } else {
+                &self.inactive_item_prefix
+            }
+        )?;
 
         if highlight_matches {
             if let Some((_score, indices)) = matcher.fuzzy_indices(text, &search_term) {
                 for (idx, c) in text.chars().into_iter().enumerate() {
                     if indices.contains(&idx) {
-                        write!(f, "{}", self.fuzzy_match_highlight_style.apply_to(c))?;
+                        if active {
+                            write!(
+                                f,
+                                "{}",
+                                self.active_item_style
+                                    .apply_to(self.fuzzy_match_highlight_style.apply_to(c))
+                            )?;
+                        } else {
+                            write!(f, "{}", self.fuzzy_match_highlight_style.apply_to(c))?;
+                        }
                     } else {
-                        write!(f, "{}", c)?;
+                        if active {
+                            write!(f, "{}", self.active_item_style.apply_to(c))?;
+                        } else {
+                            write!(f, "{}", c)?;
+                        }
                     }
                 }