feat: function to re-open the most recent search

Replicates the "resume" functionality of telescope and Snacks.nvim.picker (see #159)

Author: justDeeevin

lua/fff/main.lua

@@ -39,6 +39,12 @@ function M.live_grep(opts)
   picker_ui.open(picker_opts)
 end
 
+--- Resume the last search.
+--- @param opts? table Optional configuration overrides.
+function M.resume(opts)
+  require('fff.picker_ui').open(opts, true)
+end
+
 --- Changes the directory indexed by the file picker to the git root and opens the file picker
 --- @deprecated Use `find_files` instead
 function M.find_in_git_root()

lua/fff/picker_ui.lua

@@ -185,16 +185,16 @@ local function build_window_configs(layout, config)
   -- List border: when prompt at bottom, list has top+sides (no bottom); when top, T-junctions at top
   local list_border = prompt_position == 'bottom'
       and { border_chars[1], border_chars[2], border_chars[3], border_chars[4], '', '', '', border_chars[8] }
-    or {
-      t_junctions[1],
-      border_chars[2],
-      t_junctions[2],
-      border_chars[4],
-      border_chars[5],
-      border_chars[6],
-      border_chars[7],
-      border_chars[8],
-    }
+      or {
+        t_junctions[1],
+        border_chars[2],
+        t_junctions[2],
+        border_chars[4],
+        border_chars[5],
+        border_chars[6],
+        border_chars[7],
+        border_chars[8],
+      }
 
   local list_cfg = {
     relative = 'editor',
@@ -222,7 +222,7 @@ local function build_window_configs(layout, config)
         border_chars[7],
         border_chars[8],
       }
-    or { border_chars[1], border_chars[2], border_chars[3], border_chars[4], '', '', '', border_chars[8] }
+      or { border_chars[1], border_chars[2], border_chars[3], border_chars[4], '', '', '', border_chars[8] }
 
   local input_cfg = {
     relative = 'editor',
@@ -473,18 +473,18 @@ M.state = {
   location = nil, -- Current location from search results
 
   -- History cycling state
-  history_offset = nil, -- Current offset in history (nil = not cycling, 0 = first query)
+  history_offset = nil,                  -- Current offset in history (nil = not cycling, 0 = first query)
   next_search_force_combo_boost = false, -- Force combo boost on next search (for history recall)
 
   -- Combo state
-  combo_visible = true, -- Whether to show combo indicator (hidden after significant navigation)
+  combo_visible = true,       -- Whether to show combo indicator (hidden after significant navigation)
   combo_initial_cursor = nil, -- Initial cursor position when combo was shown
 
   -- Pagination state
   pagination = {
-    page_index = 0, -- Current page index (0-based)
-    page_size = 20, -- Items per page (updated dynamically)
-    total_matched = 0, -- Total results from last search
+    page_index = 0,      -- Current page index (0-based)
+    page_size = 20,      -- Items per page (updated dynamically)
+    total_matched = 0,   -- Total results from last search
     prefetch_margin = 5, -- Trigger refetch when within N items of edge
     -- Grep file-based pagination: stores the file_offset for each visited page
     -- so we can go backwards. grep_file_offsets[1] = 0 (page 0 starts at file 0),
@@ -592,7 +592,6 @@ function M.create_ui()
   preview.set_preview_window(M.state.preview_win)
 
   M.update_results_sync()
-  M.clear_preview()
   M.update_status()
 
   return true
@@ -959,8 +958,8 @@ function M.cycle_grep_modes()
   -- Use grep_config.modes if provided, otherwise fall back to global config
   ---@diagnostic disable-next-line: undefined-field
   local modes = (M.state.grep_config and M.state.grep_config.modes)
-    or config.grep.modes
-    or { 'plain', 'regex', 'fuzzy' }
+      or config.grep.modes
+      or { 'plain', 'regex', 'fuzzy' }
 
   -- If only one mode configured, no cycling needed
   if #modes <= 1 then return end
@@ -1032,7 +1031,7 @@ function M.update_results_sync()
     if current_buf and vim.api.nvim_buf_is_valid(current_buf) then
       local current_file = vim.api.nvim_buf_get_name(current_buf)
       M.state.current_file_cache = (current_file ~= '' and vim.fn.filereadable(current_file) == 1) and current_file
-        or nil
+          or nil
     end
   end
   local page_size
@@ -1458,7 +1457,7 @@ local function render_grep_empty_state(ctx)
   for i = 0, #content - 1 do
     local line = content[i + 1]
     if
-      line and (line:match('^%s+Start typing') or line:match('^%s+Tips') or line:match('^%s+"') or line:match('^%s+!'))
+        line and (line:match('^%s+Start typing') or line:match('^%s+Tips') or line:match('^%s+"') or line:match('^%s+!'))
     then
       pcall(
         vim.api.nvim_buf_set_extmark,
@@ -1561,11 +1560,11 @@ local function build_render_context()
     iter_end = iter_end,
     iter_step = iter_step,
     renderer = M.state.suggestion_source and M.get_suggestion_renderer() or M.state.renderer,
-    query = M.state.query, -- Current search query (used by grep renderer for empty-state detection)
-    selected_files = M.state.selected_files, -- Selected files set (used by file renderer for selection markers)
-    selected_items = M.state.selected_items, -- Selected items map (used by grep renderer for per-occurrence markers)
-    mode = M.state.mode, -- Current mode (nil or 'grep')
-    format_file_display = format_file_display, -- Helper for renderers to format filename + dir path
+    query = M.state.query,                         -- Current search query (used by grep renderer for empty-state detection)
+    selected_files = M.state.selected_files,       -- Selected files set (used by file renderer for selection markers)
+    selected_items = M.state.selected_items,       -- Selected items map (used by grep renderer for per-occurrence markers)
+    mode = M.state.mode,                           -- Current mode (nil or 'grep')
+    format_file_display = format_file_display,     -- Helper for renderers to format filename + dir path
     suggestion_source = M.state.suggestion_source, -- Cross-mode suggestion source ('grep' or 'files')
   }
 end
@@ -1824,8 +1823,8 @@ function M.update_status(progress)
     -- Use grep_config.modes if provided, otherwise fall back to global config
     ---@diagnostic disable-next-line: undefined-field
     local modes = (M.state.grep_config and M.state.grep_config.modes)
-      or config.grep.modes
-      or { 'plain', 'regex', 'fuzzy' }
+        or config.grep.modes
+        or { 'plain', 'regex', 'fuzzy' }
 
     -- When regex compilation failed and we fell back to literal search, show a warning
     local fallback_label = nil
@@ -1882,7 +1881,7 @@ function M.update_status(progress)
       vim.api.nvim_buf_set_extmark(M.state.input_buf, M.state.ns_id, 0, 0, {
         virt_text = {
           { keybind .. ' ', hl },
-          { mode_label, hl },
+          { mode_label,     hl },
         },
         virt_text_win_col = col_position,
       })
@@ -2139,10 +2138,10 @@ local function find_suitable_window()
         )
 
         if
-          (buftype == '' or buftype == 'acwrite')
-          and modifiable
-          and not is_picker_window
-          and filetype ~= 'undotree'
+            (buftype == '' or buftype == 'acwrite')
+            and modifiable
+            and not is_picker_window
+            and filetype ~= 'undotree'
         then
           return win
         end
@@ -2313,9 +2312,9 @@ function M.select(action)
   if vim.startswith(path, '\\\\?\\') then path = path:sub(5) end
 
   local relative_path = vim.fn.fnamemodify(path, ':.')
-  local location = M.state.location -- Capture location before closing
-  local query = M.state.query -- Capture query before closing for tracking
-  local mode = M.state.mode -- Capture mode before closing for tracking
+  local location = M.state.location                   -- Capture location before closing
+  local query = M.state.query                         -- Capture query before closing for tracking
+  local mode = M.state.mode                           -- Capture mode before closing for tracking
   local suggestion_source = M.state.suggestion_source -- Capture suggestion context
 
   -- In grep mode (or when selecting a grep suggestion), derive location from the match item
@@ -2463,6 +2462,12 @@ function M.close()
     end
   end
 
+  -- Clean up picker focus autocmds
+  pcall(vim.api.nvim_del_augroup_by_name, 'fff_picker_focus')
+end
+
+--- Reset picker state
+function M.reset_state()
   if M.state.preview_timer then
     M.state.preview_timer:stop()
     M.state.preview_timer:close()
@@ -2498,8 +2503,6 @@ function M.close()
   M.state.combo_visible = true
   M.state.combo_initial_cursor = nil
   M.reset_history_state()
-  -- Clean up picker focus autocmds
-  pcall(vim.api.nvim_del_augroup_by_name, 'fff_picker_focus')
 end
 
 --- Helper function to determine current file cache for deprioritization
@@ -2555,7 +2558,9 @@ end
 --- @param location table|nil Pre-fetched location data
 --- @param merged_config table Merged configuration
 --- @param current_file_cache string|nil Current file cache
-local function open_ui_with_state(query, results, location, merged_config, current_file_cache)
+--- @param resume? boolean Resume previous search
+local function open_ui_with_state(query, results, location, merged_config, current_file_cache, resume)
+  if not resume then M.reset_state() end
   M.state.config = merged_config
 
   if not M.create_ui() then
@@ -2569,10 +2574,9 @@ local function open_ui_with_state(query, results, location, merged_config, curre
   -- Set up initial state
   if query then
     M.state.query = query
-    vim.api.nvim_buf_set_lines(M.state.input_buf, 0, -1, false, { M.state.config.prompt .. query })
-  else
-    M.state.query = ''
+    resume = false
   end
+  vim.api.nvim_buf_set_lines(M.state.input_buf, 0, -1, false, { M.state.config.prompt .. M.state.query })
 
   if results then
     -- Use prefetched results
@@ -2584,7 +2588,7 @@ local function open_ui_with_state(query, results, location, merged_config, curre
     M.render_list()
     M.update_preview()
     M.update_status()
-  else
+  elseif not resume then
     M.update_results()
     M.clear_preview()
     M.update_status()
@@ -2612,8 +2616,9 @@ end
 --- @param query string The search query to execute
 --- @param callback function Function called with results: function(results, metadata, location, get_file_score) -> boolean
 --- @param opts? table Optional configuration to override defaults (same as M.open)
+--- @param resume? boolean Resume previous search
 --- @return boolean true if callback handled results, false if UI was opened
-function M.open_with_callback(query, callback, opts)
+function M.open_with_callback(query, callback, opts, resume)
   if M.state.active then return false end
 
   local merged_config, base_path = initialize_picker(opts)
@@ -2636,14 +2641,15 @@ function M.open_with_callback(query, callback, opts)
   end
 
   if callback_handled then return true end
-  open_ui_with_state(query, results, location, merged_config, current_file_cache)
+  open_ui_with_state(query, results, location, merged_config, current_file_cache, resume)
 
   return false
 end
 
 --- Open the file picker UI
 --- @param opts? {cwd?: string, title?: string, prompt?: string, max_results?: number, max_threads?: number, layout?: {width?: number|function, height?: number|function, prompt_position?: string|function, preview_position?: string|function, preview_size?: number|function}, renderer?: table, mode?: string, grep_config?: table, query?: string} Optional configuration to override defaults
-function M.open(opts)
+--- @param resume? boolean Resume previous search
+function M.open(opts, resume)
   if M.state.active then return end
 
   M.state.selected_files = {}
@@ -2662,14 +2668,14 @@ function M.open(opts)
     -- Use grep_config.modes if provided, otherwise fall back to global config
     ---@diagnostic disable-next-line: undefined-field
     local modes = (M.state.grep_config and M.state.grep_config.modes)
-      or merged_config.grep.modes
-      or { 'plain', 'regex', 'fuzzy' }
+        or merged_config.grep.modes
+        or { 'plain', 'regex', 'fuzzy' }
     M.state.grep_mode = modes[1] or 'plain'
   end
 
   local current_file_cache = get_current_file_cache(base_path)
   local query = opts and opts.query or nil ---@type string|nil
-  return open_ui_with_state(query, nil, nil, merged_config, current_file_cache)
+  return open_ui_with_state(query, nil, nil, merged_config, current_file_cache, resume)
 end
 
 --- Change the base directory for the file picker