fix(lazydev): only add configuration as necessary

AstroNvim · Jul 25, 2024 · c40c17b · c40c17b
1 parent e7de18b
commit c40c17b
Showing 1 changed file with 22 additions and 11 deletions.
diff --git a/lua/astrocommunity/neovim-lua-development/lazydev-nvim/init.lua b/lua/astrocommunity/neovim-lua-development/lazydev-nvim/init.lua
@@ -2,23 +2,34 @@ return {
   "folke/lazydev.nvim",
   ft = "lua",
   cmd = "LazyDev",
-  opts = {
-    library = {
-      { path = "luvit-meta/library", words = { "vim%.uv" } },
-      { path = "astrocore", words = { "AstroCore" } },
-      { path = "astrolsp", words = { "AstroLSP" } },
-      { path = "astroui", words = { "AstroUI" } },
-      { path = "astrotheme", words = { "AstroTheme" } },
-      { path = "lazy.nvim", words = { "Lazy" } },
-    },
-  },
+  opts = function(_, opts)
+    if not opts.library then
+      opts.library = {
+        { path = "luvit-meta/library", words = { "vim%.uv" } },
+        { path = "astrocore", words = { "AstroCore" } },
+        { path = "astrolsp", words = { "AstroLSP" } },
+        { path = "astroui", words = { "AstroUI" } },
+        { path = "astrotheme", words = { "AstroTheme" } },
+        { path = "lazy.nvim", words = { "Lazy" } },
+      }
+    end
+  end,
   specs = {
     { "folke/neodev.nvim", optional = true, enabled = false },
     { "Bilal2453/luvit-meta", lazy = true },
     {
       "hrsh7th/nvim-cmp",
       optional = true,
-      opts = function(_, opts) table.insert(opts.sources, { name = "lazydev", group_index = 0 }) end,
+      opts = function(_, opts)
+        local lazydev_inserted
+        for _, source in ipairs(opts.sources or {}) do
+          if (type(source) == "table" and source.name or source) == "lazydev" then
+            lazydev_inserted = true
+            break
+          end
+        end
+        if not lazydev_inserted then table.insert(opts.sources, { name = "lazydev", group_index = 0 }) end
+      end,
     },
   },
 }