fix: is_thread

Author: phanen

lua/fzf-lua/defaults.lua

@@ -696,8 +696,8 @@ M.defaults.git                   = {
           FzfLua.git_hunks(o)
         end,
         header = "git hunks",
-        reuse = #vim.api.nvim_list_uis() == 0,
-        exec_silent = #vim.api.nvim_list_uis() > 0,
+        -- reuse = #vim.api.nvim_list_uis() == 0,
+        -- exec_silent = #vim.api.nvim_list_uis() > 0,
         field_index = "{} $FZF_POS",
       },
       ["ctrl-q"] = {
@@ -766,8 +766,8 @@ M.defaults.git                   = {
           FzfLua.git_diff(o)
         end,
         header = "git diff",
-        reuse = #vim.api.nvim_list_uis() == 0,
-        exec_silent = #vim.api.nvim_list_uis() > 0,
+        -- reuse = #vim.api.nvim_list_uis() == 0,
+        -- exec_silent = #vim.api.nvim_list_uis() > 0,
         field_index = "{} $FZF_POS",
       },
     },
@@ -2017,7 +2017,7 @@ M.defaults.spell_suggest         = {
 ---@class fzf-lua.config.Serverlist : fzf-lua.config.Base
 ---@field _screenshot string
 M.defaults.serverlist            = {
-  _screenshot = vim.fn.tempname(),
+  -- _screenshot = vim.fn.tempname(),
   previewer = { _ctor = previewers.fzf.nvim_server },
   _resume_reload = true, -- avoid list contain killed server unhide
   actions = {

lua/fzf-lua/init.lua

@@ -1,5 +1,5 @@
 ---@diagnostic disable: duplicate-require
-local gen = _G.arg[0] == "lua/fzf-lua/init.lua"
+local gen = _G.arg and _G.arg[0] == "lua/fzf-lua/init.lua"
 local currFile = assert(debug.getinfo(1, "S")).source:gsub("^@", "")
 if gen then vim.opt.rtp:append(vim.fn.fnamemodify(currFile, ":h:h:h:p")) end
 
@@ -12,7 +12,7 @@ local config = require "fzf-lua.config"
 ---@class fzf-lua
 local M = {}
 
-do
+if not vim.is_thread() then
   local function source_vimL(path_parts)
     local vimL_file = path.join(path_parts)
     if uv.fs_stat(vimL_file) then
@@ -175,7 +175,9 @@ end
 
 -- Setup highlights at least once on load in
 -- case the user decides not to call `setup()`
-M.setup_highlights()
+if not vim.is_thread() then
+  M.setup_highlights()
+end
 
 ---@param opts? fzf-lua.profile|fzf-lua.Config|{}
 ---@param do_not_reset_defaults? boolean

lua/fzf-lua/libuv.lua

@@ -1,7 +1,8 @@
 ---@diagnostic disable-next-line: deprecated
 local uv = vim.uv or vim.loop
 
-local _is_win = vim.fn.has("win32") == 1 or vim.fn.has("win64") == 1
+-- local _is_win = vim.fn.has("win32") == 1 or vim.fn.has("win64") == 1
+local _is_win = false
 
 local M = {}
 
@@ -204,12 +205,15 @@ M.spawn = function(opts, fn_transform, fn_done)
   local function split_lines(data)
     -- io.stderr:write("[DEBUG] worker init")
     if not _G.fzf_lua_worker_init then
+      -- TODO: we can pass serialize opts to first queue...
+      local __FILE__ = assert(debug.getinfo(1, "S")).source:gsub("^@", "")
+      package.path = ("%s/?.lua;"):format(vim.fs.dirname(vim.fs.dirname(__FILE__))) .. package.path
+      require("fzf-lua.make_entry")
+      print('e')
+      -- print(vim.inspect(package.loaders))
       _G.fzf_lua_worker_init = true
-      -- local __FILE__ = assert(debug.getinfo(1, "S")).source:gsub("^@", "")
-      -- package.path = ("%s/?.lua;"):format(vim.fs.dirname(vim.fs.dirname(__FILE__))) .. package.path
-      -- require("fzf-lua")
-      -- pcall(require, "fzf-lua.make_entry")
     end
+    local trans = require("fzf-lua.make_entry").file
     local ret = {}
     local start_idx = 1
     repeat
@@ -218,6 +222,7 @@ M.spawn = function(opts, fn_transform, fn_done)
         local cr = data:byte(nl_idx - 1, nl_idx - 1) == 13 -- \r
         local line = data:sub(start_idx, nl_idx - (cr and 2 or 1))
         -- if trans then line = trans(line) end
+        line = trans(line, {})
         if line then ret[#ret + 1] = line end
         start_idx = nl_idx + 1
       end
@@ -492,7 +497,7 @@ M.spawn_stdio = function(opts)
   local on_write = function(data, cb)
     if stdout then
       pipe_write(stdout, data, cb)
-    else
+    elseif data then
       -- on success: rc=true, err=nil
       -- on failure: rc=nil, err="Broken pipe"
       -- cb with an err ends the process

lua/fzf-lua/make_entry.lua

@@ -32,6 +32,7 @@ local function load_config_section(s, datatype, optional)
     local val = utils.map_get(config, s)
     return type(val) == datatype and val or nil
     ---@diagnostic disable-next-line: undefined-field
+  elseif false then
   elseif _G._fzf_lua_server then
     -- load config from our running instance
     local is_bytecode = false

lua/fzf-lua/utils.lua

@@ -12,18 +12,22 @@ local memoize = vim.func and vim.func._memoize
 
 local M = {}
 
-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
-M.__HAS_NVIM_0116 = vim.fn.has("nvim-0.11.6") == 1
-M.__HAS_NVIM_012 = vim.fn.has("nvim-0.12") == 1
-M.__IS_WINDOWS = vim.fn.has("win32") == 1 or vim.fn.has("win64") == 1
--- M.__HAS_NVIM_010 = true
--- M.__HAS_NVIM_0102 = true
--- M.__HAS_NVIM_011 = true
--- M.__HAS_NVIM_0116 = true
--- M.__HAS_NVIM_012 = true
--- M.__IS_WINDOWS = false
+if vim.is_thread() then
+  M.__HAS_NVIM_010 = true
+  M.__HAS_NVIM_0102 = true
+  M.__HAS_NVIM_011 = true
+  M.__HAS_NVIM_0116 = true
+  M.__HAS_NVIM_012 = true
+  M.__IS_WINDOWS = false
+else
+  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
+  M.__HAS_NVIM_0116 = vim.fn.has("nvim-0.11.6") == 1
+  M.__HAS_NVIM_012 = vim.fn.has("nvim-0.12") == 1
+  M.__IS_WINDOWS = vim.fn.has("win32") == 1 or vim.fn.has("win64") == 1
+end
+
 -- `:help shellslash` (for more info see #1055)
 M.__WIN_HAS_SHELLSLASH = M.__IS_WINDOWS and vim.fn.exists("+shellslash") == 1