chore: set min requirement to neovim 0.9

Author: ibhagwan

.github/workflows/vimdoc.yaml

@@ -14,7 +14,7 @@ jobs:
       - uses: rhysd/action-setup-vim@v1
         with:
           neovim: true
-          version: v0.10.3
+          version: v0.10.4
       - name: Setup treesitter
         run: |
           mkdir -p ~/.local/share/nvim/site/pack/vendor/start
@@ -28,7 +28,7 @@ jobs:
         run: |
           export PATH="${PWD}/build/:${PATH}"
           export PACKPATH=$HOME/.local/share/nvim/site
-          nvim --headless -u ~/.local/share/nvim/site/pack/vendor/start/ts-vimdoc.nvim/scripts/init.lua  -c "lua require('ts-vimdoc').docgen({input_file='README.md', output_file='doc/fzf-lua.txt', project_name='fzf-lua', version='For Neovim >= 0.7.0'})" -c "qa"
+          nvim --headless -u ~/.local/share/nvim/site/pack/vendor/start/ts-vimdoc.nvim/scripts/init.lua  -c "lua require('ts-vimdoc').docgen({input_file='README.md', output_file='doc/fzf-lua.txt', project_name='fzf-lua', version='For Neovim >= 0.9.0'})" -c "qa"
       - name: Commit changes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -2,7 +2,7 @@
 
 # fzf :heart: lua
 
-![Neovim version](https://img.shields.io/badge/Neovim-0.7-57A143?style=flat-square&logo=neovim)
+![Neovim version](https://img.shields.io/badge/Neovim-0.9-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.7.0`
+- [`neovim`](https://github.com/neovim/neovim/releases) version >= `0.9`
 - [`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)

lua/fzf-lua/devicons.lua

@@ -45,8 +45,6 @@ function NvimWebDevicons:new()
 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
       -- do not trigger lazy loading
       and (not do_not_lazy_load or package.loaded[self._package_name])
@@ -180,7 +178,7 @@ function MiniIcons:new()
 end
 
 function MiniIcons:load(do_not_lazy_load)
-  if not self._package_loaded and utils.__HAS_NVIM_08
+  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/init.lua

@@ -84,12 +84,7 @@ function M.setup_highlights(override)
     { "FzfLuaScrollFloatFull",   "scrollfloat_f",  { default = default, link = "PmenuThumb" } },
     { "FzfLuaDirIcon",           "dir_icon",       { default = default, link = "Directory" } },
     { "FzfLuaDirPart",           "dir_part",       { default = default, link = "Comment" } },
-    { "FzfLuaFilePart", "file_part",
-      {
-        default = default,
-        link = utils.__HAS_NVIM_08 and "@none" or "Normal",
-      }
-    },
+    { "FzfLuaFilePart",          "file_part",      { default = default, link = "@none" } },
     -- Fzf terminal hls, colors from `vim.api.nvim_get_color_map()`
     { "FzfLuaHeaderBind", "header_bind",
       { default = default, fg = is_light and "MediumSpringGreen" or "BlanchedAlmond" } },
@@ -146,20 +141,6 @@ function M.setup_highlights(override)
     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 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
-        -- reset any invalid hl, this will cause our 'winhighlight'
-        -- string to look something akin to `Normal:,FloatBorder:`
-        -- which uses terminal fg|bg colors instead
-        utils.map_set(config.setup_opts, "__HLS." .. opt_name, "")
-      end
-    end
-  end
-
   -- Init the colormap singleton
   utils.COLORMAP()
 end

lua/fzf-lua/previewer/builtin.lua

@@ -957,40 +957,37 @@ function Previewer.buffer_or_file:do_syntax(entry)
         ))
       end
       if syntax_limit_reached == 0 then
-        local fallback = not utils.__HAS_NVIM_09
-        if utils.__HAS_NVIM_09 then
-          fallback = (function()
-            local ft = entry.filetype
-                or self.ext_ft_override and self.ext_ft_override[path.extension(entry.path)]
-                or vim.filetype.match({ buf = bufnr, filename = entry.path })
-            if type(ft) ~= "string" then
-              return true
-            end
-            local ts_enabled = (function()
-              if not self.treesitter or
-                  self.treesitter.enabled == false or
-                  self.treesitter.disabled == true or
-                  (type(self.treesitter.enabled) == "table" and
-                    not utils.tbl_contains(self.treesitter.enabled, ft)) or
-                  (type(self.treesitter.disabled) == "table" and
-                    utils.tbl_contains(self.treesitter.disabled, ft)) then
-                return false
-              end
-              return true
-            end)()
-            local ts_success = ts_enabled and ts_attach(bufnr, ft)
-            if not ts_success then
-              pcall(function() vim.bo[bufnr].syntax = ft end)
-            else
-              -- Use buf local var as setting ft might have unintended consequences
-              -- currently only being used in `update_render_markdown` but might be
-              -- of use in the future?
-              vim.b[bufnr]._ft = ft
-              self:update_render_markdown()
-              self:update_ts_context()
+        local fallback = (function()
+          local ft = entry.filetype
+              or self.ext_ft_override and self.ext_ft_override[path.extension(entry.path)]
+              or vim.filetype.match({ buf = bufnr, filename = entry.path })
+          if type(ft) ~= "string" then
+            return true
+          end
+          local ts_enabled = (function()
+            if not self.treesitter or
+                self.treesitter.enabled == false or
+                self.treesitter.disabled == true or
+                (type(self.treesitter.enabled) == "table" and
+                  not utils.tbl_contains(self.treesitter.enabled, ft)) or
+                (type(self.treesitter.disabled) == "table" and
+                  utils.tbl_contains(self.treesitter.disabled, ft)) then
+              return false
             end
+            return true
           end)()
-        end
+          local ts_success = ts_enabled and ts_attach(bufnr, ft)
+          if not ts_success then
+            pcall(function() vim.bo[bufnr].syntax = ft end)
+          else
+            -- Use buf local var as setting ft might have unintended consequences
+            -- currently only being used in `update_render_markdown` but might be
+            -- of use in the future?
+            vim.b[bufnr]._ft = ft
+            self:update_render_markdown()
+            self:update_ts_context()
+          end
+        end)()
         if fallback then
           if entry.filetype == "help" then
             -- if entry.filetype and #entry.filetype>0 then

lua/fzf-lua/profiles/default.lua

@@ -1,5 +1,4 @@
 return {
   desc = "fzf-lua default options",
-  -- Defaults to picker info in win title if neovim version >= 0.9, prompt otherwise
-  require("fzf-lua").utils.__HAS_NVIM_09 and "default-title" or "default-prompt"
+  "default-title",
 }

lua/fzf-lua/providers/lsp.lua

@@ -8,14 +8,6 @@ local make_entry = require "fzf-lua.make_entry"
 
 local M = {}
 
-local function handler_capability(handler)
-  if utils.__HAS_NVIM_08 then
-    return handler.server_capability
-  else
-    return handler.resolved_capability
-  end
-end
-
 local function check_capabilities(handler, silent)
   local clients = utils.lsp_get_clients({ bufnr = core.CTX().bufnr })
 
@@ -24,25 +16,14 @@ local function check_capabilities(handler, silent)
   local num_clients = 0
 
   for _, client in pairs(clients) do
-    if utils.__HAS_NVIM_09 then
-      -- https://github.com/neovim/neovim/blob/65738202f8be3ca63b75197d48f2c7a9324c035b/runtime/doc/news.txt#L118-L122
-      -- Dynamic registration of LSP capabilities. An implication of this change is
-      -- that checking a client's `server_capabilities` is no longer a sufficient
-      -- indicator to see if a server supports a feature. Instead use
-      -- `client.supports_method(<method>)`. It considers both the dynamic
-      -- capabilities and static `server_capabilities`.
-      if client:supports_method(handler.prep or handler.method) then
-        num_clients = num_clients + 1
-      end
-    elseif utils.__HAS_NVIM_08 then
-      if client.server_capabilities[handler.server_capability] then
-        num_clients = num_clients + 1
-      end
-    else
-      ---@diagnostic disable-next-line: undefined-field
-      if client.resolved_capabilities[handler.resolved_capability] then
-        num_clients = num_clients + 1
-      end
+    -- https://github.com/neovim/neovim/blob/65738202f8be3ca63b75197d48f2c7a9324c035b/runtime/doc/news.txt#L118-L122
+    -- Dynamic registration of LSP capabilities. An implication of this change is
+    -- that checking a client's `server_capabilities` is no longer a sufficient
+    -- indicator to see if a server supports a feature. Instead use
+    -- `client.supports_method(<method>)`. It considers both the dynamic
+    -- capabilities and static `server_capabilities`.
+    if client:supports_method(handler.prep or handler.method) then
+      num_clients = num_clients + 1
     end
   end
 
@@ -318,78 +299,67 @@ end
 local handlers = {
   ["code_actions"] = {
     label = "Code Actions",
-    resolved_capability = "code_action",
     server_capability = "codeActionProvider",
     method = "textDocument/codeAction",
     handler = code_action_handler
   },
   ["references"] = {
     label = "References",
-    resolved_capability = "find_references",
     server_capability = "referencesProvider",
     method = "textDocument/references",
     handler = location_handler
   },
   ["definitions"] = {
     label = "Definitions",
-    resolved_capability = "goto_definition",
     server_capability = "definitionProvider",
     method = "textDocument/definition",
     handler = location_handler
   },
   ["declarations"] = {
     label = "Declarations",
-    resolved_capability = "goto_declaration",
     server_capability = "declarationProvider",
     method = "textDocument/declaration",
     handler = location_handler
   },
   ["typedefs"] = {
     label = "Type Definitions",
-    resolved_capability = "type_definition",
     server_capability = "typeDefinitionProvider",
     method = "textDocument/typeDefinition",
     handler = location_handler
   },
   ["implementations"] = {
     label = "Implementations",
-    resolved_capability = "implementation",
     server_capability = "implementationProvider",
     method = "textDocument/implementation",
     handler = location_handler
   },
   ["document_symbols"] = {
     label = "Document Symbols",
-    resolved_capability = "document_symbol",
     server_capability = "documentSymbolProvider",
     method = "textDocument/documentSymbol",
     handler = symbol_handler
   },
   ["workspace_symbols"] = {
     label = "Workspace Symbols",
-    resolved_capability = "workspace_symbol",
     server_capability = "workspaceSymbolProvider",
     method = "workspace/symbol",
     handler = symbol_handler
   },
   ["live_workspace_symbols"] = {
     label = "Workspace Symbols",
-    resolved_capability = "workspace_symbol",
     server_capability = "workspaceSymbolProvider",
     method = "workspace/symbol",
     handler = symbol_handler
   },
   ["incoming_calls"] = {
     label = "Incoming Calls",
-    resolved_capability = "call_hierarchy",
     server_capability = "callHierarchyProvider",
     method = "callHierarchy/incomingCalls",
     prep = "textDocument/prepareCallHierarchy",
     handler = call_hierarchy_handler
   },
   ["outgoing_calls"] = {
     label = "Outgoing Calls",
-    resolved_capability = "call_hierarchy",
     server_capability = "callHierarchyProvider",
     method = "callHierarchy/outgoingCalls",
     prep = "textDocument/prepareCallHierarchy",
@@ -709,7 +679,7 @@ M.finder = function(opts)
       opts.silent = opts.silent == nil and true or opts.silent
       opts.no_autoclose = true
       opts.lsp_handler = handlers[method]
-      opts.lsp_handler.capability = handler_capability(opts.lsp_handler)
+      opts.lsp_handler.capability = opts.lsp_handler.server_capability
       opts.lsp_params = lsp_params -- reset previous calls params if existed
 
       -- returns nil for no client attached, false for unsupported capability
@@ -1006,7 +976,7 @@ local function wrap_fn(key, fn)
   return function(opts)
     opts = opts or {}
     opts.lsp_handler = handlers[key]
-    opts.lsp_handler.capability = handler_capability(opts.lsp_handler)
+    opts.lsp_handler.capability = opts.lsp_handler.server_capability
 
     -- check_capabilities will print the appropriate warning
     if not check_capabilities(opts.lsp_handler) then

lua/fzf-lua/utils.lua

@@ -10,8 +10,6 @@ local uv = vim.uv or vim.loop
 
 local M = {}
 
-M.__HAS_NVIM_08 = vim.fn.has("nvim-0.8") == 1
-M.__HAS_NVIM_09 = vim.fn.has("nvim-0.9") == 1
 M.__HAS_NVIM_010 = vim.fn.has("nvim-0.10") == 1
 M.__HAS_NVIM_0102 = vim.fn.has("nvim-0.10.2") == 1
 M.__HAS_NVIM_011 = vim.fn.has("nvim-0.11") == 1
@@ -587,21 +585,9 @@ end
 
 -- Helper func to test for invalid (cleared) highlights
 function M.is_hl_cleared(hl)
-  -- `vim.api.nvim_get_hl_by_name` is deprecated since v0.9.0
-  if vim.api.nvim_get_hl then
-    local ok, hl_def = pcall(vim.api.nvim_get_hl, 0, { name = hl, link = false })
-    if not ok or M.tbl_isempty(hl_def) then
-      return true
-    end
-  else
-    ---@diagnostic disable-next-line: deprecated
-    local ok, hl_def = pcall(vim.api.nvim_get_hl_by_name, hl, true)
-    -- Not sure if this is the right way but it seems that cleared
-    -- highlights return 'hl_def[true] == 6' (?) and 'hl_def[true]'
-    -- does not exist at all otherwise
-    if not ok or hl_def[true] then
-      return true
-    end
+  local ok, hl_def = pcall(vim.api.nvim_get_hl, 0, { name = hl, link = false })
+  if not ok or M.tbl_isempty(hl_def) then
+    return true
   end
 end
 
@@ -1011,14 +997,6 @@ function M.nvim_buf_get_name(bufnr, bufinfo)
   return bufname
 end
 
-function M.wo(win, k, v)
-  if M.__HAS_NVIM_08 then
-    vim.api.nvim_set_option_value(k, v, { scope = "local", win = win })
-  else
-    vim.wo[win][k] = v
-  end
-end
-
 function M.zz()
   -- skip for terminal buffers
   if M.is_term_buffer() then return end