fix(cli): make skim work

Author: phanen

lua/fzf-lua/config.lua

@@ -744,11 +744,13 @@ 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, {
-          -- All fzf flags values not support by skim
+          -- All fzf flags values not support by skim (https://github.com/skim-rs/skim/issues/628)
           ["99.9.9"] = {
             fzf_opts = {
-              ["--border"] = { "none" },
-              ["--info"]   = { "inline-right" },
+              ["--border"]           = { "none" },
+              ["--info"]             = { "inline-right" },
+              ["--border-label-pos"] = true,
+              ["--info-command"]     = true,
             }
           },
           ["1.5.3"] = {

lua/fzf-lua/core.lua

@@ -496,6 +496,8 @@ M.preview_window = function(o, fzf_win)
       return border and string.format(":%s", border) or ""
     end)()
   )
+  -- https://github.com/skim-rs/skim/issues/964
+  if preview.pty and utils.has(o, "sk") then prefix = "pty:" .. prefix end
   if utils.has(o, "fzf", { 0, 31 })
       -- fzf v0.45 added transform, v0.46 added resize event
       -- which we use for changing the layout on resize

lua/fzf-lua/defaults.lua

@@ -115,6 +115,8 @@ end
 ---Debounce time (milliseconds) for displaying the preview buffer in the builtin previewer.
 ---@field delay? integer
 ---@field winopts fzf-lua.config.PreviewerWinopts Window options for the builtin previewer.
+---(skim only option), allow preview process run in pty
+---@field pty? boolean
 
 ---missing fields are injected later, not sure how to tell luals about it
 ---@class fzf-lua.config.Defaults: fzf-lua.config.Base,{}

lua/fzf-lua/previewer/fzf.lua

@@ -532,7 +532,7 @@ local function make_screenshot(screenshot, addr, lines, columns)
     end
     return utils.rpcexec(addr, "nvim_exec_lua", [[
       local lines, columns, screenshot = ...
-      return vim._with({ go = { lines = lines, columns = columns } }, function()
+      return vim._with({ o = { lines = lines, columns = columns } }, function()
         vim.api.nvim__screenshot(screenshot)
       end)
     ]], { lines, columns, screenshot })

lua/fzf-lua/providers/nvim.lua

@@ -807,6 +807,9 @@ M.serverlist = function(opts)
     end)
     cb(nil)
   end
+  if utils.has(opts, "sk", "3.0.0") then
+    opts = vim.tbl_deep_extend("force", opts, { winopts = { preview = { pty = true } } })
+  end
   core.fzf_exec(function(cb)
     vim.defer_fn(function() f(cb) end, 50) -- wait for spawn/remote_exec?
   end, opts)

scripts/cli.lua

@@ -52,7 +52,7 @@ _G.fzf_jobstart = function(cmd, opts)
   FzfLua.libuv.uv_spawn(cmd[1], {
       cwd = opts.cwd,
       args = vim.list_slice(cmd, 2),
-      stdio = { 0 },
+      stdio = { 0, 1, 2 }, -- sk require stderr
       env = opts.env,
     },
     vim.schedule_wrap(function(rc)