fix(skim): more v1 compat

Author: ibhagwan

lua/fzf-lua/config.lua

@@ -744,22 +744,37 @@ function M.normalize_opts(opts, globals, __resume_key) ---@diagnostic disable
     local bin, version, changelog = (function()
       if opts.__SK_VERSION then
         return "sk", opts.__SK_VERSION, {
-          ["1.5.3"] = { fzf_opts = { ["--algo"] = "frizbee" } },
+          -- All fzf flag values not existing in skim
+          ["1.5.3"] = {
+            fzf_opts = {
+              ["--border"] = { "plain", "rounded", "double", "thick", "light-double-dashed",
+                "heavy-double-dashed", "light-triple-dashed", "heavy-triple-dashed",
+                "light-quadruple-dashed", "heavy-quadruple-dashed", "quadrant-inside",
+                "quadrant-outside" },
+              ["--algo"]   = "frizbee"
+            }
+          },
           ["0.15.5"] = { fzf_opts = { ["--tmux"] = true } },
-          ["0.53"] = { fzf_opts = { ["--inline-info"] = true } },
+          ["0.53"] = {
+            fzf_opts = {
+              ["--inline-info"] = true,
+              ["--algo"]        = { "skim_v1", "skim_v2" },
+            }
+          },
           -- All fzf flags not existing in skim
           ["all"] = {
             fzf_opts = {
               ["--scheme"]         = false,
               ["--gap"]            = false,
-              ["--info"]           = false,
-              ["--border"]         = false,
               ["--scrollbar"]      = false,
               ["--no-scrollbar"]   = false,
               ["--wrap"]           = true,
               ["--wrap-sign"]      = true,
               ["--highlight-line"] = false,
-              ["--gutter"] = false,
+              ["--gutter"]         = false,
+              ["--border-label"]   = false,
+              ["--border"]         = { "none" },
+              ["--info"]           = { "inline-right" },
             }
           },
         }

lua/fzf-lua/defaults.lua

@@ -266,7 +266,7 @@ M.defaults        = {
     ["--border"]         = "none",
     ["--highlight-line"] = true,
     -- typo-resistant algo with skim >= v1.5.3
-    ["--algo"]           = "frizbee",
+    -- ["--algo"]        = "frizbee",
   },
   ---Options passed to fzf-tmux wrapper.
   fzf_tmux_opts = { ["-p"] = "80%,80%", ["--margin"] = "0,0" },

lua/fzf-lua/win.lua

@@ -1674,7 +1674,10 @@ function FzfWin:update_statusline()
 end
 
 function FzfWin:update_fzf_border_label()
-  if not self._o.fzf_opts["--border"] or self._o.fzf_opts["--border-label"] == false then
+  if not utils.has(self._o, "fzf", { 0, 35 })
+      or not self._o.fzf_opts["--border"]
+      or self._o.fzf_opts["--border-label"] == false
+  then
     return
   end
   ---@type string|table