lazyvim: extract opts function into util/lazy

diff --git a/nvim/lua/plugins/lsp/init.lua b/nvim/lua/plugins/lsp/init.lua
index d32e76c8b333359fdc3fe160ebebe95eeeb63c25..af50c8ca1438344f2e1b68dab2f34392aa438bcf 100644 (file)
--- a/nvim/lua/plugins/lsp/init.lua
+++ b/nvim/lua/plugins/lsp/init.lua
@@ -128,7 +128,7 @@ return {
         ensure_installed = vim.tbl_deep_extend(
           "force",
           ensure_installed,
         ensure_installed = vim.tbl_deep_extend(
           "force",
           ensure_installed,

-          LazyVim.opts("mason-lspconfig.nvim").ensure_installed or {}
+          rmz.lazy.opts("mason-lspconfig.nvim").ensure_installed or {}

         ),
         handlers = { setup },
       })
         ),
         handlers = { setup },
       })

diff --git a/nvim/lua/plugins/lsp/keymaps.lua b/nvim/lua/plugins/lsp/keymaps.lua
index 7cb2b49831aeeb16901d4bf3c447f4722c1b822a..42e210b53d6bf121855d2659526b5116dfa7e178 100644 (file)
--- a/nvim/lua/plugins/lsp/keymaps.lua
+++ b/nvim/lua/plugins/lsp/keymaps.lua
@@ -68,7 +68,7 @@ function M.resolve(buffer)
     return {}
   end
   local spec = vim.tbl_extend("force", {}, M.get())
     return {}
   end
   local spec = vim.tbl_extend("force", {}, M.get())

-  local opts = LazyVim.opts("nvim-lspconfig")
+  local opts = rmz.lazy.opts("nvim-lspconfig")

   local clients = rmz.lsp.get_clients({ bufnr = buffer })
   for _, client in ipairs(clients) do
     local maps = opts.servers[client.name] and opts.servers[client.name].keys or {}
   local clients = rmz.lsp.get_clients({ bufnr = buffer })
   for _, client in ipairs(clients) do
     local maps = opts.servers[client.name] and opts.servers[client.name].keys or {}

diff --git a/nvim/lua/rmz/util/init.lua b/nvim/lua/rmz/util/init.lua
index 7d519f1b085b6185fcc01748f512d0421d7b4222..54d8f6b7dec0ccf867d4333d175b6cd8dd83f76c 100644 (file)
--- a/nvim/lua/rmz/util/init.lua
+++ b/nvim/lua/rmz/util/init.lua
@@ -1,6 +1,7 @@
 ---@class rmz.util
 local M = {
   ui  = require("rmz.util.ui"),
 ---@class rmz.util
 local M = {
   ui  = require("rmz.util.ui"),

+  lazy = require("rmz.util.lazy"),

   lsp = require("rmz.util.lsp"),
 }
 
   lsp = require("rmz.util.lsp"),
 }
 

diff --git a/nvim/lua/rmz/util/lazy.lua b/nvim/lua/rmz/util/lazy.lua
new file mode 100644 (file)
index 0000000..9a64c69
--- /dev/null
+++ b/nvim/lua/rmz/util/lazy.lua
@@ -0,0 +1,19 @@
+---@class rmz.util.lazy
+local M = {}
+
+---@param name string
+function M.get_plugin(name)
+  return require("lazy.core.config").spec.plugins[name]
+end
+
+---@param name string
+function M.opts(name)
+  local plugin = M.get_plugin(name)
+  if not plugin then
+    return {}
+  end
+  local Plugin = require("lazy.core.plugin")
+  return Plugin.values(plugin, "opts", false)
+end
+
+return M