From 4affa690840ddad4e738b4adff192864cfe5d3a7 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Fri, 6 Dec 2024 17:16:58 +0000
Subject: [PATCH 01/21] feat: add invert method for Color

---
 helix-view/src/graphics.rs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
index a26823b97c03..edbe1bc9e68f 100644
--- a/helix-view/src/graphics.rs
+++ b/helix-view/src/graphics.rs
@@ -508,6 +508,23 @@ impl Style {
         self
     }
 
+    /// Inverts the background and foreground
+    ///
+    /// ## Examples
+    ///
+    /// ```rust
+    /// # use helix_view::graphics::{Color, Style};
+    /// let style = Style::default().bg(Color::Blue).fg(Color::Red);
+    /// let inverted = Style::default().bg(Color::Red).fg(Color::Blue);
+    /// assert_eq!(style.invert(), inverted);
+    /// ```
+    pub const fn invert(mut self) -> Style {
+        let bg = self.bg;
+        self.bg = self.fg;
+        self.fg = bg;
+        self
+    }
+
     /// Changes the underline color.
     ///
     /// ## Examples

From 13d53e8e0a2d474b57d9e1ead5f00e944e3e9c52 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Fri, 6 Dec 2024 17:26:46 +0000
Subject: [PATCH 02/21] fix: use None for Style temporarily

---
 helix-term/src/commands.rs       |  2 +-
 helix-term/src/commands/typed.rs |  6 +++---
 helix-term/src/ui/mod.rs         | 18 +++++++++---------
 helix-term/src/ui/prompt.rs      | 16 +++++++++-------
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d08148362e25..6331a254bd34 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2164,7 +2164,7 @@ fn searcher(cx: &mut Context, direction: Direction) {
             completions
                 .iter()
                 .filter(|comp| comp.starts_with(input))
-                .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
+                .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone()), None))
                 .collect()
         },
         move |cx, regex, event| {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 49864abb683e..5e34aeedbf93 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -3178,7 +3178,7 @@ pub(super) fn command_mode(cx: &mut Context) {
                     false,
                 )
                 .into_iter()
-                .map(|(name, _)| (0.., name.into()))
+                .map(|(name, _)| (0.., name.into(), None))
                 .collect()
             } else {
                 // Otherwise, use the command's completer and the last shellword
@@ -3197,13 +3197,13 @@ pub(super) fn command_mode(cx: &mut Context) {
                 {
                     completer(editor, word)
                         .into_iter()
-                        .map(|(range, file)| {
+                        .map(|(range, file, style)| {
                             let file = shellwords::escape(file);
 
                             // offset ranges to input
                             let offset = input.len() - word_len;
                             let range = (range.start + offset)..;
-                            (range, file)
+                            (range, file, style)
                         })
                         .collect()
                 } else {
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index ab9b5392bace..f400a1dc4a7e 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -290,7 +290,7 @@ pub mod completers {
 
         fuzzy_match(input, names, true)
             .into_iter()
-            .map(|(name, _)| ((0..), name))
+            .map(|(name, _)| ((0..), name, None))
             .collect()
     }
 
@@ -306,7 +306,7 @@ pub mod completers {
 
         fuzzy_match(input, names, false)
             .into_iter()
-            .map(|(name, _)| ((0..), name.into()))
+            .map(|(name, _)| ((0..), name.into(), None))
             .collect()
     }
 
@@ -336,7 +336,7 @@ pub mod completers {
 
         fuzzy_match(input, &*KEYS, false)
             .into_iter()
-            .map(|(name, _)| ((0..), name.into()))
+            .map(|(name, _)| ((0..), name.into(), None))
             .collect()
     }
 
@@ -371,7 +371,7 @@ pub mod completers {
 
         fuzzy_match(input, language_ids, false)
             .into_iter()
-            .map(|(name, _)| ((0..), name.to_owned().into()))
+            .map(|(name, _)| ((0..), name.to_owned().into(), None))
             .collect()
     }
 
@@ -387,7 +387,7 @@ pub mod completers {
 
         fuzzy_match(input, commands, false)
             .into_iter()
-            .map(|(name, _)| ((0..), name.to_owned().into()))
+            .map(|(name, _)| ((0..), name.to_owned().into(), None))
             .collect()
     }
 
@@ -511,13 +511,13 @@ pub mod completers {
             let range = (input.len().saturating_sub(file_name.len()))..;
             fuzzy_match(&file_name, files, true)
                 .into_iter()
-                .map(|(name, _)| (range.clone(), name))
+                .map(|(name, _)| (range.clone(), name, None))
                 .collect()
 
             // TODO: complete to longest common match
         } else {
-            let mut files: Vec<_> = files.map(|file| (end.clone(), file)).collect();
-            files.sort_unstable_by(|(_, path1), (_, path2)| path1.cmp(path2));
+            let mut files: Vec<_> = files.map(|file| (end.clone(), file, None)).collect();
+            files.sort_unstable_by(|(_, path1, _), (_, path2, _)| path1.cmp(path2));
             files
         }
     }
@@ -532,7 +532,7 @@ pub mod completers {
 
         fuzzy_match(input, iter, false)
             .into_iter()
-            .map(|(name, _)| ((0..), name.into()))
+            .map(|(name, _)| ((0..), name.into(), None))
             .collect()
     }
 }
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 1e443ce7ff0e..5cb7063e5837 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -5,6 +5,7 @@ use helix_core::syntax;
 use helix_view::document::Mode;
 use helix_view::input::KeyEvent;
 use helix_view::keyboard::KeyCode;
+use helix_view::theme::Style;
 use std::sync::Arc;
 use std::{borrow::Cow, ops::RangeFrom};
 use tui::buffer::Buffer as Surface;
@@ -19,7 +20,8 @@ use helix_view::{
 };
 
 type PromptCharHandler = Box<dyn Fn(&mut Prompt, char, &Context)>;
-pub type Completion = (RangeFrom<usize>, Cow<'static, str>);
+
+pub type Completion = (RangeFrom<usize>, Cow<'static, str>, Option<Style>);
 type CompletionFn = Box<dyn FnMut(&Editor, &str) -> Vec<Completion>>;
 type CallbackFn = Box<dyn FnMut(&mut Context, &str, PromptEvent)>;
 pub type DocFn = Box<dyn Fn(&str) -> Option<Cow<str>>>;
@@ -380,7 +382,7 @@ impl Prompt {
 
         self.selection = Some(index);
 
-        let (range, item) = &self.completion[index];
+        let (range, item, _style) = &self.completion[index];
 
         self.line.replace_range(range.clone(), item);
 
@@ -399,7 +401,7 @@ impl Prompt {
         let theme = &cx.editor.theme;
         let prompt_color = theme.get("ui.text");
         let completion_color = theme.get("ui.menu");
-        let selected_color = theme.get("ui.menu.selected");
+        // let selected_color = theme.get("ui.menu.selected");
         let suggestion_color = theme.get("ui.text.inactive");
         let background = theme.get("ui.background");
         // completion
@@ -407,7 +409,7 @@ impl Prompt {
         let max_len = self
             .completion
             .iter()
-            .map(|(_, completion)| completion.len() as u16)
+            .map(|(_, completion, _style)| completion.len() as u16)
             .max()
             .unwrap_or(BASE_WIDTH)
             .max(BASE_WIDTH);
@@ -443,11 +445,11 @@ impl Prompt {
             let mut row = 0;
             let mut col = 0;
 
-            for (i, (_range, completion)) in
+            for (i, (_range, completion, _style)) in
                 self.completion.iter().enumerate().skip(offset).take(items)
             {
                 let color = if Some(i) == self.selection {
-                    selected_color // TODO: just invert bg
+                    completion_color.invert()
                 } else {
                     completion_color
                 };
@@ -654,7 +656,7 @@ impl Component for Prompt {
                     .editor
                     .registers
                     .iter_preview()
-                    .map(|(ch, preview)| (0.., format!("{} {}", ch, &preview).into()))
+                    .map(|(ch, preview)| (0.., format!("{} {}", ch, &preview).into(), None))
                     .collect();
                 self.next_char_handler = Some(Box::new(|prompt, c, context| {
                     prompt.insert_str(

From 697c5a8b684fb444238675f27c8606094b309bec Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Fri, 6 Dec 2024 18:00:40 +0000
Subject: [PATCH 03/21] feat: complete implementation of colored directories

---
 helix-term/src/ui/mod.rs    | 19 +++++++++++++++----
 helix-term/src/ui/prompt.rs |  4 +++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index f400a1dc4a7e..912e66b1d0d4 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -270,10 +270,12 @@ pub mod completers {
     use helix_core::fuzzy::fuzzy_match;
     use helix_core::syntax::LanguageServerFeature;
     use helix_view::document::SCRATCH_BUFFER_NAME;
-    use helix_view::theme;
+    use helix_view::theme::{self};
     use helix_view::{editor::Config, Editor};
     use once_cell::sync::Lazy;
     use std::borrow::Cow;
+    use std::path::PathBuf;
+    use std::str::FromStr;
 
     pub type Completer = fn(&Editor, &str) -> Vec<Completion>;
 
@@ -424,7 +426,7 @@ pub mod completers {
 
     // TODO: we could return an iter/lazy thing so it can fetch as many as it needs.
     fn filename_impl<F>(
-        _editor: &Editor,
+        editor: &Editor,
         input: &str,
         git_ignore: bool,
         filter_fn: F,
@@ -506,17 +508,26 @@ pub mod completers {
             }) // TODO: unwrap or skip
             .filter(|path| !path.is_empty());
 
+        let style_from_file = |file: Cow<'_, str>| {
+            PathBuf::from_str(file.as_ref())
+                .ok()
+                .filter(|path| path.is_dir())
+                .map(|_| editor.theme.get("ui.text.focus"))
+        };
+
         // if empty, return a list of dirs and files in current dir
         if let Some(file_name) = file_name {
             let range = (input.len().saturating_sub(file_name.len()))..;
             fuzzy_match(&file_name, files, true)
                 .into_iter()
-                .map(|(name, _)| (range.clone(), name, None))
+                .map(|(name, _)| (range.clone(), name.clone(), style_from_file(name)))
                 .collect()
 
             // TODO: complete to longest common match
         } else {
-            let mut files: Vec<_> = files.map(|file| (end.clone(), file, None)).collect();
+            let mut files: Vec<_> = files
+                .map(|file| (end.clone(), file.clone(), style_from_file(file)))
+                .collect();
             files.sort_unstable_by(|(_, path1, _), (_, path2, _)| path1.cmp(path2));
             files
         }
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 5cb7063e5837..f2da584a20b9 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -445,9 +445,11 @@ impl Prompt {
             let mut row = 0;
             let mut col = 0;
 
-            for (i, (_range, completion, _style)) in
+            for (i, (_range, completion, style)) in
                 self.completion.iter().enumerate().skip(offset).take(items)
             {
+                let completion_color = style.unwrap_or(completion_color);
+
                 let color = if Some(i) == self.selection {
                     completion_color.invert()
                 } else {

From 16c0d8fc94d32a82f51eb0f55462a9b0986620bb Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Fri, 6 Dec 2024 18:07:44 +0000
Subject: [PATCH 04/21] feat: revert addition of invert color method

---
 helix-term/src/ui/mod.rs    |  3 ++-
 helix-term/src/ui/prompt.rs |  4 ++--
 helix-view/src/graphics.rs  | 17 -----------------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 912e66b1d0d4..2cafa471b74a 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -512,7 +512,8 @@ pub mod completers {
             PathBuf::from_str(file.as_ref())
                 .ok()
                 .filter(|path| path.is_dir())
-                .map(|_| editor.theme.get("ui.text.focus"))
+                // TODO: use a custom theme key e.g. "ui.text.directory"
+                .map(|_| editor.theme.get("function"))
         };
 
         // if empty, return a list of dirs and files in current dir
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index f2da584a20b9..cb709906c48e 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -401,7 +401,7 @@ impl Prompt {
         let theme = &cx.editor.theme;
         let prompt_color = theme.get("ui.text");
         let completion_color = theme.get("ui.menu");
-        // let selected_color = theme.get("ui.menu.selected");
+        let selected_color = theme.get("ui.menu.selected");
         let suggestion_color = theme.get("ui.text.inactive");
         let background = theme.get("ui.background");
         // completion
@@ -451,7 +451,7 @@ impl Prompt {
                 let completion_color = style.unwrap_or(completion_color);
 
                 let color = if Some(i) == self.selection {
-                    completion_color.invert()
+                    selected_color
                 } else {
                     completion_color
                 };
diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
index edbe1bc9e68f..a26823b97c03 100644
--- a/helix-view/src/graphics.rs
+++ b/helix-view/src/graphics.rs
@@ -508,23 +508,6 @@ impl Style {
         self
     }
 
-    /// Inverts the background and foreground
-    ///
-    /// ## Examples
-    ///
-    /// ```rust
-    /// # use helix_view::graphics::{Color, Style};
-    /// let style = Style::default().bg(Color::Blue).fg(Color::Red);
-    /// let inverted = Style::default().bg(Color::Red).fg(Color::Blue);
-    /// assert_eq!(style.invert(), inverted);
-    /// ```
-    pub const fn invert(mut self) -> Style {
-        let bg = self.bg;
-        self.bg = self.fg;
-        self.fg = bg;
-        self
-    }
-
     /// Changes the underline color.
     ///
     /// ## Examples

From 335e1bb376f6f8783145ea1d2978d9cea96e93f1 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Sat, 7 Dec 2024 12:58:48 +0000
Subject: [PATCH 05/21] perf: check if path ends with a slash instead of using
 syscall

---
 helix-term/src/ui/mod.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 2cafa471b74a..f521ab0ce67b 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -508,12 +508,15 @@ pub mod completers {
             }) // TODO: unwrap or skip
             .filter(|path| !path.is_empty());
 
+        let directory_color = editor.theme.get("function");
+
         let style_from_file = |file: Cow<'_, str>| {
-            PathBuf::from_str(file.as_ref())
-                .ok()
-                .filter(|path| path.is_dir())
+            if file.ends_with("/") {
                 // TODO: use a custom theme key e.g. "ui.text.directory"
-                .map(|_| editor.theme.get("function"))
+                Some(directory_color)
+            } else {
+                None
+            }
         };
 
         // if empty, return a list of dirs and files in current dir

From 3565741a0389c22db4c7aa1186b364298464a4ec Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Sat, 7 Dec 2024 13:26:20 +0000
Subject: [PATCH 06/21] refactor: remove unused imports + use char instead of
 str

---
 helix-term/src/ui/mod.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index f521ab0ce67b..fdbf655eb4a7 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -274,8 +274,6 @@ pub mod completers {
     use helix_view::{editor::Config, Editor};
     use once_cell::sync::Lazy;
     use std::borrow::Cow;
-    use std::path::PathBuf;
-    use std::str::FromStr;
 
     pub type Completer = fn(&Editor, &str) -> Vec<Completion>;
 
@@ -511,7 +509,7 @@ pub mod completers {
         let directory_color = editor.theme.get("function");
 
         let style_from_file = |file: Cow<'_, str>| {
-            if file.ends_with("/") {
+            if file.ends_with('/') {
                 // TODO: use a custom theme key e.g. "ui.text.directory"
                 Some(directory_color)
             } else {

From e0b6528d241f39b2d33a99584a14f15b42801961 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Sat, 7 Dec 2024 13:48:35 +0000
Subject: [PATCH 07/21] refactor: move comment to correct place

---
 helix-term/src/ui/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index fdbf655eb4a7..3b35001e6f40 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -506,11 +506,11 @@ pub mod completers {
             }) // TODO: unwrap or skip
             .filter(|path| !path.is_empty());
 
+        // TODO: use a custom theme key e.g. "ui.text.directory"
         let directory_color = editor.theme.get("function");
 
         let style_from_file = |file: Cow<'_, str>| {
             if file.ends_with('/') {
-                // TODO: use a custom theme key e.g. "ui.text.directory"
                 Some(directory_color)
             } else {
                 None

From 30d5f40bfc1cb80c4a12950b4712bcda3eaac686 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Sat, 7 Dec 2024 16:42:05 +0000
Subject: [PATCH 08/21] feat: use Span instead of adding an ew tuple member

---
 helix-term/src/commands.rs       |  2 +-
 helix-term/src/commands/typed.rs |  8 ++++----
 helix-term/src/ui/mod.rs         | 29 ++++++++++++++++-------------
 helix-term/src/ui/prompt.rs      | 22 ++++++++++++++--------
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 6331a254bd34..d8b494d74dd3 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2164,7 +2164,7 @@ fn searcher(cx: &mut Context, direction: Direction) {
             completions
                 .iter()
                 .filter(|comp| comp.starts_with(input))
-                .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone()), None))
+                .map(|comp| (0.., Span::raw(comp.clone())))
                 .collect()
         },
         move |cx, regex, event| {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 5e34aeedbf93..f0da7f5a8134 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -3178,7 +3178,7 @@ pub(super) fn command_mode(cx: &mut Context) {
                     false,
                 )
                 .into_iter()
-                .map(|(name, _)| (0.., name.into(), None))
+                .map(|(name, _)| (0.., Span::raw(name)))
                 .collect()
             } else {
                 // Otherwise, use the command's completer and the last shellword
@@ -3197,13 +3197,13 @@ pub(super) fn command_mode(cx: &mut Context) {
                 {
                     completer(editor, word)
                         .into_iter()
-                        .map(|(range, file, style)| {
-                            let file = shellwords::escape(file);
+                        .map(|(range, mut file)| {
+                            file.content = shellwords::escape(file.content);
 
                             // offset ranges to input
                             let offset = input.len() - word_len;
                             let range = (range.start + offset)..;
-                            (range, file, style)
+                            (range, file)
                         })
                         .collect()
                 } else {
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 3b35001e6f40..4f7f3f143336 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -274,6 +274,7 @@ pub mod completers {
     use helix_view::{editor::Config, Editor};
     use once_cell::sync::Lazy;
     use std::borrow::Cow;
+    use tui::text::Span;
 
     pub type Completer = fn(&Editor, &str) -> Vec<Completion>;
 
@@ -290,7 +291,7 @@ pub mod completers {
 
         fuzzy_match(input, names, true)
             .into_iter()
-            .map(|(name, _)| ((0..), name, None))
+            .map(|(name, _)| ((0..), Span::raw(name)))
             .collect()
     }
 
@@ -306,7 +307,7 @@ pub mod completers {
 
         fuzzy_match(input, names, false)
             .into_iter()
-            .map(|(name, _)| ((0..), name.into(), None))
+            .map(|(name, _)| ((0..), Span::raw(name)))
             .collect()
     }
 
@@ -336,7 +337,7 @@ pub mod completers {
 
         fuzzy_match(input, &*KEYS, false)
             .into_iter()
-            .map(|(name, _)| ((0..), name.into(), None))
+            .map(|(name, _)| ((0..), Span::raw(name)))
             .collect()
     }
 
@@ -349,6 +350,7 @@ pub mod completers {
         input: &str,
         git_ignore: bool,
     ) -> Vec<Completion> {
+        // styles are not lost here
         filename_impl(editor, input, git_ignore, |entry| {
             let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
 
@@ -371,7 +373,7 @@ pub mod completers {
 
         fuzzy_match(input, language_ids, false)
             .into_iter()
-            .map(|(name, _)| ((0..), name.to_owned().into(), None))
+            .map(|(name, _)| ((0..), Span::raw(name.to_owned())))
             .collect()
     }
 
@@ -387,7 +389,7 @@ pub mod completers {
 
         fuzzy_match(input, commands, false)
             .into_iter()
-            .map(|(name, _)| ((0..), name.to_owned().into(), None))
+            .map(|(name, _)| ((0..), Span::raw(name.to_owned())))
             .collect()
     }
 
@@ -509,11 +511,11 @@ pub mod completers {
         // TODO: use a custom theme key e.g. "ui.text.directory"
         let directory_color = editor.theme.get("function");
 
-        let style_from_file = |file: Cow<'_, str>| {
-            if file.ends_with('/') {
-                Some(directory_color)
+        let style_from_file = |file: Cow<'static, str>| {
+            if file.ends_with(std::path::MAIN_SEPARATOR) {
+                Span::styled(file, directory_color)
             } else {
-                None
+                Span::raw(file)
             }
         };
 
@@ -522,15 +524,16 @@ pub mod completers {
             let range = (input.len().saturating_sub(file_name.len()))..;
             fuzzy_match(&file_name, files, true)
                 .into_iter()
-                .map(|(name, _)| (range.clone(), name.clone(), style_from_file(name)))
+                .map(|(name, _)| (range.clone(), style_from_file(name)))
                 .collect()
 
             // TODO: complete to longest common match
         } else {
             let mut files: Vec<_> = files
-                .map(|file| (end.clone(), file.clone(), style_from_file(file)))
+                .map(|file| (end.clone(), style_from_file(file)))
                 .collect();
-            files.sort_unstable_by(|(_, path1, _), (_, path2, _)| path1.cmp(path2));
+            files.sort_unstable_by(|(_, path1), (_, path2)| path1.content.cmp(&path2.content));
+            // ok, so the Styles get correctly applied
             files
         }
     }
@@ -545,7 +548,7 @@ pub mod completers {
 
         fuzzy_match(input, iter, false)
             .into_iter()
-            .map(|(name, _)| ((0..), name.into(), None))
+            .map(|(name, _)| ((0..), Span::raw(name)))
             .collect()
     }
 }
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index cb709906c48e..c9e171638283 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -9,6 +9,7 @@ use helix_view::theme::Style;
 use std::sync::Arc;
 use std::{borrow::Cow, ops::RangeFrom};
 use tui::buffer::Buffer as Surface;
+use tui::text::Span;
 use tui::widgets::{Block, Widget};
 
 use helix_core::{
@@ -21,7 +22,7 @@ use helix_view::{
 
 type PromptCharHandler = Box<dyn Fn(&mut Prompt, char, &Context)>;
 
-pub type Completion = (RangeFrom<usize>, Cow<'static, str>, Option<Style>);
+pub type Completion = (RangeFrom<usize>, Span<'static>);
 type CompletionFn = Box<dyn FnMut(&Editor, &str) -> Vec<Completion>>;
 type CallbackFn = Box<dyn FnMut(&mut Context, &str, PromptEvent)>;
 pub type DocFn = Box<dyn Fn(&str) -> Option<Cow<str>>>;
@@ -382,9 +383,9 @@ impl Prompt {
 
         self.selection = Some(index);
 
-        let (range, item, _style) = &self.completion[index];
+        let (range, item) = &self.completion[index];
 
-        self.line.replace_range(range.clone(), item);
+        self.line.replace_range(range.clone(), &item.content);
 
         self.move_end();
     }
@@ -409,7 +410,7 @@ impl Prompt {
         let max_len = self
             .completion
             .iter()
-            .map(|(_, completion, _style)| completion.len() as u16)
+            .map(|(_, completion)| completion.content.len() as u16)
             .max()
             .unwrap_or(BASE_WIDTH)
             .max(BASE_WIDTH);
@@ -445,20 +446,25 @@ impl Prompt {
             let mut row = 0;
             let mut col = 0;
 
-            for (i, (_range, completion, style)) in
+            for (i, (_range, completion)) in
                 self.completion.iter().enumerate().skip(offset).take(items)
             {
-                let completion_color = style.unwrap_or(completion_color);
+                let completion_color = if completion.style == Style::default() {
+                    completion_color
+                } else {
+                    completion.style
+                };
 
                 let color = if Some(i) == self.selection {
                     selected_color
                 } else {
                     completion_color
                 };
+
                 surface.set_stringn(
                     area.x + col * (1 + col_width),
                     area.y + row,
-                    completion,
+                    &completion.content,
                     col_width.saturating_sub(1) as usize,
                     color,
                 );
@@ -658,7 +664,7 @@ impl Component for Prompt {
                     .editor
                     .registers
                     .iter_preview()
-                    .map(|(ch, preview)| (0.., format!("{} {}", ch, &preview).into(), None))
+                    .map(|(ch, preview)| (0.., Span::raw(format!("{} {}", ch, &preview))))
                     .collect();
                 self.next_char_handler = Some(Box::new(|prompt, c, context| {
                     prompt.insert_str(

From a73e1fd972ebc23cbb4eba29ca32ca8ace98843a Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Sat, 7 Dec 2024 16:49:35 +0000
Subject: [PATCH 09/21] refactor: do not unnecesserily evaluate
 completion_color

---
 helix-term/src/ui/prompt.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index c9e171638283..f53980cd982f 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -449,14 +449,13 @@ impl Prompt {
             for (i, (_range, completion)) in
                 self.completion.iter().enumerate().skip(offset).take(items)
             {
-                let completion_color = if completion.style == Style::default() {
-                    completion_color
-                } else {
-                    completion.style
-                };
+                let is_selected = Some(i) == self.selection;
+                let has_custom_style = completion.style != Style::default();
 
-                let color = if Some(i) == self.selection {
+                let completion_item_style = if is_selected {
                     selected_color
+                } else if has_custom_style {
+                    completion.style
                 } else {
                     completion_color
                 };
@@ -466,8 +465,9 @@ impl Prompt {
                     area.y + row,
                     &completion.content,
                     col_width.saturating_sub(1) as usize,
-                    color,
+                    completion_item_style,
                 );
+
                 row += 1;
                 if row > area.height - 1 {
                     row = 0;

From 032bd5e2ff213fc44d8e5bcf8fd5ca8023243fc6 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Sat, 7 Dec 2024 16:51:58 +0000
Subject: [PATCH 10/21] refactor: remove unnecessary comments

---
 helix-term/src/ui/mod.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 4f7f3f143336..bad73a0b42cd 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -350,7 +350,6 @@ pub mod completers {
         input: &str,
         git_ignore: bool,
     ) -> Vec<Completion> {
-        // styles are not lost here
         filename_impl(editor, input, git_ignore, |entry| {
             let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
 
@@ -533,7 +532,6 @@ pub mod completers {
                 .map(|file| (end.clone(), style_from_file(file)))
                 .collect();
             files.sort_unstable_by(|(_, path1), (_, path2)| path1.content.cmp(&path2.content));
-            // ok, so the Styles get correctly applied
             files
         }
     }

From 5aca6f39e2194707ee0c15e76d76eb6dd9537134 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Sat, 7 Dec 2024 17:38:27 +0000
Subject: [PATCH 11/21] refactor: more readable variable name:
 default_completion_color

---
 helix-term/src/ui/prompt.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index f53980cd982f..17aad6da421b 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -401,7 +401,7 @@ impl Prompt {
     pub fn render_prompt(&self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         let theme = &cx.editor.theme;
         let prompt_color = theme.get("ui.text");
-        let completion_color = theme.get("ui.menu");
+        let default_completion_color = theme.get("ui.menu");
         let selected_color = theme.get("ui.menu.selected");
         let suggestion_color = theme.get("ui.text.inactive");
         let background = theme.get("ui.background");
@@ -457,7 +457,7 @@ impl Prompt {
                 } else if has_custom_style {
                     completion.style
                 } else {
-                    completion_color
+                    default_completion_color
                 };
 
                 surface.set_stringn(

From f90731311328bcd66117128c6b71ceb11357520a Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Tue, 17 Dec 2024 19:38:17 +0000
Subject: [PATCH 12/21] feat: use `ui.text.directory`

---
 helix-term/src/ui/mod.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index bad73a0b42cd..7ab303ef06b0 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -507,8 +507,7 @@ pub mod completers {
             }) // TODO: unwrap or skip
             .filter(|path| !path.is_empty());
 
-        // TODO: use a custom theme key e.g. "ui.text.directory"
-        let directory_color = editor.theme.get("function");
+        let directory_color = editor.theme.get("ui.text.directory");
 
         let style_from_file = |file: Cow<'static, str>| {
             if file.ends_with(std::path::MAIN_SEPARATOR) {

From e3ac89e0f1b959117b5d2786cc965980f211c44e Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Tue, 17 Dec 2024 20:06:16 +0000
Subject: [PATCH 13/21] feat: add keys for several themes

---
 runtime/themes/catppuccin_mocha.toml    | 1 +
 runtime/themes/dark_plus.toml           | 1 +
 runtime/themes/dracula.toml             | 1 +
 runtime/themes/dracula_at_night.toml    | 1 +
 runtime/themes/github_dark.toml         | 1 +
 runtime/themes/github_light.toml        | 1 +
 runtime/themes/gruvbox.toml             | 1 +
 runtime/themes/material_deep_ocean.toml | 1 +
 runtime/themes/rose_pine.toml           | 1 +
 runtime/themes/tokyonight.toml          | 1 +
 theme.toml                              | 1 +
 11 files changed, 11 insertions(+)

diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml
index 76e65c62f7be..a96b46df5085 100644
--- a/runtime/themes/catppuccin_mocha.toml
+++ b/runtime/themes/catppuccin_mocha.toml
@@ -86,6 +86,7 @@
 "ui.text" = "text"
 "ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
 "ui.text.inactive" = { fg = "overlay1" }
+"ui.text.directory" = { fg = "blue" }
 
 "ui.virtual" = "overlay0"
 "ui.virtual.ruler" = { bg = "surface0" }
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index 813eebf3c252..7f57723c5f71 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -72,6 +72,7 @@
 "ui.bufferline.background"   = { bg = "background" }
 "ui.text"                    = { fg = "text" }
 "ui.text.focus"              = { fg = "white" }
+"ui.text.directory"          = { fg = "blue3" }
 "ui.virtual.whitespace"      = { fg = "#3e3e3d" }
 "ui.virtual.ruler"           = { bg = "borders" }
 "ui.virtual.indent-guide"    = { fg = "dark_gray4" }
diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index c1a9a12bc84a..bb4a38d5e22a 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -118,6 +118,7 @@
 "ui.statusline.select"            = { fg    = "black",           bg = "cyan",          modifiers = ["bold"] }
 "ui.text"                         = { fg    = "foreground"                                                  }
 "ui.text.focus"                   = { fg    = "cyan"                                                        }
+"ui.text.directory"               = { fg    = "cyan"                                                        }
 "ui.virtual.indent-guide"         = { fg    = "indent"                                                      }
 "ui.virtual.inlay-hint"           = { fg    = "cyan"                                                        }
 "ui.virtual.inlay-hint.parameter" = { fg    = "cyan",            modifiers = ["italic", "dim"]              }
diff --git a/runtime/themes/dracula_at_night.toml b/runtime/themes/dracula_at_night.toml
index 55f2615398c1..ac75199d9d56 100644
--- a/runtime/themes/dracula_at_night.toml
+++ b/runtime/themes/dracula_at_night.toml
@@ -42,6 +42,7 @@
 "ui.statusline.select" = { fg = "background_dark", bg = "purple" }
 "ui.text" = { fg = "foreground" }
 "ui.text.focus" = { fg = "cyan" }
+"ui.text.directory" = { fg = "cyan" }
 "ui.window" = { fg = "foreground" }
 "ui.virtual.jump-label" = { fg = "pink", modifiers = ["bold"] }
 "ui.virtual.ruler" = { bg = "background_dark" }
diff --git a/runtime/themes/github_dark.toml b/runtime/themes/github_dark.toml
index e98032108e26..c0f89cc815c9 100644
--- a/runtime/themes/github_dark.toml
+++ b/runtime/themes/github_dark.toml
@@ -59,6 +59,7 @@ label = "scale.red.3"
 "ui.text" = { fg = "fg.muted" }
 "ui.text.focus" = { fg = "fg.default" }
 "ui.text.inactive" = "fg.subtle"
+"ui.text.directory" = { fg = "scale.blue.2" }
 "ui.virtual" = { fg = "scale.gray.6" }
 "ui.virtual.ruler" = { bg = "canvas.subtle" }
 "ui.virtual.jump-label" = { fg = "scale.red.2", modifiers = ["bold"] }
diff --git a/runtime/themes/github_light.toml b/runtime/themes/github_light.toml
index cd3f1e5d16cd..6fa79c7d63c6 100644
--- a/runtime/themes/github_light.toml
+++ b/runtime/themes/github_light.toml
@@ -59,6 +59,7 @@ label = "scale.red.5"
 "ui.text" = { fg = "fg.muted" }
 "ui.text.focus" = { fg = "fg.default" }
 "ui.text.inactive" = "fg.subtle"
+"ui.text.directory" = { fg = "scale.blue.4" }
 "ui.virtual" = { fg = "scale.gray.2" }
 "ui.virtual.ruler" = { bg = "canvas.subtle" }
 
diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index e91b6f32284b..933b63125f94 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -106,6 +106,7 @@
 "ui.statusline.select" = { fg = "bg1", bg = "orange1", modifiers = ["bold"] }
 
 "ui.text" = { fg = "fg1" }
+"ui.text.directory" = { fg = "blue1" }
 "ui.virtual.inlay-hint" = { fg = "gray" }
 "ui.virtual.jump-label" = { fg = "purple0", modifiers = ["bold"] }
 "ui.virtual.ruler" = { bg = "bg1" }
diff --git a/runtime/themes/material_deep_ocean.toml b/runtime/themes/material_deep_ocean.toml
index 8b1e3c86144d..76041d07d345 100644
--- a/runtime/themes/material_deep_ocean.toml
+++ b/runtime/themes/material_deep_ocean.toml
@@ -60,6 +60,7 @@
 
 "ui.background" = { bg = "bg", fg = "text" }
 "ui.text" = { fg = "text" }
+"ui.text.directory" = { fg = "blue" }
 
 "ui.statusline" = { bg = "bg", fg = "text" }
 "ui.statusline.inactive" = { bg = "bg", fg = "disabled" }
diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index 9a5ba450e92e..ae88bdc5441b 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -36,6 +36,7 @@
 "ui.text" = { fg = "text" }
 "ui.text.focus" = { bg = "overlay" }
 "ui.text.info" = { fg = "subtle" }
+"ui.text.directory" = { fg = "iris" }
 
 "ui.virtual.jump-label" = { fg = "love", modifiers = ["bold"] }
 "ui.virtual.ruler" = { bg = "overlay" }
diff --git a/runtime/themes/tokyonight.toml b/runtime/themes/tokyonight.toml
index 4e53e03b85f5..08e7ce3aec33 100644
--- a/runtime/themes/tokyonight.toml
+++ b/runtime/themes/tokyonight.toml
@@ -89,6 +89,7 @@ hint = { fg = "hint" }
 "ui.text.focus" = { bg = "bg-focus" }
 "ui.text.inactive" = { fg = "comment", modifiers = ["italic"] }
 "ui.text.info" = { bg = "bg-menu", fg = "fg" }
+"ui.text.directory" = { fg = "cyan" }
 "ui.virtual.ruler" = { bg = "fg-gutter" }
 "ui.virtual.whitespace" = { fg = "fg-gutter" }
 "ui.virtual.inlay-hint" = {  bg = "bg-inlay", fg = "teal" }
diff --git a/theme.toml b/theme.toml
index c1e5883d0bec..ccb2ec795445 100644
--- a/theme.toml
+++ b/theme.toml
@@ -55,6 +55,7 @@ label = "honey"
 "ui.text" = { fg = "lavender" }
 "ui.text.focus" = { fg = "white" }
 "ui.text.inactive" = "sirocco"
+"ui.text.directory" = { fg = "lilac" }
 "ui.virtual" = { fg = "comet" }
 "ui.virtual.ruler" = { bg = "bossanova" }
 "ui.virtual.jump-label" = { fg = "apricot", modifiers = ["bold"] }

From 1e24775bf695bb61ab094294c79de752d797240b Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Tue, 17 Dec 2024 20:10:01 +0000
Subject: [PATCH 14/21] docs: info on `ui.text.directory`

---
 book/src/themes.md | 53 ++++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 40e12330e425..a4fbc15011d9 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -36,7 +36,6 @@ For inspiration, you can find the default `theme.toml`
 user-submitted themes
 [here](https://github.com/helix-editor/helix/blob/master/runtime/themes).
 
-
 ## The details of theme creation
 
 ### Color palettes
@@ -62,7 +61,7 @@ are listed below. The `[palette]` section in the config file takes precedence
 over it and is merged into the default palette.
 
 | Color Name      |
-| ---             |
+| --------------- |
 | `default`       |
 | `black`         |
 | `red`           |
@@ -86,17 +85,17 @@ over it and is merged into the default palette.
 The following values may be used as modifier, provided they are supported by
 your terminal emulator.
 
-| Modifier             |
-| ---                  |
-| `bold`               |
-| `dim`                |
-| `italic`             |
-| `underlined`         |
-| `slow_blink`         |
-| `rapid_blink`        |
-| `reversed`           |
-| `hidden`             |
-| `crossed_out`        |
+| Modifier      |
+| ------------- |
+| `bold`        |
+| `dim`         |
+| `italic`      |
+| `underlined`  |
+| `slow_blink`  |
+| `rapid_blink` |
+| `reversed`    |
+| `hidden`      |
+| `crossed_out` |
 
 > 💡 The `underlined` modifier is deprecated and only available for backwards compatibility.
 > Its behavior is equivalent to setting `underline.style="line"`.
@@ -106,14 +105,13 @@ your terminal emulator.
 One of the following values may be used as a value for `underline.style`, providing it is
 supported by your terminal emulator.
 
-| Modifier       |
-| ---            |
-| `line`         |
-| `curl`         |
-| `dashed`       |
-| `dotted`       |
-| `double_line`  |
-
+| Modifier      |
+| ------------- |
+| `line`        |
+| `curl`        |
+| `dashed`      |
+| `dotted`      |
+| `double_line` |
 
 ### Inheritance
 
@@ -154,6 +152,7 @@ We use a similar set of scopes as
 - `constructor`
 
 - `constant` (TODO: constant.other.placeholder for `%v`)
+
   - `builtin` Special constants provided by the language (`true`, `false`, `nil` etc)
     - `boolean`
   - `character`
@@ -163,6 +162,7 @@ We use a similar set of scopes as
     - `float`
 
 - `string` (TODO: string.quoted.{single, double}, string.raw/.unquoted)?
+
   - `regexp` - Regular expressions
   - `special`
     - `path`
@@ -170,11 +170,13 @@ We use a similar set of scopes as
     - `symbol` - Erlang/Elixir atoms, Ruby symbols, Clojure keywords
 
 - `comment` - Code comments
+
   - `line` - Single line comments (`//`)
   - `block` - Block comments (e.g. (`/* */`)
     - `documentation` - Documentation comments (e.g. `///` in Rust)
 
 - `variable` - Variables
+
   - `builtin` - Reserved language variables (`self`, `this`, `super`, etc.)
   - `parameter` - Function parameters
   - `other`
@@ -184,11 +186,13 @@ We use a similar set of scopes as
 - `label`
 
 - `punctuation`
+
   - `delimiter` - Commas, colons
   - `bracket` - Parentheses, angle brackets, etc.
   - `special` - String interpolation brackets.
 
 - `keyword`
+
   - `control`
     - `conditional` - `if`, `else`
     - `repeat` - `for`, `while`, `loop`
@@ -205,6 +209,7 @@ We use a similar set of scopes as
 - `operator` - `||`, `+=`, `>`
 
 - `function`
+
   - `builtin`
   - `method`
     - `private` - Private methods that use a unique syntax (currently just ECMAScript-based languages)
@@ -212,6 +217,7 @@ We use a similar set of scopes as
   - `special` (preprocessor in C)
 
 - `tag` - Tags (e.g. `<body>` in HTML)
+
   - `builtin`
 
 - `namespace`
@@ -219,6 +225,7 @@ We use a similar set of scopes as
 - `special`
 
 - `markup`
+
   - `heading`
     - `marker`
     - `1`, `2`, `3`, `4`, `5`, `6` - heading text for h1 through h6
@@ -265,9 +272,8 @@ These scopes are used for theming the editor interface:
       - `completion` - for completion doc popup UI
       - `hover` - for hover popup UI
 
-
 | Key                               | Notes                                                                                          |
-| ---                               | ---                                                                                            |
+| --------------------------------- | ---------------------------------------------------------------------------------------------- |
 | `ui.background`                   |                                                                                                |
 | `ui.background.separator`         | Picker separator below input line                                                              |
 | `ui.cursor`                       |                                                                                                |
@@ -305,6 +311,7 @@ These scopes are used for theming the editor interface:
 | `ui.text.focus`                   | The currently selected line in the picker                                                      |
 | `ui.text.inactive`                | Same as `ui.text` but when the text is inactive (e.g. suggestions)                             |
 | `ui.text.info`                    | The key: command text in `ui.popup.info` boxes                                                 |
+| `ui.text.directory`               | Style for directories which show on autocomplete with `:edit`                                  |
 | `ui.virtual.ruler`                | Ruler columns (see the [`editor.rulers` config][editor-section])                               |
 | `ui.virtual.whitespace`           | Visible whitespace characters                                                                  |
 | `ui.virtual.indent-guide`         | Vertical indent width guides                                                                   |

From 5e4ed5d0624d39abb0463ec44cf4d818eca49d59 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Tue, 17 Dec 2024 20:14:51 +0000
Subject: [PATCH 15/21] revert: unformat file

---
 book/src/themes.md | 54 +++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index a4fbc15011d9..6682b2347f85 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -36,6 +36,7 @@ For inspiration, you can find the default `theme.toml`
 user-submitted themes
 [here](https://github.com/helix-editor/helix/blob/master/runtime/themes).
 
+
 ## The details of theme creation
 
 ### Color palettes
@@ -61,7 +62,7 @@ are listed below. The `[palette]` section in the config file takes precedence
 over it and is merged into the default palette.
 
 | Color Name      |
-| --------------- |
+| ---             |
 | `default`       |
 | `black`         |
 | `red`           |
@@ -85,17 +86,17 @@ over it and is merged into the default palette.
 The following values may be used as modifier, provided they are supported by
 your terminal emulator.
 
-| Modifier      |
-| ------------- |
-| `bold`        |
-| `dim`         |
-| `italic`      |
-| `underlined`  |
-| `slow_blink`  |
-| `rapid_blink` |
-| `reversed`    |
-| `hidden`      |
-| `crossed_out` |
+| Modifier             |
+| ---                  |
+| `bold`               |
+| `dim`                |
+| `italic`             |
+| `underlined`         |
+| `slow_blink`         |
+| `rapid_blink`        |
+| `reversed`           |
+| `hidden`             |
+| `crossed_out`        |
 
 > 💡 The `underlined` modifier is deprecated and only available for backwards compatibility.
 > Its behavior is equivalent to setting `underline.style="line"`.
@@ -105,13 +106,14 @@ your terminal emulator.
 One of the following values may be used as a value for `underline.style`, providing it is
 supported by your terminal emulator.
 
-| Modifier      |
-| ------------- |
-| `line`        |
-| `curl`        |
-| `dashed`      |
-| `dotted`      |
-| `double_line` |
+| Modifier       |
+| ---            |
+| `line`         |
+| `curl`         |
+| `dashed`       |
+| `dotted`       |
+| `double_line`  |
+
 
 ### Inheritance
 
@@ -152,7 +154,6 @@ We use a similar set of scopes as
 - `constructor`
 
 - `constant` (TODO: constant.other.placeholder for `%v`)
-
   - `builtin` Special constants provided by the language (`true`, `false`, `nil` etc)
     - `boolean`
   - `character`
@@ -162,7 +163,6 @@ We use a similar set of scopes as
     - `float`
 
 - `string` (TODO: string.quoted.{single, double}, string.raw/.unquoted)?
-
   - `regexp` - Regular expressions
   - `special`
     - `path`
@@ -170,13 +170,11 @@ We use a similar set of scopes as
     - `symbol` - Erlang/Elixir atoms, Ruby symbols, Clojure keywords
 
 - `comment` - Code comments
-
   - `line` - Single line comments (`//`)
   - `block` - Block comments (e.g. (`/* */`)
     - `documentation` - Documentation comments (e.g. `///` in Rust)
 
 - `variable` - Variables
-
   - `builtin` - Reserved language variables (`self`, `this`, `super`, etc.)
   - `parameter` - Function parameters
   - `other`
@@ -186,13 +184,11 @@ We use a similar set of scopes as
 - `label`
 
 - `punctuation`
-
   - `delimiter` - Commas, colons
   - `bracket` - Parentheses, angle brackets, etc.
   - `special` - String interpolation brackets.
 
 - `keyword`
-
   - `control`
     - `conditional` - `if`, `else`
     - `repeat` - `for`, `while`, `loop`
@@ -209,7 +205,6 @@ We use a similar set of scopes as
 - `operator` - `||`, `+=`, `>`
 
 - `function`
-
   - `builtin`
   - `method`
     - `private` - Private methods that use a unique syntax (currently just ECMAScript-based languages)
@@ -217,7 +212,6 @@ We use a similar set of scopes as
   - `special` (preprocessor in C)
 
 - `tag` - Tags (e.g. `<body>` in HTML)
-
   - `builtin`
 
 - `namespace`
@@ -225,7 +219,6 @@ We use a similar set of scopes as
 - `special`
 
 - `markup`
-
   - `heading`
     - `marker`
     - `1`, `2`, `3`, `4`, `5`, `6` - heading text for h1 through h6
@@ -272,8 +265,9 @@ These scopes are used for theming the editor interface:
       - `completion` - for completion doc popup UI
       - `hover` - for hover popup UI
 
+
 | Key                               | Notes                                                                                          |
-| --------------------------------- | ---------------------------------------------------------------------------------------------- |
+| ---                               | ---                                                                                            |
 | `ui.background`                   |                                                                                                |
 | `ui.background.separator`         | Picker separator below input line                                                              |
 | `ui.cursor`                       |                                                                                                |
@@ -311,7 +305,7 @@ These scopes are used for theming the editor interface:
 | `ui.text.focus`                   | The currently selected line in the picker                                                      |
 | `ui.text.inactive`                | Same as `ui.text` but when the text is inactive (e.g. suggestions)                             |
 | `ui.text.info`                    | The key: command text in `ui.popup.info` boxes                                                 |
-| `ui.text.directory`               | Style for directories which show on autocomplete with `:edit`                                  |
+| `ui.text.directory`               | Color of directories which show in autocomplete on `:edit`                                     |
 | `ui.virtual.ruler`                | Ruler columns (see the [`editor.rulers` config][editor-section])                               |
 | `ui.virtual.whitespace`           | Visible whitespace characters                                                                  |
 | `ui.virtual.indent-guide`         | Vertical indent width guides                                                                   |

From 2cd6c90895b08aad337ab4d81fb650ba9dfd56ad Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Tue, 17 Dec 2024 20:17:11 +0000
Subject: [PATCH 16/21] docs: be more concise

---
 book/src/themes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 6682b2347f85..16f9dd686eb4 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -305,7 +305,7 @@ These scopes are used for theming the editor interface:
 | `ui.text.focus`                   | The currently selected line in the picker                                                      |
 | `ui.text.inactive`                | Same as `ui.text` but when the text is inactive (e.g. suggestions)                             |
 | `ui.text.info`                    | The key: command text in `ui.popup.info` boxes                                                 |
-| `ui.text.directory`               | Color of directories which show in autocomplete on `:edit`                                     |
+| `ui.text.directory`               | Color of directories                                                                           |
 | `ui.virtual.ruler`                | Ruler columns (see the [`editor.rulers` config][editor-section])                               |
 | `ui.virtual.whitespace`           | Visible whitespace characters                                                                  |
 | `ui.virtual.indent-guide`         | Vertical indent width guides                                                                   |

From ee8162d724afc6851036efaa6fe4fb3eee3fc810 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Tue, 17 Dec 2024 20:19:36 +0000
Subject: [PATCH 17/21] perf: do not make unnecessary evaluation of
 has_custom_style

---
 helix-term/src/ui/prompt.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 17aad6da421b..277bde37e309 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -450,11 +450,10 @@ impl Prompt {
                 self.completion.iter().enumerate().skip(offset).take(items)
             {
                 let is_selected = Some(i) == self.selection;
-                let has_custom_style = completion.style != Style::default();
 
                 let completion_item_style = if is_selected {
                     selected_color
-                } else if has_custom_style {
+                } else if completion.style != Style::default() {
                     completion.style
                 } else {
                     default_completion_color

From 0f254ee5413e06fb8f4e016ef39db7dd43f055c1 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Tue, 17 Dec 2024 21:19:11 +0000
Subject: [PATCH 18/21] refactor: do not use unnecessary Span::raw

---
 helix-term/src/commands.rs       |  2 +-
 helix-term/src/commands/typed.rs |  2 +-
 helix-term/src/ui/mod.rs         | 10 +++++-----
 helix-term/src/ui/prompt.rs      |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index d8b494d74dd3..9c71f3e4e79b 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2164,7 +2164,7 @@ fn searcher(cx: &mut Context, direction: Direction) {
             completions
                 .iter()
                 .filter(|comp| comp.starts_with(input))
-                .map(|comp| (0.., Span::raw(comp.clone())))
+                .map(|comp| (0.., comp.clone().into()))
                 .collect()
         },
         move |cx, regex, event| {
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index f0da7f5a8134..3d8655727263 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -3178,7 +3178,7 @@ pub(super) fn command_mode(cx: &mut Context) {
                     false,
                 )
                 .into_iter()
-                .map(|(name, _)| (0.., Span::raw(name)))
+                .map(|(name, _)| (0.., name.into()))
                 .collect()
             } else {
                 // Otherwise, use the command's completer and the last shellword
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 7ab303ef06b0..f951dee23453 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -291,7 +291,7 @@ pub mod completers {
 
         fuzzy_match(input, names, true)
             .into_iter()
-            .map(|(name, _)| ((0..), Span::raw(name)))
+            .map(|(name, _)| ((0..), name.into()))
             .collect()
     }
 
@@ -307,7 +307,7 @@ pub mod completers {
 
         fuzzy_match(input, names, false)
             .into_iter()
-            .map(|(name, _)| ((0..), Span::raw(name)))
+            .map(|(name, _)| ((0..), name.into()))
             .collect()
     }
 
@@ -372,7 +372,7 @@ pub mod completers {
 
         fuzzy_match(input, language_ids, false)
             .into_iter()
-            .map(|(name, _)| ((0..), Span::raw(name.to_owned())))
+            .map(|(name, _)| ((0..), name.to_owned().into()))
             .collect()
     }
 
@@ -388,7 +388,7 @@ pub mod completers {
 
         fuzzy_match(input, commands, false)
             .into_iter()
-            .map(|(name, _)| ((0..), Span::raw(name.to_owned())))
+            .map(|(name, _)| ((0..), name.to_owned().into()))
             .collect()
     }
 
@@ -545,7 +545,7 @@ pub mod completers {
 
         fuzzy_match(input, iter, false)
             .into_iter()
-            .map(|(name, _)| ((0..), Span::raw(name)))
+            .map(|(name, _)| ((0..), name.into()))
             .collect()
     }
 }
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 277bde37e309..1dca439a21b2 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -663,7 +663,7 @@ impl Component for Prompt {
                     .editor
                     .registers
                     .iter_preview()
-                    .map(|(ch, preview)| (0.., Span::raw(format!("{} {}", ch, &preview))))
+                    .map(|(ch, preview)| (0.., format!("{} {}", ch, &preview).into()))
                     .collect();
                 self.next_char_handler = Some(Box::new(|prompt, c, context| {
                     prompt.insert_str(

From cefa10da700c8712d2f9d444c8eea89f32b688f4 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Tue, 17 Dec 2024 21:23:03 +0000
Subject: [PATCH 19/21] refactor: use .patch method

---
 helix-term/src/ui/prompt.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 1dca439a21b2..2f4a6010a44d 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -5,7 +5,6 @@ use helix_core::syntax;
 use helix_view::document::Mode;
 use helix_view::input::KeyEvent;
 use helix_view::keyboard::KeyCode;
-use helix_view::theme::Style;
 use std::sync::Arc;
 use std::{borrow::Cow, ops::RangeFrom};
 use tui::buffer::Buffer as Surface;
@@ -401,7 +400,7 @@ impl Prompt {
     pub fn render_prompt(&self, area: Rect, surface: &mut Surface, cx: &mut Context) {
         let theme = &cx.editor.theme;
         let prompt_color = theme.get("ui.text");
-        let default_completion_color = theme.get("ui.menu");
+        let completion_color = theme.get("ui.menu");
         let selected_color = theme.get("ui.menu.selected");
         let suggestion_color = theme.get("ui.text.inactive");
         let background = theme.get("ui.background");
@@ -453,10 +452,8 @@ impl Prompt {
 
                 let completion_item_style = if is_selected {
                     selected_color
-                } else if completion.style != Style::default() {
-                    completion.style
                 } else {
-                    default_completion_color
+                    completion_color.patch(completion.style)
                 };
 
                 surface.set_stringn(

From b45d3ebb05cb022529cb97a2d2c13defcf234348 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Tue, 17 Dec 2024 21:33:21 +0000
Subject: [PATCH 20/21] feat: use Utf8PathBuf struct instead of checking for
 end of file

---
 helix-term/src/ui/mod.rs | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index f951dee23453..4b2d6ba06afd 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -32,6 +32,17 @@ use helix_view::Editor;
 
 use std::{error::Error, path::PathBuf};
 
+struct Utf8PathBuf {
+    path: String,
+    is_dir: bool,
+}
+
+impl AsRef<str> for Utf8PathBuf {
+    fn as_ref(&self) -> &str {
+        &self.path
+    }
+}
+
 pub fn prompt(
     cx: &mut crate::commands::Context,
     prompt: std::borrow::Cow<'static, str>,
@@ -267,6 +278,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
 
 pub mod completers {
     use crate::ui::prompt::Completion;
+    use crate::ui::Utf8PathBuf;
     use helix_core::fuzzy::fuzzy_match;
     use helix_core::syntax::LanguageServerFeature;
     use helix_view::document::SCRATCH_BUFFER_NAME;
@@ -483,7 +495,7 @@ pub mod completers {
                         return None;
                     }
 
-                    //let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
+                    let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
 
                     let path = entry.path();
                     let mut path = if is_tilde {
@@ -502,18 +514,18 @@ pub mod completers {
                     }
 
                     let path = path.into_os_string().into_string().ok()?;
-                    Some(Cow::from(path))
+                    Some(Utf8PathBuf { path, is_dir })
                 })
             }) // TODO: unwrap or skip
-            .filter(|path| !path.is_empty());
+            .filter(|path| !path.path.is_empty());
 
         let directory_color = editor.theme.get("ui.text.directory");
 
-        let style_from_file = |file: Cow<'static, str>| {
-            if file.ends_with(std::path::MAIN_SEPARATOR) {
-                Span::styled(file, directory_color)
+        let style_from_file = |file: Utf8PathBuf| {
+            if file.is_dir {
+                Span::styled(file.path, directory_color)
             } else {
-                Span::raw(file)
+                Span::raw(file.path)
             }
         };
 

From 2eca8df484f4cc8c61cd02d475e75956f730e0ec Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Tue, 17 Dec 2024 22:01:38 -0500
Subject: [PATCH 21/21] minor style nits

* simplification of some imports
* prefer `is_some_and` to `map_or` (`is_some_and` was not yet stable
  when the is_dir comment was written)
* be more specific in the description for 'ui.text.directory' theme key
---
 book/src/themes.md       | 2 +-
 helix-term/src/ui/mod.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/book/src/themes.md b/book/src/themes.md
index 16f9dd686eb4..1d0ba151773d 100644
--- a/book/src/themes.md
+++ b/book/src/themes.md
@@ -305,7 +305,7 @@ These scopes are used for theming the editor interface:
 | `ui.text.focus`                   | The currently selected line in the picker                                                      |
 | `ui.text.inactive`                | Same as `ui.text` but when the text is inactive (e.g. suggestions)                             |
 | `ui.text.info`                    | The key: command text in `ui.popup.info` boxes                                                 |
-| `ui.text.directory`               | Color of directories                                                                           |
+| `ui.text.directory`               | Directory names in prompt completion                                                           |
 | `ui.virtual.ruler`                | Ruler columns (see the [`editor.rulers` config][editor-section])                               |
 | `ui.virtual.whitespace`           | Visible whitespace characters                                                                  |
 | `ui.virtual.indent-guide`         | Vertical indent width guides                                                                   |
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 4b2d6ba06afd..6ee49fa57ddd 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -277,12 +277,12 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
 }
 
 pub mod completers {
+    use super::Utf8PathBuf;
     use crate::ui::prompt::Completion;
-    use crate::ui::Utf8PathBuf;
     use helix_core::fuzzy::fuzzy_match;
     use helix_core::syntax::LanguageServerFeature;
     use helix_view::document::SCRATCH_BUFFER_NAME;
-    use helix_view::theme::{self};
+    use helix_view::theme;
     use helix_view::{editor::Config, Editor};
     use once_cell::sync::Lazy;
     use std::borrow::Cow;
@@ -495,7 +495,7 @@ pub mod completers {
                         return None;
                     }
 
-                    let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
+                    let is_dir = entry.file_type().is_some_and(|entry| entry.is_dir());
 
                     let path = entry.path();
                     let mut path = if is_tilde {