refactor(marks): use vim.fn.getmarklist

highlight local buf text with `Directory` to match output of `:marks`

Closes #2353

Author: ibhagwan

lua/fzf-lua/defaults.lua

@@ -1179,6 +1179,7 @@ M.defaults.profiles              = {
 }
 
 M.defaults.marks                 = {
+  sort        = false,
   fzf_opts    = { ["--no-multi"] = true },
   actions     = {
     ["enter"] = actions.goto_mark,

lua/fzf-lua/previewer/builtin.lua

@@ -1489,7 +1489,6 @@ function Previewer.marks:parse_entry(entry_str)
     return vim.api.nvim_buf_get_mark(buf, mark)
   end)
   if pos and pos[1] > 0 then
-    assert(pos[1] == tonumber(lnum) or self.win.src_winid == self.win.fzf_winid)
     bufnr = self.win.src_bufnr
     filepath = api.nvim_buf_get_name(bufnr)
   end

lua/fzf-lua/providers/nvim.lua

@@ -251,32 +251,37 @@ M.marks = function(opts)
   if not opts then return end
 
   local contents = function(cb)
-    local win = utils.CTX().winid
     local buf = utils.CTX().bufnr
-    win = vim.api.nvim_win_is_valid(win) and win or 0
-    buf = vim.api.nvim_win_is_valid(buf) and buf or 0
-    local marks = vim.api.nvim_win_call(win, function()
-      return vim.api.nvim_buf_call(buf, function() return vim.fn.execute("marks") end)
-    end)
-    marks = vim.split(marks, "\n")
     local entries = {}
-    local pattern = opts.marks and opts.marks or ""
-    for i = #marks, 3, -1 do
-      local mark, line, col, text = marks[i]:match("(.)%s+(%d+)%s+(%d+)%s+(.*)")
-      col = tostring(tonumber(col) + 1)
-      if path.is_absolute(text) then
-        text = path.HOME_to_tilde(text)
-      end
-      if not pattern or string.match(mark, pattern) then
-        table.insert(entries, string.format("%s  %s  %s %s",
-          utils.ansi_codes[opts.hls.buf_nr](string.format("%4s", mark)),
-          utils.ansi_codes[opts.hls.path_linenr](string.format("%4s", tostring(line))),
-          utils.ansi_codes[opts.hls.path_colnr](string.format("%3s", tostring(col))),
-          text))
+    local function add_mark(mark, line, col, text)
+      if opts.marks and string.match(mark, opts.marks) then return end
+      table.insert(entries, string.format("%s  %s  %s %s",
+        utils.ansi_codes[opts.hls.buf_nr](string.format("%4s", mark)),
+        utils.ansi_codes[opts.hls.path_linenr](string.format("%4s", tostring(line))),
+        utils.ansi_codes[opts.hls.path_colnr](string.format("%3s", tostring(col))),
+        text))
+    end
+
+    -- local buffer marks
+    for _, m in ipairs(vim.fn.getmarklist(buf)) do
+      local mark, lnum, col = m.mark:sub(2, 2), m.pos[2], m.pos[3]
+      local text = vim.api.nvim_buf_get_lines(buf, lnum - 1, lnum, false)[1]
+      add_mark(mark, lnum, col, utils.ansi_from_hl("Directory", text or "-invalid-"))
+    end
+
+    -- global marks
+    for _, m in ipairs(vim.fn.getmarklist()) do
+      local mark, lnum, col, file = m.mark:sub(2, 2), m.pos[2], m.pos[3], m.file
+      file = path.relative_to(file, uv.cwd())
+      if path.is_absolute(file) then
+        file = path.HOME_to_tilde(file)
       end
+      add_mark(mark, lnum, col, file or "-invalid-")
     end
 
-    table.sort(entries, function(a, b) return a < b end)
+    if opts.sort then
+      table.sort(entries, function(a, b) return a < b end)
+    end
     table.insert(entries, 1,
       string.format("%-5s %s  %s %s", "mark", "line", "col", "file/text"))
 

lua/fzf-lua/types.lua

@@ -618,6 +618,7 @@ _G.FzfLua = require("fzf-lua")
 ---@field load table
 
 ---@class fzf-lua.config.Marks: fzf-lua.config.Base
+---@field sort boolean sort mark list?
 ---@field marks string lua pattern to filter marks
 
 ---@class fzf-lua.config.Changes: fzf-lua.config.Jumps