helix-view/term: path completion item kinds

Author: nferhat

helix-term/src/ui/completion.rs

@@ -125,15 +125,27 @@ impl menu::Item for CompletionItem {
                 }
             }
             CompletionItem::Other(core::CompletionItem { kind, .. }) => {
-                if let Some(kind_style) = data.completion_item_kinds.get(kind.as_ref()) {
+                let kind = match kind.as_ref() {
+                    // This is for path completion source.
+                    // Got this from helix-term/src/handlers/completion/path.rs
+                    // On unix these are all just **file** descriptors
+                    #[cfg(unix)]
+                    "block" | "socket" | "char_device" | "fifo" => "file",
+
+                    // NOTE: Whenever you add a new completion source, you may want to add overrides
+                    // here if you wish to.
+                    x => x, // otherwise keep untouched.
+                };
+
+                if let Some(kind_style) = data.completion_item_kinds.get(kind) {
                     let style = kind_style.style.unwrap_or(data.default_style);
                     if let Some(text) = kind_style.text.as_ref() {
                         menu::Cell::from(Span::styled(text.clone(), style))
                     } else {
-                        menu::Cell::from(Span::styled(kind.as_ref(), style))
+                        menu::Cell::from(Span::styled(kind, style))
                     }
                 } else {
-                    menu::Cell::from(Span::styled(kind.as_ref(), data.default_style))
+                    menu::Cell::from(Span::styled(kind, data.default_style))
                 }
             }
         };

helix-view/src/editor.rs

@@ -2240,41 +2240,28 @@ fn try_restore_indent(doc: &mut Document, view: &mut View) {
     }
 }
 
+// NOTE: When you implement a new completion source/handler, dont forget to add
+// your completion kinds here!
+#[rustfmt::skip]
+const ALL_KINDS: &[&str] = &[
+    // All of these are LSP item kinds.
+    // It happens that file and folder are also here.
+    "text", "method", "function", "constructor", "field", "variable",
+    "class", "interface", "module", "property", "unit", "value", "enum",
+    "keyword", "snippet", "color", "file", "reference", "folder",
+    "enum-member", "constant", "struct", "event", "operator",
+    "type-parameter",
+    // The following are specific to path completion source
+    // We ignore the other linux-specific ones (block, socket, etc...)
+    "link"
+];
+
 fn compute_completion_item_kind_styles(
     theme: &Theme,
     config: &DynGuard<Config>,
 ) -> HashMap<&'static str, CompletionItemKindStyle> {
     let mut ret = HashMap::new();
-    // We populate with LSP kinds and additionally file+folder for path completion
-    for name in [
-        "text",
-        "method",
-        "function",
-        "constructor",
-        "field",
-        "variable",
-        "class",
-        "interface",
-        "module",
-        "property",
-        "unit",
-        "value",
-        "enum",
-        "keyword",
-        "snippet",
-        "color",
-        "file",
-        "reference",
-        "folder",
-        "enum-member",
-        "constant",
-        "struct",
-        "event",
-        "operator",
-        "type-parameter",
-        "file",
-        "folder",
-    ] {
+    for &name in ALL_KINDS {
         let style = theme.try_get(&format!("ui.completion.kind.{name}"));
         let text = config.completion_item_kinds.get(name).cloned();
         if style.is_some() || text.is_some() {