feat: history picker alias to oldfiles with buffers

closes #2509

Author: ibhagwan

OPTIONS.md

@@ -808,6 +808,10 @@ Open buffers in tabs
 
 File history (output of `:oldfiles`)
 
+#### history
+
+Combined current buffer + file history (output of `:oldfiles`)
+
 #### quickfix
 
 Quickfix list (output of `:copen`)

README.md

@@ -201,6 +201,7 @@ Fzf-Lua conveniently comes with a VS-Code like picker by default
 | `buffers`        | open buffers                      |
 | `files`          | `find` or `fd` on a path          |
 | `oldfiles`       | opened files history              |
+| `history`        | opened buffers/files history      |
 | `quickfix`       | quickfix list                     |
 | `quickfix_stack` | quickfix stack                    |
 | `loclist`        | location list                     |
@@ -1067,6 +1068,7 @@ previewers = {
     -- stat_file = FzfLua.utils.file_is_readable,
     -- stat_file = function() return true end,
     include_current_session = false,  -- include bufs from current session
+    ignore_current_buffer   = true,   -- exclude current buf from session
   },
   buffers = {
     prompt            = 'Buffers❯ ',

doc/fzf-lua-opts.txt

@@ -1085,6 +1085,12 @@ File history (output of `:oldfiles`)
 
 
 
+history                                                 *fzf-lua-opts-history*
+
+Combined current buffer + file history (output of `:oldfiles`)
+
+
+                                                                              
 quickfix                                               *fzf-lua-opts-quickfix*
 
 Quickfix list (output of `:copen`)

lua/fzf-lua/defaults.lua

@@ -820,18 +820,28 @@ M.defaults.args                  = {
 ---@class fzf-lua.config.Oldfiles: fzf-lua.config.Base
 ---@field stat_file? boolean
 ---@field include_current_session? boolean
+---@field ignore_current_buffer? boolean
 M.defaults.oldfiles              = {
-  previewer         = M._default_previewer_fn,
-  file_icons        = 1, ---@type integer|boolean
-  color_icons       = true,
-  git_icons         = false,
-  stat_file         = true,
-  fzf_opts          = { ["--tiebreak"] = "index", ["--multi"] = true },
-  _fzf_nth_devicons = true,
-  _actions          = function() return M.globals.actions.files end,
-  _headers          = { "cwd" },
+  previewer               = M._default_previewer_fn,
+  file_icons              = 1, ---@type integer|boolean
+  color_icons             = true,
+  git_icons               = false,
+  stat_file               = true,
+  include_current_session = false,
+  ignore_current_buffer   = true,
+  fzf_opts                = { ["--tiebreak"] = "index", ["--multi"] = true },
+  _fzf_nth_devicons       = true,
+  _actions                = function() return M.globals.actions.files end,
+  _headers                = { "cwd" },
+  _resume_reload          = true,
 }
 
+---@class fzf-lua.config.History: fzf-lua.config.Oldfiles
+M.defaults.history               = vim.tbl_deep_extend("force", {}, M.defaults.oldfiles, {
+  include_current_session = true,
+  ignore_current_buffer   = false,
+})
+
 ---@class fzf-lua.config.Quickfix: fzf-lua.config.Base
 ---@field separator string
 ---@field valid_only boolean
@@ -1553,7 +1563,7 @@ M.defaults.command_history       = {
   actions     = {
     ["enter"]  = actions.ex_run_cr,
     ["ctrl-e"] = actions.ex_run,
-    ["ctrl-x"]  = { fn = actions.ex_del, field_index = "{+n}", reload = true }
+    ["ctrl-x"] = { fn = actions.ex_del, field_index = "{+n}", reload = true }
   },
   _headers    = { "actions" },
 }
@@ -1568,7 +1578,7 @@ M.defaults.search_history        = {
   actions     = {
     ["enter"]  = actions.search_cr,
     ["ctrl-e"] = actions.search,
-    ["ctrl-x"]  = { fn = actions.search_del, field_index = "{+n}", reload = true }
+    ["ctrl-x"] = { fn = actions.search_del, field_index = "{+n}", reload = true }
   },
   _headers    = { "actions" },
 }

lua/fzf-lua/init.lua

@@ -285,6 +285,7 @@ local lazyloaded_modules = {
   git_worktrees = { "fzf-lua.providers.git", "worktrees" },
   git_tags = { "fzf-lua.providers.git", "tags" },
   oldfiles = { "fzf-lua.providers.oldfiles", "oldfiles" },
+  history = { "fzf-lua.providers.oldfiles", "history" },
   undotree = { "fzf-lua.providers.undotree", "undotree" },
   quickfix = { "fzf-lua.providers.quickfix", "quickfix" },
   quickfix_stack = { "fzf-lua.providers.quickfix", "quickfix_stack" },

lua/fzf-lua/profiles/default-prompt.lua

@@ -26,6 +26,7 @@ return {
   },
   args                 = prompt("Args"),
   oldfiles             = prompt("Oldfiles"),
+  history              = prompt("History"),
   undotree             = prompt("Undotree"),
   quickfix             = prompt("Quickfix"),
   quickfix_stack       = prompt("Quickfix Stack"),

lua/fzf-lua/profiles/default-title.lua

@@ -30,6 +30,7 @@ return {
   },
   args                 = title("Args"),
   oldfiles             = title("Oldfiles"),
+  history              = title("History"),
   undotree             = title("Undotree"),
   quickfix             = title("Quickfix List"),
   quickfix_stack       = title("Quickfix List Stack"),

lua/fzf-lua/profiles/fzf-vim.lua

@@ -25,7 +25,7 @@ local function setup_commands(no_override, prefix)
     ["Marks"] = utils.create_user_command_callback("marks"),
     ["Jumps"] = utils.create_user_command_callback("jumps"),
     ["Commands"] = utils.create_user_command_callback("commands"),
-    ["History"] = utils.create_user_command_callback("oldfiles", "query", {
+    ["History"] = utils.create_user_command_callback("history", "query", {
       [":"] = "command_history",
       ["/"] = "search_history",
     }),

lua/fzf-lua/profiles/hide.lua

@@ -94,12 +94,14 @@ return {
       end
       -- Hijack the resize event to reload buffer/tab list on unhide
       FzfLua.win.on_SIGWINCH(opts, "win.unhide", function()
-        if type(opts._contents) == "string"
+        local reload = type(opts._contents) == "string"
             and (opts._resume_reload == true
               ---@diagnostic disable-next-line: need-check-nil
               or type(opts._resume_reload) == "function" and opts._resume_reload(opts))
-        then
-          return string.format("reload:%s", opts._contents)
+        if reload then
+          return string.format("%sreload:%s",
+            type(reload) == "string" and reload .. "+" or "",
+            opts._contents)
         end
       end)
       return opts

lua/fzf-lua/providers/oldfiles.lua

@@ -8,22 +8,18 @@ local make_entry = require "fzf-lua.make_entry"
 local M = {}
 
 ---@param opts fzf-lua.config.Oldfiles|{}?
+---@param globals string|(fzf-lua.Config|{})?
 ---@return thread?, string?, table?
-M.oldfiles = function(opts)
+M.oldfiles = function(opts, globals)
   ---@type fzf-lua.config.Oldfiles
-  opts = config.normalize_opts(opts, "oldfiles")
+  opts = config.normalize_opts(opts, globals or "oldfiles")
   if not opts then return end
 
   -- cwd implies we want `cwd_only=true`
   if opts.cwd and opts.cwd_only == nil then
     opts.cwd_only = true
   end
 
-  local current_buffer = vim.api.nvim_get_current_buf()
-  local current_file = vim.api.nvim_buf_get_name(current_buffer)
-  local sess_tbl = {}
-  local sess_map = {}
-
   local stat_fn = not opts.stat_file and function(_) return true end
       or type(opts.stat_file) == "function" and opts.stat_file
       or function(file)
@@ -34,47 +30,79 @@ M.oldfiles = function(opts)
           and utils.file_is_readable(file))
       end
 
-  if opts.include_current_session then
-    for _, buffer in ipairs(vim.split(vim.fn.execute(":buffers! t"), "\n")) do
-      local bufnr = utils.tointeger(buffer:match("%s*(%d+)"))
-      if bufnr then
+  local sorted_named_buffers = function()
+    local bufnrs = {}
+    for i, buffer in ipairs(vim.split(vim.fn.execute(":buffers! t"), "\n")) do
+      if i > 1 then -- line[1] == "\n"
+        local bufnr = assert(utils.tointeger(buffer:match("%s*(%d+)")))
         local file = vim.api.nvim_buf_get_name(bufnr)
-        local fs_stat = stat_fn(file)
-        if #file > 0 and fs_stat and bufnr ~= current_buffer then
-          sess_map[file] = true
-          table.insert(sess_tbl, file)
+        local fs_stat = #file > 0 and stat_fn(file)
+        if fs_stat then
+          table.insert(bufnrs, { bufnr = bufnr, file = file, curbuf = bufnr == utils.CTX().bufnr })
         end
       end
     end
+    return bufnrs
   end
 
-  local contents = function(cb)
-    local function add_entry(x, co)
-      x = make_entry.file(x, opts)
-      if not x then return end
-      cb(x, function(err)
-        coroutine.resume(co)
-        if err then
-          -- close the pipe to fzf, this
-          -- removes the loading indicator in fzf
-          cb(nil)
-        end
-      end)
-      coroutine.yield()
+  -- current buffer as a header line
+  -- since we exclude unnamed/terminal/non-existent files
+  -- only set header line if first entry matches current buffer
+  local header_line = function()
+    if opts.include_current_session and not opts.ignore_current_buffer then
+      local buflist = sorted_named_buffers()
+      if buflist[1] and buflist[1].bufnr == utils.CTX().bufnr then
+        return true
+      end
     end
+  end
+
+  if header_line() then utils.map_set(opts, "fzf_opts.--header-lines", 1) end
+
+  -- NOTE: fzf does not yet support "change-header-lines" transform
+  -- https://github.com/junegunn/fzf/issues/4659
+  -- opts._resume_reload = function()
+  --   return string.format("change-header-lines(%d)", header_line() and 1 or 0)
+  -- end
 
+  local contents = function(cb)
     -- run in a coroutine for async progress indication
     coroutine.wrap(function()
       local co = coroutine.running()
 
-      for _, file in ipairs(sess_tbl) do
-        add_entry(file, co)
+      local curr_buf = utils.CTX().bufnr
+      local curr_file = vim.api.nvim_buf_get_name(curr_buf)
+      local sess_map = {} -- dedup files from current buffers
+
+      local function add_entry(x, co, force)
+        x = make_entry.file(x,
+          force and vim.tbl_deep_extend("force", {}, opts, { cwd_only = false }) or opts)
+        if not x then return end
+        cb(x, function(err)
+          coroutine.resume(co)
+          if err then
+            -- close the pipe to fzf, this
+            -- removes the loading indicator in fzf
+            cb(nil)
+          end
+        end)
+        coroutine.yield()
+      end
+
+      if opts.include_current_session then
+        for _, buf in ipairs(sorted_named_buffers()) do
+          if not opts.ignore_current_buffer or buf.bufnr ~= curr_buf then
+            sess_map[buf.file] = true
+            -- 3rd arg forces addition of current buffer with cwd_only
+            add_entry(buf.file, co, buf.curbuf)
+          end
+        end
       end
 
       -- local start = os.time(); for _ = 1,10000,1 do
       for _, file in ipairs(vim.v.oldfiles) do
         local fs_stat = stat_fn(file)
-        if fs_stat and file ~= current_file and not sess_map[file] then
+        if fs_stat and file ~= curr_file and not sess_map[file] then
           add_entry(file, co)
         end
       end
@@ -90,4 +118,10 @@ M.oldfiles = function(opts)
   return core.fzf_exec(contents, opts)
 end
 
+---@param opts fzf-lua.config.History|{}?
+---@return thread?, string?, table?
+M.history = function(opts)
+  return M.oldfiles(opts, "history")
+end
+
 return M