PlexSheep
/
neovim-confs
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix: `default_config` var `plugin` -> `plugins` instead

This commit is contained in:
Galen Rowell 2021-09-27 18:01:03 +10:00 committed by siduck76
parent f2a0051aa9
commit 94b01be483
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/core/default_config.lua
View File

@ -2,7 +2,7 @@
-- use custom/chadrc.lua instead -- use custom/chadrc.lua instead
local M = {} local M = {}
M.options, M.ui, M.mappings, M.plugin = {}, {}, {}, {} M.options, M.ui, M.mappings, M.plugins = {}, {}, {}, {}
-- non plugin normal, available without any plugins -- non plugin normal, available without any plugins
M.options = { M.options = {
@ -99,7 +99,7 @@ M.plugins = {
style = "default", style = "default",
}, },
autosave = false, -- autosave on changed text or insert mode leave autosave = false, -- autosave on changed text or insert mode leave
-- timeout to be used for using escape with a key combination, see mappings.plugin.better_escape -- timeout to be used for using escape with a key combination, see mappings.plugins.better_escape
esc_insertmode_timeout = 300, esc_insertmode_timeout = 300,
}, },
default_plugin_config_replace = {}, default_plugin_config_replace = {},

6
lua/core/utils.lua
View File

@ -147,7 +147,7 @@ M.load_config = function(reload)
-- these are the table value which will be always prioritiezed to take user config value -- these are the table value which will be always prioritiezed to take user config value
local to_replace = { local to_replace = {
"['mappings']['plugin']['esc_insertmode']", "['mappings']['plugins']['esc_insertmode']",
"['mappings']['terminal']['esc_termmode']", "['mappings']['terminal']['esc_termmode']",
"['mappings']['terminal']['esc_hide_termmode']", "['mappings']['terminal']['esc_hide_termmode']",
} }
@ -243,7 +243,7 @@ end
-- 1st arg - base table -- 1st arg - base table
-- 2nd arg - table to merge -- 2nd arg - table to merge
-- 3rg arg - list of nodes as a table, if the node is found replace the from table2 to result, rather than adding the value -- 3rg arg - list of nodes as a table, if the node is found replace the from table2 to result, rather than adding the value
-- e.g: merge_table(t1, t2, { ['plugin']['truezen']['mappings'] }) -- e.g: merge_table(t1, t2, { ['mappings']['plugins']['bufferline'] })
M.merge_table = function(into, from, nodes_to_replace) M.merge_table = function(into, from, nodes_to_replace)
-- make sure both are table -- make sure both are table
if type(into) ~= "table" or type(from) ~= "table" then if type(into) ~= "table" or type(from) ~= "table" then
@ -272,7 +272,7 @@ end]]
end end
for _, node in ipairs(nodes_to_replace) do for _, node in ipairs(nodes_to_replace) do
-- pcall() is a poor workaround for if "['mappings']['plugin']['esc_insertmode']" 'plugin' sub-table does not exist -- pcall() is a poor workaround for if "['mappings']['plugins']['esc_insertmode']" 'plugins' sub-table does not exist
local ok, result = pcall(replace_fn, node) local ok, result = pcall(replace_fn, node)
if ok then if ok then
-- if the node is found then replace -- if the node is found then replace