fix(actions): error message changed on nightly

Maybe something changed in upstream

* fix(serverlist): ignore rpc error

Also move the filter logic together

* fix: convert vim.NIL to nil in rpc response

Author: phanen

lua/fzf-lua/actions.lua

@@ -1364,7 +1364,10 @@ local parse_entry = function(e) return e and e:match("%((.-)%)") or nil end
 M.serverlist_kill = function(sel)
   vim.iter(sel):map(parse_entry):each(function(addr)
     local ok, err = utils.rpcexec(addr, "nvim_exec2", "qa!", {})
-    assert(ok or tostring(err):match("Invalid channel"), err)
+    assert(ok
+      or tostring(err):match("Invalid channel")
+      or tostring(err):match("ch %d+ was closed by the peer"),
+      err)
   end)
 end
 

lua/fzf-lua/providers/nvim.lua

@@ -786,42 +786,25 @@ M.serverlist = function(opts)
     local socket_paths = vim.fs.find(function(name, _)
       return name:match("nvim.*")
     end, { path = root, type = "socket", limit = math.huge })
-
-    local found = {} ---@type string[]
-    for _, socket in ipairs(socket_paths) do
-      -- Don't list servers twice
-      if not vim.list_contains(listed, socket) then
-        local ok, chan = pcall(vim.fn.sockconnect, "pipe", socket, { rpc = true })
-        if ok and chan then ---@cast chan integer
-          -- Check that the server is responding
-          if vim.fn.rpcrequest(chan, "nvim_get_chan_info", 0).id then
-            table.insert(found, socket)
-          end
-          vim.fn.chanclose(chan)
-        end
-      end
+    local found = utils.list_to_map(listed or vim.fn.serverlist())
+    local filter = function(socket)
+      if found[socket] or socket:match("fzf%-lua") then return false end
+      found[socket] = true
+      local ok, info = utils.rpcexec(socket, "nvim_get_chan_info", 0)
+      return ok and info.id
     end
-    return found
+    return vim.iter(socket_paths):filter(filter)
   end
 
   opts = require("fzf-lua.config").normalize_opts(opts or {}, "serverlist")
-  local list = vim.fn.serverlist()
+
   local f = function(cb)
-    vim
-        .iter(serverlist(list))
-        :filter(
-          function(p)
-            return not p:match("fzf%-lua") and not vim.tbl_contains(list, p)
-          end
-        )
-        :map(function(p)
-          ---@type boolean, string?
-          local ok, cwd = utils.rpcexec(p, "nvim_exec_lua", "return vim.uv.cwd()", {})
-          if not ok or not cwd then return end
-          cwd = FzfLua.path.normalize(cwd)
-          return ("%s (%s)"):format(cwd, p)
-        end)
-        :each(cb)
+    serverlist():each(function(p) ---@type boolean, string?
+      local ok, cwd = utils.rpcexec(p, "nvim_exec_lua", "return vim.uv.cwd()", {})
+      if not ok or not cwd then return end
+      cwd = FzfLua.path.normalize(cwd)
+      cb(("%s (%s)"):format(cwd, p))
+    end)
     cb(nil)
   end
   core.fzf_exec(function(cb)

lua/fzf-lua/utils.lua

@@ -1508,7 +1508,8 @@ function M.rpcexec(addr, method, ...)
   ---@cast chan integer
   local ret = { pcall(vim.rpcrequest, chan, method, ...) }
   vim.fn.chanclose(chan)
-  return unpack(ret)
+  local tonil = function(v) if v == vim.NIL then return nil else return v end end
+  return unpack(vim.tbl_map(tonil, ret))
 end
 
 --- Checks if treesitter parser for language is installed