fix(misc): various test fixes and enhancing the entry preview.

asmodeus812 · asmodeus812 · commit d1948233d00a · 2026-03-12T14:58:53.000+02:00
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@
             - [Primary stage](#primary-stage)
             - [Matching stage](#matching-stage)
     - [Features](#features)
+    - [PICKERS](#pickers)
     - [Description](#description)
     - [Installation](#installation)
         - [Using packer.nvim](#using-packernvimhttpsgithubcomwbthomasonpackernvim)
@@ -30,20 +31,21 @@
         - [Dynamic streams](#dynamic-streams)
         - [Contextual awareness](#contextual-awareness)
     - [Interaction](#interaction)
-        - [Interactive and Fuzzy stages](#interactive-and-fuzzy-stages)
-        - [Closing and hiding pickers](#closing-and-hiding-pickers)
+        - [Interactive & Matching stages](#interactive--matching-stages)
+        - [Closing & hiding pickers](#closing--hiding-pickers)
         - [Dynamic context evaluation](#dynamic-context-evaluation)
-        - [Picker actions & interaction](#picker-actions--interaction)
+        - [Actions & interaction](#actions--interaction)
         - [Picker Options](#picker-options)
         - [Core options](#core-options)
         - [Advanced options](#advanced-options)
         - [Option details](#option-details)
             - [Core options](#core-options-1)
             - [Advanced options](#advanced-options-1)
-        - [In-depth look](#in-depth-look)
+        - [In-depth description](#in-depth-description)
             - [Actions](#actions)
             - [Previewers](#previewers)
             - [Decorators](#decorators)
+            - [Highlighters](#highlighters)
             - [Converters](#converters)
     - [Examples](#examples)
         - [Interactive grep](#interactive-grep)
diff --git a/lua/fuzzy/init.lua b/lua/fuzzy/init.lua
@@ -50,13 +50,14 @@ function M.setup(opts)
     vim.api.nvim_set_hl(0, "SelectHeaderDefault", { link = "Normal", default = false })
     vim.api.nvim_set_hl(0, "SelectHeaderPadding", { link = "NonText", default = false })
     vim.api.nvim_set_hl(0, "SelectHeaderDelimiter", { link = "Ignore", default = false })
-    vim.api.nvim_set_hl(0, "SelectDecoratorDefault", { link = "Normal", default = false })
-    vim.api.nvim_set_hl(0, "SelectLineHighlight", { link = "Visual", default = false })
 
     vim.api.nvim_set_hl(0, "PickerHeaderActionKey", { link = "ErrorMsg", default = false })
     vim.api.nvim_set_hl(0, "PickerHeaderActionLabel", { link = "MoreMsg", default = false })
     vim.api.nvim_set_hl(0, "PickerHeaderActionSeparator", { link = "ModeMsg", default = false })
 
+    vim.api.nvim_set_hl(0, "SelectLineHighlight", { link = "Normal", default = false })
+    vim.api.nvim_set_hl(0, "SelectDecoratorDefault", { link = "Normal", default = false })
+
     Pool.prime(pool_config.prime_sizes or {})
 end
 
diff --git a/lua/fuzzy/picker.lua b/lua/fuzzy/picker.lua
@@ -907,8 +907,8 @@ function Picker.new(opts)
         context = {
             args = {},
             env = nil,
+            cwd = nil,
             tick = nil,
-            cwd = vim.loop.cwd,
         },
         interactive = false,
         stream_map = nil,
diff --git a/lua/fuzzy/pickers/btags.lua b/lua/fuzzy/pickers/btags.lua
@@ -46,7 +46,7 @@ function M.open_btags_picker(opts)
         },
         highlighters = {
             Select.RegexHighlighter.new({
-                { "^%S+", "Identifier" },
+                { "^%S+", "Function" },
                 { "%s%[([^%]]+)%]$", "Type", 1 },
             }),
         },
diff --git a/lua/fuzzy/pickers/buffers.lua b/lua/fuzzy/pickers/buffers.lua
@@ -241,7 +241,8 @@ function M.open_buffers_picker(opts)
         highlighters = {
             Select.RegexHighlighter.new({
                 { "^%d+", "Number" },
-                { "%s.+$", "Directory" },
+                { "^%d+%s+(.*/)", "Directory", 1 },
+                { "([^/]+)$", "Function", 1 },
             }),
         },
         display = function(entry)
diff --git a/lua/fuzzy/pickers/changes.lua b/lua/fuzzy/pickers/changes.lua
@@ -71,6 +71,11 @@ function M.open_changes_picker(opts)
         preview = opts.preview,
         actions = util.build_default_actions(conv, opts),
         decorators = decorators,
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "%d+:%d+", "Number" },
+            }),
+        },
         display = function(entry)
             return util.format_location_entry(
                 nil, entry.lnum or 1, entry.col or 1
diff --git a/lua/fuzzy/pickers/colorscheme.lua b/lua/fuzzy/pickers/colorscheme.lua
@@ -74,6 +74,11 @@ function M.open_colorscheme_picker(opts)
         },
         preview = opts.preview,
         actions = actions,
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "^.+$", "Constant" },
+            }),
+        },
     }, opts, {
         match_timer = 5,
         match_step = 1000,
diff --git a/lua/fuzzy/pickers/command_history.lua b/lua/fuzzy/pickers/command_history.lua
@@ -36,6 +36,12 @@ function M.open_command_history(opts)
                 return false
             end)),
         },
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "^%S+", "Statement" },
+                { "%s(.+)$", "Comment", 1 },
+            }),
+        },
     }, opts, {
         match_timer = 5,
         match_step = 1000,
diff --git a/lua/fuzzy/pickers/commands.lua b/lua/fuzzy/pickers/commands.lua
@@ -72,6 +72,11 @@ function M.open_commands_picker(opts)
                 return false
             end)),
         },
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "^%S+", "Statement" },
+            }),
+        },
     }, opts, {
         match_timer = 5,
         match_step = 2000,
diff --git a/lua/fuzzy/pickers/files.lua b/lua/fuzzy/pickers/files.lua
@@ -122,6 +122,12 @@ function M.open_files_picker(opts)
         preview = opts.preview,
         actions = util.build_default_actions(conv, opts),
         decorators = decorators,
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "^.+/", "Directory" },
+                { "[^/]+$", "Identifier" },
+            }),
+        },
     }, opts, {
         match_timer = 30,
         match_step = 75000,
diff --git a/lua/fuzzy/pickers/git.lua b/lua/fuzzy/pickers/git.lua
@@ -100,6 +100,7 @@ local function build_git_picker(opts, config)
         decorators = config.decorators,
         display = config.display,
         actions = config.actions,
+        highlighters = config.highlighters,
         match_timer = 15,
         match_step = 25000,
         stream_step = 100000,
diff --git a/lua/fuzzy/pickers/grep.lua b/lua/fuzzy/pickers/grep.lua
@@ -198,6 +198,12 @@ function M.open_grep_picker(opts)
         preview = opts.preview,
         actions = util.build_default_actions(convert, opts),
         decorators = decorators,
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { ":%d+:%d+", "Number" },
+                { ":%d+:",    "Number" },
+            }),
+        },
     }, opts, {
         match_timer = 30,
         match_step = 75000,
diff --git a/lua/fuzzy/pickers/helptags.lua b/lua/fuzzy/pickers/helptags.lua
@@ -36,6 +36,11 @@ function M.open_helptags_picker(opts)
                 return false
             end)),
         },
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "^%S+", "Special" },
+            }),
+        },
     }, opts, {
         match_timer = 10,
         match_step = 5000,
diff --git a/lua/fuzzy/pickers/jumps.lua b/lua/fuzzy/pickers/jumps.lua
@@ -72,8 +72,9 @@ function M.open_jumps_picker(opts)
         decorators = decorators,
         highlighters = {
             Select.RegexHighlighter.new({
-                { "^%[[^%]]+%]", "Identifier" },
-                { "^%[[^%]]+%]%s(%S+)", "Directory", 1 },
+                { "^%[[^%]]+%]", "Number" },
+                { "^%[[^%]]+%]%s(.*/)", "Directory", 1 },
+                { "([^/]+)%s+%d+:%d+$", "Function", 1 },
                 { "%d+:%d+", "Number" },
             }),
         },
diff --git a/lua/fuzzy/pickers/keymaps.lua b/lua/fuzzy/pickers/keymaps.lua
@@ -76,10 +76,11 @@ function M.open_keymaps_picker(opts)
         },
         highlighters = {
             Select.RegexHighlighter.new({
-                { "^%[[bg]%]", "Identifier" },
-                { "^%[[bg]%]%s(%S+)", "Type", 1 },
-                { "%s(%S+)%s%-%>", "Statement", 1 },
+                { "^%[[bg]%]", "Number" },
+                { "^%[[bg]%]%s(%S+)", "Keyword", 1 },
+                { "%s(%S+)%s%-%>", "Function", 1 },
                 { "%-%>%s(%S+)", "String", 1 },
+                { "%-%>", "Operator" },
                 { "%s%-%s(.+)$", "Comment", 1 },
             }),
         },
diff --git a/lua/fuzzy/pickers/loclist.lua b/lua/fuzzy/pickers/loclist.lua
@@ -84,8 +84,9 @@ function M.open_loclist_picker(opts)
         decorators = decorators,
         highlighters = {
             Select.RegexHighlighter.new({
-                { "^%s*%[[^%]]+%]", "Identifier" },
-                { "^%s*%[[^%]]+%]%s(%S+)", "Directory", 1 },
+                { "^%s*%[[^%]]+%]", "Number" },
+                { "^%s*%[[^%]]+%]%s(.*/)", "Directory", 1 },
+                { "([^/]+)%s+%d+:%d+:", "Function", 1 },
                 { "%d+:%d+", "Number" },
                 { ":%s(.+)$", "Comment", 1 },
             }),
diff --git a/lua/fuzzy/pickers/loclist_stack.lua b/lua/fuzzy/pickers/loclist_stack.lua
@@ -44,6 +44,12 @@ function M.open_loclist_stack(opts)
             assert(entry and entry.text)
             return entry.text
         end,
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "%d+", "Number" },
+                { "%f[%a]list%f[%A]", "Keyword" },
+            }),
+        },
     }, opts, {
         match_timer = 5,
         match_step = 2000,
diff --git a/lua/fuzzy/pickers/manpages.lua b/lua/fuzzy/pickers/manpages.lua
@@ -12,24 +12,23 @@ local function parse_manpage_entry(line)
     if name and section then
         return string.format("%s(%s)", name, section)
     end
-    return tostring(line or ""):match("^%s*(%S+)")
+    return line and line:match("^%s*(%S+)") or false
 end
 
 --- Open Manpages picker.
 --- @param opts ManpagesPickerOptions|nil Picker options for this picker
 --- @return Picker
 function M.open_manpages_picker(opts)
-    local cmd = util.pick_first_command({ "apropos", "man" })
     opts = util.merge_picker_options({
-        command_args = { "-k", "." }
+        preview = false,
+        command_args = { "-k", "." },
     }, opts)
+    local cmd = util.pick_first_command({ "apropos", "man" })
 
     local picker = Picker.new(vim.tbl_extend("force", {
         content = assert(cmd),
         headers = util.build_picker_headers("Manpages", opts),
-        context = {
-            args = opts.command_args,
-        },
+        context = { args = opts.command_args },
         stream_map = parse_manpage_entry,
         preview = false,
         actions = {
@@ -38,6 +37,14 @@ function M.open_manpages_picker(opts)
                 return false
             end)),
         },
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "^[^(]+", "Function" },
+                { "%(([^)]+)%)", "Number", 1 },
+                { "%(", "Delimiter" },
+                { "%)", "Delimiter" },
+            }),
+        },
     }, opts))
 
     picker:open()
diff --git a/lua/fuzzy/pickers/marks.lua b/lua/fuzzy/pickers/marks.lua
@@ -99,8 +99,9 @@ function M.open_marks_picker(opts)
         decorators = decorators,
         highlighters = {
             Select.RegexHighlighter.new({
-                { "^%[[^%]]+%]", "Identifier" },
-                { "^%[[^%]]+%]%s(%S+)", "Directory", 1 },
+                { "^%[[^%]]+%]", "Number" },
+                { "^%[[^%]]+%]%s(.*/)", "Directory", 1 },
+                { "([^/]+)%s+%d+:%d+$", "Function", 1 },
                 { "%d+:%d+", "Number" },
             }),
         },
diff --git a/lua/fuzzy/pickers/oldfiles.lua b/lua/fuzzy/pickers/oldfiles.lua
@@ -83,6 +83,12 @@ function M.open_oldfiles_picker(opts)
         preview = opts.preview,
         actions = util.build_default_actions(conv, opts),
         decorators = decorators,
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "^.+/", "Directory" },
+                { "[^/]+$", "Identifier" },
+            }),
+        },
         display = function(entry)
             local filename = assert(entry.filename)
             return util.format_display_path(filename, opts)
diff --git a/lua/fuzzy/pickers/quickfix.lua b/lua/fuzzy/pickers/quickfix.lua
@@ -83,8 +83,9 @@ function M.open_quickfix_picker(opts)
         decorators = decorators,
         highlighters = {
             Select.RegexHighlighter.new({
-                { "^%s*%[[^%]]+%]", "Identifier" },
-                { "^%s*%[[^%]]+%]%s(%S+)", "Directory", 1 },
+                { "^%s*%[[^%]]+%]", "Number" },
+                { "^%s*%[[^%]]+%]%s(.*/)", "Directory", 1 },
+                { "([^/]+)%s+%d+:%d+:", "Function", 1 },
                 { "%d+:%d+", "Number" },
                 { ":%s(.+)$", "Comment", 1 },
             }),
diff --git a/lua/fuzzy/pickers/quickfix_stack.lua b/lua/fuzzy/pickers/quickfix_stack.lua
@@ -44,6 +44,12 @@ function M.open_quickfix_stack(opts)
             assert(entry and entry.text)
             return entry.text
         end,
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "%d+", "Number" },
+                { "%f[%a]list%f[%A]", "Keyword" },
+            }),
+        },
     }, opts, {
         match_timer = 5,
         match_step = 2000,
diff --git a/lua/fuzzy/pickers/registers.lua b/lua/fuzzy/pickers/registers.lua
@@ -107,7 +107,7 @@ function M.open_registers_picker(opts)
         },
         highlighters = {
             Select.RegexHighlighter.new({
-                { "^%[[^%]]+%]", "Identifier" },
+                { "^%[[^%]]+%]", "Constant" },
                 { "^%[[^%]]+%]%s(.+)$", "String", 1 },
             }),
         },
diff --git a/lua/fuzzy/pickers/search_history.lua b/lua/fuzzy/pickers/search_history.lua
@@ -36,6 +36,11 @@ function M.open_search_history(opts)
                 return false
             end)),
         },
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "^%S+", "String" },
+            }),
+        },
     }, opts, {
         match_timer = 5,
         match_step = 1000,
diff --git a/lua/fuzzy/pickers/spell_suggest.lua b/lua/fuzzy/pickers/spell_suggest.lua
@@ -121,6 +121,11 @@ function M.open_spell_suggest(opts)
                 end
             ),
         },
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "^%S+", "Keyword" },
+            }),
+        },
     }, opts, {
         match_timer = 5,
         match_step = 1000,
diff --git a/lua/fuzzy/pickers/tabs.lua b/lua/fuzzy/pickers/tabs.lua
@@ -54,7 +54,8 @@ function M.open_tabs_picker(opts)
         highlighters = {
             Select.RegexHighlighter.new({
                 { "^%[[%d]+%]", "Number" },
-                { "^%[[%d]+%]%s(.+)$", "Directory", 1 },
+                { "^%[[%d]+%]%s(.*/)", "Directory", 1 },
+                { "([^/]+)$", "Function", 1 },
             }),
         },
         display = function(entry)
diff --git a/lua/fuzzy/pickers/tags.lua b/lua/fuzzy/pickers/tags.lua
@@ -36,6 +36,11 @@ function M.open_tags_picker(opts)
                 return false
             end)),
         },
+        highlighters = {
+            Select.RegexHighlighter.new({
+                { "^%S+", "Special" },
+            }),
+        },
     }, opts, {
         match_timer = 10,
         match_step = 5000,
diff --git a/lua/fuzzy/pickers/vimdoc.lua b/lua/fuzzy/pickers/vimdoc.lua
@@ -205,9 +205,10 @@ function M.open_vimdoc_picker(opts)
         },
         highlighters = {
             Select.RegexHighlighter.new({
-                { "^%S+", "Identifier" },
+                { "^%S+", "Function" },
                 { "since:%d+", "Number" },
                 { "dep@%d+", "WarningMsg" },
+                { "%smethod", "Keyword" },
                 { "%s%S+$", "Type" },
             }),
         },
diff --git a/tests/manpages_spec.lua b/tests/manpages_spec.lua
diff --git a/tests/oldfiles_spec.lua b/tests/oldfiles_spec.lua
diff --git a/tests/stream_spec.lua b/tests/stream_spec.lua
