refactor(picker): deduplicate path chunk formatting

Author: mhiro2

lua/peekstack/picker/snacks.lua

@@ -2,18 +2,6 @@ local picker_util = require("peekstack.util.picker")
 
 local M = {}
 
----@param chunks table
----@param path string
-local function append_path_chunks(chunks, path)
-  local dir, base = path:match("^(.*[/\\])(.+)$")
-  if dir and base then
-    chunks[#chunks + 1] = { dir, "SnacksPickerDir" }
-    chunks[#chunks + 1] = { base, "SnacksPickerFile" }
-    return
-  end
-  chunks[#chunks + 1] = { path, "SnacksPickerFile" }
-end
-
 ---@param item table
 ---@return table
 local function format_item(item)
@@ -28,7 +16,7 @@ local function format_item(item)
   if type(path) ~= "string" or path == "" then
     path = item.text or ""
   end
-  append_path_chunks(chunks, path)
+  picker_util.append_path_chunks(chunks, path, "SnacksPickerDir", "SnacksPickerFile")
 
   if type(item.display_lnum) == "number" and item.display_lnum > 0 then
     chunks[#chunks + 1] = { ":", "SnacksPickerDelim" }

lua/peekstack/picker/telescope.lua

@@ -12,18 +12,6 @@ local function hl(primary, fallback)
   return fallback
 end
 
----@param chunks table
----@param path string
-local function append_path_chunks(chunks, path)
-  local dir, base = path:match("^(.*[/\\])(.+)$")
-  if dir and base then
-    chunks[#chunks + 1] = { dir, hl("TelescopeResultsComment", "Comment") }
-    chunks[#chunks + 1] = { base, hl("TelescopeResultsIdentifier", "Directory") }
-    return
-  end
-  chunks[#chunks + 1] = { path, hl("TelescopeResultsIdentifier", "Directory") }
-end
-
 ---@param displayer fun(chunks: table): string
 ---@param item PeekstackPickerExternalItem
 ---@return string
@@ -35,7 +23,12 @@ local function display_entry(displayer, item)
   end
 
   local path = item.path or item.label
-  append_path_chunks(chunks, path)
+  picker_util.append_path_chunks(
+    chunks,
+    path,
+    hl("TelescopeResultsComment", "Comment"),
+    hl("TelescopeResultsIdentifier", "Directory")
+  )
 
   if type(item.display_lnum) == "number" and item.display_lnum > 0 then
     chunks[#chunks + 1] = { ":", hl("TelescopeResultsComment", "Comment") }

lua/peekstack/util/picker.lua

@@ -4,6 +4,25 @@ local fs = require("peekstack.util.fs")
 
 local M = {}
 
+---@param chunks table
+---@param path string
+---@param dir_hl? string
+---@param file_hl? string
+function M.append_path_chunks(chunks, path, dir_hl, file_hl)
+  local file_group = file_hl or "Directory"
+  local dir, base = path:match("^(.*[/\\])(.+)$")
+  if dir and base then
+    if type(dir_hl) == "string" and dir_hl ~= "" then
+      chunks[#chunks + 1] = { dir, dir_hl }
+    else
+      chunks[#chunks + 1] = { dir, file_group }
+    end
+    chunks[#chunks + 1] = { base, file_group }
+    return
+  end
+  chunks[#chunks + 1] = { path, file_group }
+end
+
 ---@param text? string
 ---@return string
 local function normalize_label_text(text)

tests/picker_util_spec.lua

@@ -80,4 +80,14 @@ describe("peekstack.util.picker", function()
     local items = picker_util.build_external_items({ location }, 1)
     assert.equals("errMsgFailedToStartServer - /tmp/sample.lua:10:3", items[1].label)
   end)
+
+  it("appends split path chunks with given highlight groups", function()
+    local chunks = {}
+    picker_util.append_path_chunks(chunks, "/tmp/sample.lua", "DirHl", "FileHl")
+
+    assert.same({
+      { "/tmp/", "DirHl" },
+      { "sample.lua", "FileHl" },
+    }, chunks)
+  end)
 end)