pass string

Author: phanen

lua/fzf-lua/libuv.lua

@@ -88,17 +88,16 @@ end
 ---@field process1? boolean
 ---@field profiler? boolean
 
+-- or table address
 local gen_uuid = function()
   -- return uv.random(10)
   return uv.hrtime()
 end
 
 ---@param opts fzf-lua.SpawnOpts
----@param fn_transform function?
----@param fn_done function?
 ---@return uv.uv_process_t proc
 ---@return integer         pid
-M.spawn = function(opts, fn_transform, fn_done)
+M.spawn = function(opts)
   local EOL = opts.EOL or "\n"
   local EOL_data = type(opts.cmd) == "string"
       -- fd -0|--print0
@@ -152,8 +151,6 @@ M.spawn = function(opts, fn_transform, fn_done)
         end
       end, 200)
     end
-    -- NO LONGER USED, was coroutinify callback
-    if fn_done then fn_done(pid) end
   end
 
   -- https://github.com/luvit/luv/blob/master/docs.md
@@ -208,13 +205,13 @@ M.spawn = function(opts, fn_transform, fn_done)
   end
 
   local uuid = gen_uuid() -- distinguish two call when use worker pool
-  local optstr = require("fzf-lua.libuv").serialize({ t = fn_transform, opts = opts.opts }, false)
+  local optstr = require("fzf-lua.libuv").serialize(opts.opts, false)
   -- TODO: not correct for live_grep multiprocess=false? uuid?
   ---@param data string data stream
   ---@return string, string? line array, partial last line (no EOL)
   local function split_lines(data, o, id)
     -- io.stderr:write("[DEBUG] worker init")
-    if not _G.fzf_lua_worker_init then
+    if not _G.uuid then
       -- TODO: we can pass serialize opts to first queue...
       local __FILE__ = assert(debug.getinfo(1, "S")).source:gsub("^@", "")
       local lua = vim.fs.dirname(vim.fs.dirname(__FILE__))
@@ -238,14 +235,21 @@ M.spawn = function(opts, fn_transform, fn_done)
       setmetatable(vim.api, { __index = function() return function() end end })
       -- pcall(require, "nvim-web-devicons")
       -- print(e)
-      _G.fzf_lua_worker_init = true
     end
+    -- TODO: deserialize to string then eval here, otherwise we cannot use upvalue
+    -- TODO: on buf? swtich gitsigns/diff_int.lua:32: bad argument #1 to 'decode' (string expected, got nil)
     if id ~= _G.uuid then -- refresh opts
-      local d = require("fzf-lua.libuv").deserialize(o, false)
-      _G.trans = d.t
-      _G.opts = d.opts
+      _G.opts = FzfLua.libuv.deserialize(o, false)
+      local opts = _G.opts
+      local load_fn = FzfLua.libuv.load_fn
+      if not _G.uuid then
+        local fn_preprocess = load_fn(opts.fn_preprocess) or opts.fn_preprocess
+        if fn_preprocess then fn_preprocess(opts) end
+      end
+      if opts.fn_transform then _G.trans = load_fn(opts.fn_transform) end
       _G.uuid = id
     end
+
     -- local trans = require("fzf-lua.make_entry").file
     -- local worker_opts = assert(_G.fzf_lua_worker_opts, "no opts")
     local trans = _G.trans
@@ -450,7 +454,7 @@ M.spawn_stdio = function(opts)
   local content = opts.contents
   if type(content) == "string" and content:match("%-%-color[=%s]+never") then
     -- perf: skip stripping ansi coloring in `make_file.entry`
-    opts.no_ansi_colors = true
+    -- opts.no_ansi_colors = true
   end
 
   if opts.debug == "v" or opts.debug == 2 then
@@ -596,21 +600,14 @@ M.spawn_stdio = function(opts)
   if not fn_transform and not fn_postprocess then posix_exec(content) end
 
   return M.spawn({
-      cwd = opts.cwd,
-      cmd = cmd,
-      cb_finish = on_finish,
-      cb_write = on_write,
-      -- cb_write_lines = on_write_lines,
-      cb_err = on_err,
-      process1 = opts.process1,
-      profiler = opts.profiler,
-      EOL = EOL,
-      opts = opts,
-    },
-    fn_transform)
-  -- fn_transform and function(x)
-  --   return fn_transform(x, opts)
-  -- end)
+    cwd = opts.cwd,
+    cmd = cmd,
+    cb_finish = on_finish,
+    cb_write = on_write,
+    cb_err = on_err,
+    EOL = EOL,
+    opts = opts,
+  })
 end
 
 

lua/fzf-lua/make_entry.lua

@@ -568,10 +568,6 @@ M.file = function(x, opts)
   local icon, hl
   local colon_start_idx = 1
 
-  local path = path or FzfLua.path
-  local utils = utils or FzfLua.utils
-  local devicons = devicons or FzfLua.devicons
-  -- print(vim.inspect(opts))
   if utils.__IS_WINDOWS then
     if string.byte(x, #x) == 13 then
       -- strip ^M added by the "dir /s/b" command
@@ -681,6 +677,7 @@ M.file = function(x, opts)
   if opts._fmt and type(opts._fmt.to) == "function" then
     ret[#ret + 1], _fmt_postfix = opts._fmt.to(filepath, opts, { path = path, utils = utils })
   else
+    -- print(file_part, stripped_filepath, filepath)
     ret[#ret + 1] = file_is_ansi > 0
         -- filename is ansi escape colored, replace the inner string (#819)
         -- escape `%` in path, since `string.gsub` also use it in target (#1443)

lua/fzf-lua/shell.lua

@@ -293,10 +293,10 @@ M.stringify = function(contents, opts, fzf_field_index)
   assert(not opts.__stringified, "twice stringified")
   opts.__stringified = true
 
-  -- Convert string callbacks to callback functions
-  for _, k in ipairs({ "fn_transform", "fn_preprocess", "fn_postprocess" }) do
-    opts[k] = libuv.load_fn(opts[k]) or opts[k]
-  end
+  -- -- Convert string callbacks to callback functions
+  -- for _, k in ipairs({ "fn_transform", "fn_preprocess", "fn_postprocess" }) do
+  --   opts[k] = libuv.load_fn(opts[k]) or opts[k]
+  -- end
 
   local cmd, id = M.pipe_wrap_fn(function(pipe, ...)
     local args, n = { ... }, select("#", ...)
@@ -318,14 +318,8 @@ M.stringify = function(contents, opts, fzf_field_index)
     local write_cb_count = 0
     local pipe_want_close = false
     local EOL = utils.map_get(opts, "fzf_opts.--read0") and "\0" or "\n"
-    local fn_transform = opts.fn_transform
-    local fn_preprocess = opts.fn_preprocess
-    local fn_postprocess = opts.fn_postprocess
     local co = coroutine.running()
 
-    -- Run the preprocess function
-    if type(fn_preprocess) == "function" then fn_preprocess(opts) end
-
     -- local on_finish = function(code, sig, from, pid)
     -- print("finish", pipe, pipe_want_close, code, sig, from, pid)
     local on_finish = function(_, _, _, _)
@@ -335,8 +329,7 @@ M.stringify = function(contents, opts, fzf_field_index)
         -- only close if all our uv.write calls are completed
         uv.close(pipe)
         pipe = nil
-        -- Run the postprocess function
-        if type(fn_postprocess) == "function" then fn_postprocess(opts) end
+        -- if type(fn_postprocess) == "function" then fn_postprocess(opts) end
       end
     end
 
@@ -349,23 +342,6 @@ M.stringify = function(contents, opts, fzf_field_index)
         if cb then cb(nil) end
       else
         write_cb_count = write_cb_count + 1
-        if type(data) == "table" then
-          -- cb_write_lines was sent instead of cb_lines
-          if fn_transform then
-            -- safely remove items while iterating
-            local i = 1
-            while i <= #data do
-              local v = fn_transform(data[i], opts)
-              if not v then
-                table.remove(data, i)
-              else
-                data[i] = v
-                i = i + 1
-              end
-            end
-          end
-          data = #data > 0 and (table.concat(data, EOL) .. EOL) or ""
-        end
         uv.write(pipe, tostring(data), function(err)
           write_cb_count = write_cb_count - 1
           if cb then cb(err) end
@@ -388,9 +364,6 @@ M.stringify = function(contents, opts, fzf_field_index)
     end
 
     if type(contents) == "string" then
-      -- Use queue in libuv.spawn by default
-      opts.use_queue = opts.use_queue == nil and true or opts.use_queue
-
       -- Throttle pipe writes by default
       -- opts.throttle = opts.throttle == nil and true or opts.throttle
 
@@ -410,18 +383,11 @@ M.stringify = function(contents, opts, fzf_field_index)
         cmd = contents,
         env = env,
         cb_finish = on_finish,
-        -- cb_write_lines = on_write,
         cb_write = on_write,
         cb_pid = function(pid) if opts.PidObject then opts.PidObject:set(pid) end end,
-        process1 = opts.process1,
-        profiler = opts.profiler,
-        use_queue = opts.use_queue,
         EOL = EOL,
         opts = opts,
-        -- Must send value, 'coroutinify' adds callback as last argument
-        -- which will conflict with the 'fn_transform' argument
-        -- send true to force line processing without transformation
-      }, fn_transform)
+      })
     else
       -- callback with newline
       local on_write_nl = function(data, cb)