WIP

Author: ibhagwan

OPTIONS.md

@@ -382,7 +382,7 @@ Scrollbar style in the builtin previewer, set to `false` to disable, possible va
 
 #### globals.winopts.preview.scrolloff
 
-Type: `number`, Default: `-2`
+Type: `number`, Default: `-1`
 
 Float style scrollbar offset from the right edge of the preview window.
 

README.md

@@ -2,7 +2,7 @@
 
 # fzf :heart: lua
 
-![Neovim version](https://img.shields.io/badge/Neovim-0.5-57A143?style=flat-square&logo=neovim)
+![Neovim version](https://img.shields.io/badge/Neovim-0.7-57A143?style=flat-square&logo=neovim)
 
 [Quickstart](#quickstart) • [Installation](#installation) • [Usage](#usage) • [Commands](#commands) • [Customization](#customization) • [Wiki](https://github.com/ibhagwan/fzf-lua/wiki)
 
@@ -55,7 +55,7 @@ Using [lazy.nvim](https://github.com/folke/lazy.nvim)
 
 ### Dependencies
 
-- [`neovim`](https://github.com/neovim/neovim/releases) version > `0.5.0`
+- [`neovim`](https://github.com/neovim/neovim/releases) version > `0.7.0`
 - [`fzf`](https://github.com/junegunn/fzf) version > `0.25`
   or [`skim`](https://github.com/skim-rs/skim) binary installed
 - [nvim-web-devicons](https://github.com/nvim-tree/nvim-web-devicons)
@@ -439,7 +439,7 @@ winopts = {
       scrollbar      = 'float',         -- `false` or string:'float|border'
                                         -- float:  in-window floating border
                                         -- border: in-border "block" marker
-      scrolloff      = '-2',            -- float scrollbar offset from right
+      scrolloff      = -1,              -- float scrollbar offset from right
                                         -- applies only when scrollbar = 'float'
       delay          = 20,              -- delay(ms) displaying the preview
                                         -- prevents lag on fast scrolling

doc/fzf-lua-opts.txt

@@ -1,4 +1,4 @@
-*fzf-lua-opts.txt*      For Neovim >= 0.8.0      Last change: 2024 December 18
+*fzf-lua-opts.txt*      For Neovim >= 0.8.0      Last change: 2024 December 27
 
 ==============================================================================
 Table of Contents                             *fzf-lua-opts-table-of-contents*
@@ -504,7 +504,7 @@ values are `float|border`.
 
 globals.winopts.preview.scrolloff*fzf-lua-opts-globals.winopts.preview.scrolloff*
 
-Type: `number`, Default: `-2`
+Type: `number`, Default: `-1`
 
 Float style scrollbar offset from the right edge of the preview window.
 

lua/fzf-lua/core.lua

@@ -464,12 +464,35 @@ M.fzf = function(contents, opts)
   return selected
 end
 
+-- Best approximation of neovim border types to fzf border types
+local function translate_border(border)
+  local neovim2fzf = {
+    none       = "noborder",
+    single     = "border-sharp",
+    double     = "border-double",
+    rounded    = "border-rounded",
+    solid      = "noborder",
+    empty      = "border-block",
+    shadow     = "border-thinblock",
+    bold       = "border-bold",
+    block      = "border-block",
+    solidblock = "border-block",
+    thicc      = "border-bold",
+    thiccc     = "border-block",
+    thicccc    = "border-block",
+  }
+  border = type(border) == "string" and (neovim2fzf[border] or border) or "rounded"
+  return border
+end
+
 ---@param o table
 ---@return string
 M.preview_window = function(o, fzf_win)
   local layout
   local prefix = string.format("%s:%s:%s",
-    o.winopts.preview.hidden, o.winopts.preview.border, o.winopts.preview.wrap)
+    o.winopts.preview.hidden,
+    translate_border(o.winopts.preview.border),
+    o.winopts.preview.wrap)
   if utils.has(o, "fzf", { 0, 31 })
       and o.winopts.preview.layout == "flex"
       and tonumber(o.winopts.preview.flip_columns) > 0

lua/fzf-lua/defaults.lua

@@ -65,7 +65,7 @@ M.defaults                      = {
       title        = true,
       title_pos    = "center",
       scrollbar    = "border",
-      scrolloff    = "-2",
+      scrolloff    = -1,
       -- default preview delay, fzf native previewers has a 100ms delay:
       -- https://github.com/junegunn/fzf/issues/2417#issuecomment-809886535
       delay        = 20,
@@ -1255,27 +1255,4 @@ M.defaults.__HLS                = {
   }
 }
 
-M.defaults.__WINOPTS            = {
-  borderchars   = {
-    ["none"]    = { "", "", "", "", "", "", "", "" },
-    ["empty"]   = { " ", " ", " ", " ", " ", " ", " ", " " },
-    ["single"]  = { "┌", "─", "┐", "│", "┘", "─", "└", "│" },
-    ["double"]  = { "╔", "═", "╗", "║", "╝", "═", "╚", "║" },
-    ["rounded"] = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" },
-    ["thicc"]   = { "┏", "━", "┓", "┃", "┛", "━", "┗", "┃" },
-    ["thiccc"]  = { "▛", "▀", "▜", "▐", "▟", "▄", "▙", "▌" },
-    ["thicccc"] = { "█", "█", "█", "█", "█", "█", "█", "█" },
-  },
-  -- border chars reverse lookup for ambiwidth="double"
-  border2string = {
-    [" "] = "empty",
-    ["┌"] = "single",
-    ["╔"] = "double",
-    ["╭"] = "rounded",
-    ["┏"] = "double",
-    ["▛"] = "double",
-    ["█"] = "double",
-  },
-}
-
 return M

lua/fzf-lua/devicons.lua

@@ -47,7 +47,7 @@ end
 function NvimWebDevicons:load(do_not_lazy_load)
   -- limit devicons support to nvim >=0.8, although official support is >=0.7
   -- running setup on 0.7 errs with "W18: Invalid character in group name"
-  if not self._package_loaded and utils.__HAS_NVIM_07
+  if not self._package_loaded
       -- do not trigger lazy loading
       and (not do_not_lazy_load or package.loaded[self._package_name])
   then

lua/fzf-lua/fzf.lua

@@ -221,26 +221,24 @@ function M.raw_fzf(contents, fzf_cli_args, opts)
     -- sending `feedkeys|startinsert` after the term job is started, this approach
     -- seems more consistent as it triggers when entering terminal normal mode "nt"
     -- NOTE: "ModeChanged" was added with neovim 0.7
-    if utils.__HAS_NVIM_07 then
-      vim.api.nvim_create_autocmd("ModeChanged", {
-        once = true,
-        buffer = 0,
-        callback = function(e)
-          if e.match:match(":nt") then
-            vim.defer_fn(function()
-              -- Prevents inserting "i" when spamming `ctrl-g` in `grep_lgrep`
-              -- Also verify we're not already in TERMINAL mode, could happen
-              -- if the user has an autocmd for TermOpen with `startinsert`
-              if vim.api.nvim_buf_is_valid(e.buf)
-                  and vim.api.nvim_get_mode().mode ~= "t"
-              then
-                vim.cmd("startinsert")
-              end
-            end, 0)
-          end
+    vim.api.nvim_create_autocmd("ModeChanged", {
+      once = true,
+      buffer = 0,
+      callback = function(e)
+        if e.match:match(":nt") then
+          vim.defer_fn(function()
+            -- Prevents inserting "i" when spamming `ctrl-g` in `grep_lgrep`
+            -- Also verify we're not already in TERMINAL mode, could happen
+            -- if the user has an autocmd for TermOpen with `startinsert`
+            if vim.api.nvim_buf_is_valid(e.buf)
+                and vim.api.nvim_get_mode().mode ~= "t"
+            then
+              vim.cmd("startinsert")
+            end
+          end, 0)
         end
-      })
-    end
+      end
+    })
   end
 
   if opts.debug then
@@ -318,22 +316,6 @@ function M.raw_fzf(contents, fzf_cli_args, opts)
   -- fzf-tmux spawns outside neovim, don't set filetype/insert mode
   if not opts.is_fzf_tmux then
     vim.bo.filetype = "fzf"
-
-    -- https://github.com/neovim/neovim/pull/15878
-    -- Since patch-8.2.3461 which was released with 0.6 neovim distinguishes between
-    -- Normal mode and Terminal-Normal mode. However, this seems to have also introduced
-    -- a bug with `startinsert`: When fzf-lua reuses interfaces (e.g. called from "builtin"
-    -- or grep<->live_grep toggle) the current mode will be "t" which is Terminal (INSERT)
-    -- mode but our interface is still opened in NORMAL mode, either `startinsert` is not
-    -- working (as it's technically already in INSERT) or creating a new terminal buffer
-    -- within the same window starts in NORMAL mode while returning the wrong `nvim_get_mode`
-    if not utils.__HAS_NVIM_07 then
-      if utils.__HAS_NVIM_06 and vim.api.nvim_get_mode().mode == "t" then
-        utils.feed_keys_termcodes("i")
-      else
-        vim.cmd [[startinsert]]
-      end
-    end
   end
 
   if not utils.__IS_WINDOWS

lua/fzf-lua/init.lua

@@ -127,26 +127,12 @@ function M.setup_highlights(override)
         hl_def.default = false
       end
     end
-    if utils.__HAS_NVIM_07 then
-      vim.api.nvim_set_hl(0, hl_name, hl_def)
-    else
-      if hl_def.link then
-        vim.cmd(string.format("hi! %s link %s %s",
-          hl_def.default and "default" or "",
-          hl_name, hl_def.link))
-      else
-        vim.cmd(string.format("hi! %s %s %s%s%s",
-          hl_def.default and "default" or "", hl_name,
-          hl_def.fg and string.format(" guifg=%s", hl_def.fg) or "",
-          hl_def.bg and string.format(" guibg=%s", hl_def.bg) or "",
-          hl_def.bold and " gui=bold" or ""))
-      end
-    end
+    vim.api.nvim_set_hl(0, hl_name, hl_def)
   end
 
   -- linking to a cleared hl is bugged in neovim 0.8.x
   -- resulting in a pink background for hls linked to `Normal`
-  if vim.fn.has("nvim-0.9") == 0 and vim.fn.has("nvim-0.8") == 1 then
+  if not utils.__HAS_NVIM_09 and utils.__HAS_NVIM_08 then
     for _, a in ipairs(highlights) do
       local hl_name, opt_name = a[1], a[2]
       if utils.is_hl_cleared(hl_name) then

lua/fzf-lua/previewer/builtin.lua

@@ -99,12 +99,18 @@ function TSContext.update(winid, bufnr, opts)
         TSContext._winids[tostring(winid)] = bufnr
       end
     end
-    if TSContext.is_attached(winid) == bufnr then
+    -- NOTE: when previewer win has border, calling `open` on the same win/buf combo
+    -- while using `winopts.previewer.border=none` or "noboder" works correctly, most
+    -- likely an upstream issue and we've seen no cooperation from upstream  so defer
+    -- to the same "hack"
+    -- local open_once = false
+    local open_once = TSContext.is_attached(winid) == bufnr
+    if open_once then
       open()
     else
       -- HACK: but the entire nvim-treesitter-context is essentially a hack
       -- https://github.com/ibhagwan/fzf-lua/issues/1552#issuecomment-2525456813
-      for _, t in ipairs({ 0, 20 }) do
+      for _, t in ipairs({ 0, 20, 50 }) do
         vim.defer_fn(function() open() end, t)
       end
     end
@@ -322,8 +328,7 @@ function Previewer.base:clear_preview_buf(newbuf)
     retbuf = self:get_tmp_buffer()
     utils.win_set_buf_noautocmd(self.win.preview_winid, retbuf)
     -- redraw the title line and clear the scrollbar
-    self.win:redraw_preview_border()
-    self.win:update_scrollbar(true)
+    self.win:update_preview_scrollbar(true)
   end
   -- since our temp buffers have 'bufhidden=wipe' the tmp
   -- buffer will be automatically wiped and 'nvim_buf_is_valid'
@@ -372,10 +377,6 @@ function Previewer.base:display_entry(entry_str)
   local populate_preview_buf = function(entry_str_)
     if not self.win or not self.win:validate_preview() then return end
 
-    -- redraw the preview border, resets title
-    -- border scrollbar and border highlights
-    self.win:redraw_preview_border()
-
     -- specialized previewer populate function
     self:populate_preview_buf(entry_str_)
 
@@ -519,7 +520,7 @@ function Previewer.base:scroll(direction)
   end
   self:update_ts_context()
   self:update_render_markdown()
-  self.win:update_scrollbar()
+  self.win:update_preview_scrollbar()
 end
 
 function Previewer.base:ts_ctx_toggle()
@@ -1078,31 +1079,29 @@ function Previewer.buffer_or_file:set_cursor_hl(entry)
   end)
 end
 
-function Previewer.buffer_or_file:update_border(entry)
-  if self.title then
-    local filepath = entry.path
-    if filepath then
-      if filepath:match("^%[DEBUG]") then
-        filepath = "[DEBUG]"
-      else
-        if self.opts.cwd then
-          filepath = path.relative_to(entry.path, self.opts.cwd)
-        end
-        filepath = path.HOME_to_tilde(filepath)
+function Previewer.buffer_or_file:update_title(entry)
+  if not self.title then return end
+  local filepath = entry.path
+  if filepath then
+    if filepath:match("^%[DEBUG]") then
+      filepath = "[DEBUG]"
+    else
+      if self.opts.cwd then
+        filepath = path.relative_to(entry.path, self.opts.cwd)
       end
+      filepath = path.HOME_to_tilde(filepath)
     end
-    local title = filepath or entry.uri or entry.bufname
-    -- was transform function defined?
-    if self.title_fnamemodify then
-      local wincfg = vim.api.nvim_win_get_config(self.win.border_winid)
-      title = self.title_fnamemodify(title, wincfg and wincfg.width)
-    end
-    if entry.bufnr then
-      title = string.format("buf %d: %s", entry.bufnr, title)
-    end
-    self.win:update_title(" " .. title .. " ")
   end
-  self.win:update_scrollbar(entry.no_scrollbar)
+  local title = filepath or entry.uri or entry.bufname
+  -- was transform function defined?
+  if self.title_fnamemodify then
+    local wincfg = vim.api.nvim_win_get_config(self.win.preview_winid)
+    title = self.title_fnamemodify(title, wincfg and wincfg.width)
+  end
+  if entry.bufnr then
+    title = string.format("buf %d: %s", entry.bufnr, title)
+  end
+  self.win:update_preview_title(" " .. title .. " ")
 end
 
 function Previewer.buffer_or_file:preview_buf_post(entry, min_winopts)
@@ -1127,7 +1126,8 @@ function Previewer.buffer_or_file:preview_buf_post(entry, min_winopts)
     end
   end
 
-  self:update_border(entry)
+  self:update_title(entry)
+  self.win:update_preview_scrollbar(entry.no_scrollbar)
 
   -- save the loaded entry so we can compare
   -- bufnr|path with the next entry. If equal
@@ -1222,7 +1222,7 @@ function Previewer.man_pages:populate_preview_buf(entry_str)
   vim.api.nvim_buf_set_lines(tmpbuf, 0, -1, false, output)
   vim.bo[tmpbuf].filetype = self.filetype
   self:set_preview_buf(tmpbuf)
-  self.win:update_scrollbar()
+  self.win:update_preview_scrollbar()
 end
 
 Previewer.marks = Previewer.buffer_or_file:extend()
@@ -1393,7 +1393,7 @@ function Previewer.highlights:populate_preview_buf(entry_str)
     self.orig_pos = api.nvim_win_get_cursor(0)
     utils.zz()
   end)
-  self.win:update_scrollbar()
+  self.win:update_preview_scrollbar()
 end
 
 Previewer.quickfix = Previewer.base:extend()
@@ -1444,8 +1444,8 @@ function Previewer.quickfix:populate_preview_buf(entry_str)
   vim.api.nvim_buf_set_lines(self.tmpbuf, 0, -1, false, lines)
   vim.bo[self.tmpbuf].filetype = "qf"
   self:set_preview_buf(self.tmpbuf)
-  self.win:update_title(string.format("%s: %s", nr, qf_list.title))
-  self.win:update_scrollbar()
+  self.win:update_preview_title(string.format("%s: %s", nr, qf_list.title))
+  self.win:update_preview_scrollbar()
 end
 
 Previewer.autocmds = Previewer.buffer_or_file:extend()

lua/fzf-lua/previewer/codeaction.lua

@@ -263,8 +263,8 @@ function M.builtin:populate_preview_buf(entry_str)
   vim.api.nvim_buf_set_lines(self.tmpbuf, 0, -1, false, lines)
   vim.bo[self.tmpbuf].filetype = "git"
   self:set_preview_buf(self.tmpbuf)
-  self.win:update_title(string.format(" Action #%d ", idx))
-  self.win:update_scrollbar()
+  self.win:update_preview_title(string.format(" Action #%d ", idx))
+  self.win:update_preview_scrollbar()
 end
 
 M.native = native.base:extend()