refactor(config): detect binary/version earlier

Author: ibhagwan

lua/fzf-lua/actions.lua

@@ -52,7 +52,7 @@ M.expect = function(actions, opts)
       elseif k ~= "enter" then
         -- Skim does not support case sensitive alt-shift binds
         -- which are supported with fzf since version 0.25
-        if not opts._is_skim or not k:match("^alt%-%u") then
+        if not utils.has(opts, "sk") or not k:match("^alt%-%u") then
           table.insert(expect, k)
         end
       end

lua/fzf-lua/config.lua

@@ -227,6 +227,58 @@ function M.normalize_opts(opts, globals, __resume_key) ---@diagnostic disable
     opts = M.resume_opts(opts)
   end
 
+  local executable = function(binary, fncerr, strerr)
+    if binary and vim.fn.executable(binary) ~= 1 then
+      fncerr(("'%s' is not a valid executable, %s"):format(binary, strerr))
+      return false
+    end
+    return true
+  end
+
+  -- Validate the fzf binary & version dependency
+  opts.fzf_bin = opts.fzf_bin or M.globals.fzf_bin
+  opts.fzf_bin = opts.fzf_bin and libuv.expand(opts.fzf_bin) or nil
+  if not opts.fzf_bin or
+      not executable(opts.fzf_bin, utils.warn, "fallback to 'fzf'.") then
+    -- default|fallback to fzf
+    opts.fzf_bin = "fzf"
+    -- try fzf plugin if fzf is not installed globally
+    if vim.fn.executable(opts.fzf_bin) ~= 1 then
+      local ok, fzf_plug = pcall(vim.api.nvim_call_function, "fzf#exec", {})
+      if ok and fzf_plug then
+        opts.fzf_bin = fzf_plug
+      end
+    end
+    if not executable(opts.fzf_bin, utils.error,
+          "aborting. Please make sure 'fzf' is in installed.") then
+      return nil
+    end
+  end
+
+  -- enforce fzf minimum requirements
+  vim.g.fzf_lua_fzf_version = nil
+  if opts.fzf_bin:match("sk$") then
+    local SK_VERSION, rc, err = utils.sk_version(opts)
+    opts.__SK_VERSION = SK_VERSION
+    if not opts.__SK_VERSION then
+      utils.error("'sk --version' failed with error %s: %s", rc, err)
+      return nil
+    end
+  else
+    local FZF_VERSION, rc, err = utils.fzf_version(opts)
+    opts.__FZF_VERSION = FZF_VERSION
+    vim.g.fzf_lua_fzf_version = FZF_VERSION
+    if not opts.__FZF_VERSION then
+      utils.error("'fzf --version' failed with error %s: %s", rc, err)
+      return nil
+    elseif not utils.has(opts, "fzf", { 0, 36 }) then
+      utils.error("fzf version %s is lower than minimum (0.36), aborting.",
+        utils.ver2str(opts.__FZF_VERSION))
+      return nil
+    end
+  end
+
+
   local function convert_bool_opts()
     -- Enforce conversion of boolean options that are tables with `enabled`
     -- property, i.e. `winopts.treesitter = true` will be converted to
@@ -656,59 +708,6 @@ function M.normalize_opts(opts, globals, __resume_key) ---@diagnostic disable
   -- test for valid git_repo
   opts.git_icons = opts.git_icons and path.is_git_repo(opts, true)
 
-  local executable = function(binary, fncerr, strerr)
-    if binary and vim.fn.executable(binary) ~= 1 then
-      fncerr(("'%s' is not a valid executable, %s"):format(binary, strerr))
-      return false
-    end
-    return true
-  end
-
-  opts.fzf_bin = opts.fzf_bin or M.globals.fzf_bin
-  opts.fzf_bin = opts.fzf_bin and libuv.expand(opts.fzf_bin) or nil
-  if not opts.fzf_bin or
-      not executable(opts.fzf_bin, utils.warn, "fallback to 'fzf'.") then
-    -- default|fallback to fzf
-    opts.fzf_bin = "fzf"
-    -- try fzf plugin if fzf is not installed globally
-    if vim.fn.executable(opts.fzf_bin) ~= 1 then
-      local ok, fzf_plug = pcall(vim.api.nvim_call_function, "fzf#exec", {})
-      if ok and fzf_plug then
-        opts.fzf_bin = fzf_plug
-      end
-    end
-    if not executable(opts.fzf_bin, utils.error,
-          "aborting. Please make sure 'fzf' is in installed.") then
-      return nil
-    end
-  end
-
-  -- are we using skim?
-  opts._is_skim = opts.fzf_bin:match("sk$") ~= nil
-
-  -- enforce fzf minimum requirements
-  vim.g.fzf_lua_fzf_version = nil
-  if not opts._is_skim then
-    local FZF_VERSION, rc, err = utils.fzf_version(opts)
-    opts.__FZF_VERSION = FZF_VERSION
-    vim.g.fzf_lua_fzf_version = FZF_VERSION
-    if not opts.__FZF_VERSION then
-      utils.error("'fzf --version' failed with error %s: %s", rc, err)
-      return nil
-    elseif not utils.has(opts, "fzf", { 0, 36 }) then
-      utils.error("fzf version %s is lower than minimum (0.36), aborting.",
-        utils.ver2str(opts.__FZF_VERSION))
-      return nil
-    end
-  else
-    local SK_VERSION, rc, err = utils.sk_version(opts)
-    opts.__SK_VERSION = SK_VERSION
-    if not opts.__SK_VERSION then
-      utils.error("'sk --version' failed with error %s: %s", rc, err)
-      return nil
-    end
-  end
-
   if utils.has(opts, "fzf", { 0, 53 })
       -- `_multiline` is used to override `multiline` inherited from `defaults = {}`
       and opts.multiline and opts._multiline ~= false then

lua/fzf-lua/core.lua

@@ -414,7 +414,7 @@ M.fzf = function(contents, opts)
   -- This was added by 'resume': when '--print-query' is specified
   -- we are guaranteed to have the query in the first line, save&remove it
   if selected and #selected > 0 then
-    if not (opts._is_skim and opts.is_live) then
+    if not (utils.has(opts, "sk") and opts.is_live) then
       -- reminder: this doesn't get called with 'live_grep' when using skim
       -- due to a bug where '--print-query --interactive' combo is broken:
       -- skim always prints an empty line where the typed query should be.
@@ -1103,7 +1103,7 @@ M.setup_fzf_live_flags = function(command, bind_start, opts)
     reload_command = string.format("sleep %.2f; %s", opts.query_delay / 1000, reload_command)
   end
 
-  if opts._is_skim then
+  if utils.has(opts, "sk") then
     opts.prompt = opts.__prompt or opts.prompt or opts.fzf_opts["--prompt"]
     if opts.prompt then
       opts.fzf_opts["--prompt"] = opts.prompt:match("[^%*]+")
@@ -1146,7 +1146,7 @@ end
 -- query placeholder for "live" queries
 M.fzf_query_placeholder = "<query>"
 
----@param opts { field_index?: string, _is_skim?: boolean }
+---@param opts { field_index?: string }
 ---@return string
 M.fzf_field_index = function(opts)
   -- fzf already adds single quotes around the placeholder when expanding.

lua/fzf-lua/providers/buffers.lua

@@ -375,7 +375,7 @@ M.buffer_lines = function(opts)
     end)()
   end
 
-  opts = core.set_fzf_field_index(opts, "{3}", opts._is_skim and "{}" or "{..-2}")
+  opts = core.set_fzf_field_index(opts, "{3}", utils.has(opts, "sk") and "{}" or "{..-2}")
   return core.fzf_exec(contents, opts)
 end
 

lua/fzf-lua/providers/dap.lua

@@ -123,7 +123,7 @@ M.breakpoints = function(opts)
     end)()
   end
 
-  opts = core.set_fzf_field_index(opts, "{3}", opts._is_skim and "{}" or "{..-2}")
+  opts = core.set_fzf_field_index(opts, "{3}", utils.has(opts, "sk") and "{}" or "{..-2}")
   return core.fzf_exec(contents, opts)
 end
 

lua/fzf-lua/types.lua

@@ -192,7 +192,6 @@ local FzfLua = require("fzf-lua")
 ---@field _actions? fun():fzf-lua.config.Actions?
 ---@field __ACT_TO? function
 ---@field _start? boolean
----@field _is_skim? boolean
 ---@field _treesitter? (fun(line: string):string?,string?,string?,string?)|boolean?
 ---@field help_open_win? fun(buf: integer, enter: boolean, config: vim.api.keyset.win_config): integer
 ---Auto close fzf-lua interface when a terminal is opened, set to `false` to keep the interface open.
@@ -223,7 +222,6 @@ local FzfLua = require("fzf-lua")
 ---@field __resume_get? function
 ---@field _contents? string
 ---@field _is_fzf_tmux? boolean
----@field _is_skim? boolean
 ---@field __stringified? boolean
 ---@field __stringify_cmd? boolean
 ---@field __sigwinches? string[]