feat(previewer): end_line, end_col

Author: phanen

lua/fzf-lua/previewer/builtin.lua

@@ -1319,18 +1319,17 @@ function Previewer.buffer_or_file:set_cursor_hl(entry)
       return
     end
 
-    self.orig_pos = { lnum, math.max(0, col - 1) }
+    self.orig_pos = { lnum, math.max(1, col) - 1 }
     api.nvim_win_set_cursor(win, cached_pos or self.orig_pos)
     self:maybe_set_cursorline(win, self.orig_pos)
-    -- fn.clearmatches() is slow for bigfile
-    if self.match_id then
-      pcall(fn.matchdelete, self.match_id)
-      self.match_id = nil
-    end
+
+    self.ns_previewer = self.ns_previewer or api.nvim_create_namespace("fzf-lua.preview.hl")
+    api.nvim_buf_clear_namespace(buf, self.ns_previewer, 0, -1)
+    local extmark
 
     -- If regex is available (grep/lgrep), match on current line
-    local regex_start, regex_end = 0, nil
     if regex and hls.search then
+      local regex_start, regex_end = 0, nil
       -- vim.regex is always magic, see `:help vim.regex`
       local ok, reg = pcall(vim.regex, regex)
       if ok then
@@ -1348,13 +1347,19 @@ function Previewer.buffer_or_file:set_cursor_hl(entry)
           regex, reg)
       end
       if regex_start > 0 then
-        self.match_id = fn.matchaddpos(hls.search, { { lnum, regex_start, regex_end } }, 11) ---@as integer
+        extmark = api.nvim_buf_set_extmark(buf, self.ns_previewer, lnum - 1, regex_start - 1, {
+          end_line = lnum - 1,
+          end_col = regex_start - 1 + regex_end,
+          hl_group = hls.search,
+        })
       end
     end
 
     -- Fallback to cursor hl, only if column exists
-    if regex_start <= 0 and hls.cursor and col > 0 then
-      self.match_id = fn.matchaddpos(hls.cursor, { { lnum, math.max(1, col) } }, 11) ---@as integer
+    if not extmark and hls.cursor and col > 0 then
+      local end_lnum, end_col = entry.end_line or lnum, entry.end_col or col + 1
+      api.nvim_buf_set_extmark(buf, self.ns_previewer, lnum - 1, math.max(1, col) - 1,
+        { end_line = end_lnum - 1, end_col = math.max(1, end_col) - 1, hl_group = hls.cursor })
     end
 
     utils.zz()

lua/fzf-lua/types.lua

@@ -8,8 +8,8 @@ local FzfLua = require("fzf-lua")
 ---@field stripped? string
 ---@field path? string
 ---@field bufnr? integer
----@field line? integer
----@field col? integer
+---@field line? integer 1-based
+---@field col? integer 1-based
 ---@field bufname? string
 ---@field terminal? boolean
 ---@field ctag? string
@@ -25,6 +25,8 @@ local FzfLua = require("fzf-lua")
 ---@field cached? fzf-lua.buffer_or_file.Bcache
 ---@field filetype? string
 ---@field content? string[]
+---@field end_line? integer 1-based
+---@field end_col? integer 1-based
 
 ---@class fzf-lua.keymap.Entry
 ---@field vmap string?