chore: remove loadstring

Author: phanen

lua/fzf-lua/actions.lua

@@ -136,8 +136,7 @@ M.dummy_abort = function(_, o)
 end
 
 M.resume = function(_, _)
-  -- call via loadstring to prevent a circular ref
-  loadstring([[require("fzf-lua").resume()]])()
+  require("fzf-lua").resume()
 end
 
 ---@param _vimcmd string
@@ -526,7 +525,7 @@ end
 M.run_builtin = function(selected)
   if #selected == 0 then return end
   local method = selected[1]
-  pcall(loadstring(string.format("require'fzf-lua'.%s()", method)))
+  pcall(require "fzf-lua"[method])
 end
 
 M.ex_run = function(selected)
@@ -1098,7 +1097,7 @@ M.apply_profile = function(selected, opts)
   local profile = entry.stripped:sub(#fname + 2):match("[^%s]+")
   local ok = utils.load_profile_fname(fname, profile, opts.silent)
   if ok then
-    loadstring(string.format([[require("fzf-lua").setup({"%s"})]], profile))()
+    require("fzf-lua").setup({ profile })
   end
 end
 

lua/fzf-lua/init.lua

@@ -322,16 +322,15 @@ M.get_last_query = function()
 end
 
 M.setup_fzfvim_cmds = function(...)
-  local fn = loadstring("return require'fzf-lua.profiles.fzf-vim'.fn_load")()
-  return fn(...)
+  return require("fzf-lua.profiles.fzf-vim").fn_load(...)
 end
 
 function M.hide()
-  return loadstring("return require'fzf-lua'.win.hide()")()
+  return FzfLua.win.hide()
 end
 
 function M.unhide()
-  return loadstring("return require'fzf-lua'.win.unhide()")()
+  return FzfLua.win.unhide()
 end
 
 -- export the defaults module and deref

lua/fzf-lua/shell.lua

@@ -134,9 +134,8 @@ function M.pipe_wrap_fn(fn, fzf_field_index, debug)
       end, args[1])
     end
     -- save selected item in main module's __INFO
-    -- use loadstring to avoid circular require
     pcall(function()
-      local module = loadstring("return require'fzf-lua'")()
+      local module = require("fzf-lua")
       if module then
         module.__INFO = vim.tbl_deep_extend("force",
           module.__INFO or {}, { selected = args[1][1] })

lua/fzf-lua/utils.lua

@@ -816,42 +816,36 @@ function M.fzf_exit()
   -- when no results are found or when `jump1` is used, when the latter is used
   -- in "sync" mode we also need to make sure core.__CTX is cleared or we'll
   -- have the wrong cursor coordinates (#928)
-  return loadstring([[
-    require('fzf-lua').core.__CTX = nil
-    require('fzf-lua').win.win_leave()
-  ]])()
+  require("fzf-lua").core.__CTX = nil
+  require("fzf-lua").win.win_leave()
 end
 
 function M.fzf_winobj()
-  -- use 'loadstring' to prevent circular require
-  return loadstring("return require'fzf-lua'.win.__SELF()")()
+  return require("fzf-lua").win.__SELF()
 end
 
 function M.CTX(...)
-  return loadstring("return require'fzf-lua'.core.CTX(...)")(...)
+  return require("fzf-lua").core.CTX(...)
 end
 
 function M.__CTX()
-  return loadstring("return require'fzf-lua'.core.__CTX")()
+  return require("fzf-lua").core.__CTX
 end
 
 function M.resume_get(what, opts)
-  local f = loadstring("return require'fzf-lua'.config.resume_get")()
-  return f(what, opts)
+  return require("fzf-lua").config.resume_get(what, opts)
 end
 
 M.resume_set = function(what, val, opts)
-  local f = loadstring("return require'fzf-lua'.config.resume_set")()
-  return f(what, val, opts)
+  return require("fzf-lua").config.resume_set(what, val, opts)
 end
 
 function M.reset_info()
-  pcall(loadstring("require'fzf-lua'.set_info(nil)"))
+  pcall(require("fzf-lua").set_info, nil)
 end
 
 function M.setup_highlights(override)
-  pcall(loadstring(string.format(
-    "require'fzf-lua'.setup_highlights(%s)", override and "true" or "")))
+  pcall(require("fzf-lua").setup_highlights, override and "true" or "")
 end
 
 ---@param fname string