fix completion

20 files changed, 23 insertions, 22 deletions

diff --git a/lua/lvim/core/alpha.lua b/lua/lvim/core/alpha.lua
index 3150152c..d49a4d0f 100644
--- a/lua/lvim/core/alpha.lua
+++ b/lua/lvim/core/alpha.lua
@@ -15,7 +15,7 @@ function M.config()
     mode = "dashboard",
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.alpha = config
 end
 
diff --git a/lua/lvim/core/autopairs.lua b/lua/lvim/core/autopairs.lua
index 3dfb47ee..7f6def4d 100644
--- a/lua/lvim/core/autopairs.lua
+++ b/lua/lvim/core/autopairs.lua
@@ -43,7 +43,7 @@ function M.config()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.autopairs = config
 end
 
diff --git a/lua/lvim/core/breadcrumbs.lua b/lua/lvim/core/breadcrumbs.lua
index e4e6d8d8..e962c4a7 100644
--- a/lua/lvim/core/breadcrumbs.lua
+++ b/lua/lvim/core/breadcrumbs.lua
@@ -76,7 +76,7 @@ M.config = function()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.breadcrumbs = config
 end
 
diff --git a/lua/lvim/core/bufferline.lua b/lua/lvim/core/bufferline.lua
index 1ecdffba..bb3afd80 100644
--- a/lua/lvim/core/bufferline.lua
+++ b/lua/lvim/core/bufferline.lua
@@ -141,7 +141,7 @@ M.config = function()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.bufferline = config
 end
 
diff --git a/lua/lvim/core/builtins/init.lua b/lua/lvim/core/builtins/init.lua
index 3373c60f..43180eed 100644
--- a/lua/lvim/core/builtins/init.lua
+++ b/lua/lvim/core/builtins/init.lua
@@ -28,13 +28,14 @@ local builtins = {
   "mason",
 }
 
-function M.defaults()
-  return { active = true }
+function M.extend_defaults(config)
+  config.active = true
 end
 
 function M.init()
   for _, name in ipairs(builtins) do
-    lvim.builtin[name] = M.defaults()
+    lvim.builtin[name] = {}
+    M.extend_defaults(lvim.builtin[name])
   end
 
   reload("lvim.core.theme").config()
diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/cmp.lua
index b62433dc..db16d84a 100644
--- a/lua/lvim/core/cmp.lua
+++ b/lua/lvim/core/cmp.lua
@@ -353,7 +353,7 @@ M.config = function()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.cmp = config
 end
 
diff --git a/lua/lvim/core/comment.lua b/lua/lvim/core/comment.lua
index 811ffdac..48e776de 100644
--- a/lua/lvim/core/comment.lua
+++ b/lua/lvim/core/comment.lua
@@ -71,7 +71,7 @@ function M.config()
     post_hook = nil,
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.comment = config
 end
 
diff --git a/lua/lvim/core/dap.lua b/lua/lvim/core/dap.lua
index afadab1d..9ad84b96 100644
--- a/lua/lvim/core/dap.lua
+++ b/lua/lvim/core/dap.lua
@@ -94,7 +94,7 @@ M.config = function()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.dap = config
 end
 
diff --git a/lua/lvim/core/gitsigns.lua b/lua/lvim/core/gitsigns.lua
index 7f425542..1e1f4df9 100644
--- a/lua/lvim/core/gitsigns.lua
+++ b/lua/lvim/core/gitsigns.lua
@@ -68,7 +68,7 @@ M.config = function()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.gitsigns = config
 end
 
diff --git a/lua/lvim/core/illuminate.lua b/lua/lvim/core/illuminate.lua
index 8ab606e4..dbed9c3a 100644
--- a/lua/lvim/core/illuminate.lua
+++ b/lua/lvim/core/illuminate.lua
@@ -50,7 +50,7 @@ M.config = function()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.illuminate = config
 end
 
diff --git a/lua/lvim/core/indentlines.lua b/lua/lvim/core/indentlines.lua
index 66555b23..1d134a4a 100644
--- a/lua/lvim/core/indentlines.lua
+++ b/lua/lvim/core/indentlines.lua
@@ -24,7 +24,7 @@ M.config = function()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.indentlines = config
 end
 
diff --git a/lua/lvim/core/lir.lua b/lua/lvim/core/lir.lua
index 4a3b2c09..af3e1840 100644
--- a/lua/lvim/core/lir.lua
+++ b/lua/lvim/core/lir.lua
@@ -71,7 +71,7 @@ M.config = function()
     end,
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.lir = config
 end
 
diff --git a/lua/lvim/core/lualine/init.lua b/lua/lvim/core/lualine/init.lua
index 350436ec..9759d5a0 100644
--- a/lua/lvim/core/lualine/init.lua
+++ b/lua/lvim/core/lualine/init.lua
@@ -32,7 +32,7 @@ M.config = function()
     extensions = nil,
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.lualine = config
 end
 
diff --git a/lua/lvim/core/mason.lua b/lua/lvim/core/mason.lua
index 68201549..a6613897 100644
--- a/lua/lvim/core/mason.lua
+++ b/lua/lvim/core/mason.lua
@@ -51,7 +51,7 @@ function M.config()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.mason = config
 end
 
diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua
index 4b8033c0..9f8495e1 100644
--- a/lua/lvim/core/nvimtree.lua
+++ b/lua/lvim/core/nvimtree.lua
@@ -231,7 +231,7 @@ function M.config()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.nvimtree = config
 end
 
diff --git a/lua/lvim/core/project.lua b/lua/lvim/core/project.lua
index 71aed54b..cf96d842 100644
--- a/lua/lvim/core/project.lua
+++ b/lua/lvim/core/project.lua
@@ -45,7 +45,7 @@ function M.config()
     datapath = get_cache_dir(),
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.project = config
 end
 
diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua
index ecb0c3bc..74163b6c 100644
--- a/lua/lvim/core/telescope.lua
+++ b/lua/lvim/core/telescope.lua
@@ -105,7 +105,7 @@ function M.config()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.telescope = config
 end
 
diff --git a/lua/lvim/core/terminal.lua b/lua/lvim/core/terminal.lua
index e7b57387..e9c46182 100644
--- a/lua/lvim/core/terminal.lua
+++ b/lua/lvim/core/terminal.lua
@@ -45,7 +45,7 @@ M.config = function()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.terminal = config
 end
 
diff --git a/lua/lvim/core/treesitter.lua b/lua/lvim/core/treesitter.lua
index 9371b89c..c7ab4382 100644
--- a/lua/lvim/core/treesitter.lua
+++ b/lua/lvim/core/treesitter.lua
@@ -92,7 +92,7 @@ function M.config()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.treesitter = config
 end
 
diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index b6ef4873..ddfd7904 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -296,7 +296,7 @@ M.config = function()
     },
   }
   ---@cast config +LvimBuiltin
-  config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
+  require("lvim.core.builtins").extend_defaults(config)
   lvim.builtin.which_key = config
 end