antifallobst
/
neovim-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Typecheck return value of chadrc; propagate errors 

* Don't blindly assume the only way `require "custom/chadrc.lua" can
  fail is that the file doesn't exist.
* Provide user with a more useful message when return value is wrong
This commit is contained in:
Justin Perez 2022-04-10 06:06:05 -05:00 committed by siduck
parent 3d78ef3474
commit 6061f9455d
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lua/core/utils.lua
View File

@ -141,12 +141,16 @@ end
M.load_config = function() M.load_config = function()
local conf = require "core.default_config" local conf = require "core.default_config"
local chadrcExists, change = pcall(require, "custom.chadrc") -- attempt to load and merge a user config
local chadrc_exists = vim.fn.filereadable(vim.fn.stdpath "config" .. "/lua/custom/chadrc.lua") == 1
-- if chadrc exists , then merge its table into the default config's if chadrc_exists then
-- merge user config if it exists and is a table; otherwise display an error
if chadrcExists then local user_config = require "custom.chadrc"
conf = vim.tbl_deep_extend("force", conf, change) if type(user_config) == 'table' then
conf = vim.tbl_deep_extend("force", conf, user_config)
else
error("User config (chadrc.lua) *must* return a table!")
end
end end
return conf return conf