leigh/nvim-cmp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mapping normalization order

Browse Source
This commit is contained in:
hrsh7th
2022-04-14 02:37:21 +09:00
parent f4b3dda782
commit 0c1f37c518
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lua/cmp/config.lua
View File

@@ -82,7 +82,7 @@ config.get = function()
global_config.revision or 0,
onetime_config.revision or 0,
}, function()
return config.normalize(misc.merge(onetime_config, global_config))
return misc.merge(config.normalize(onetime_config), config.normalize(global_config))
end)
elseif api.is_cmdline_mode() then
local cmdtype = vim.fn.getcmdtype()
@@ -94,7 +94,7 @@ config.get = function()
cmdtype,
cmdline_config.revision or 0,
}, function()
return config.normalize(misc.merge(cmdline_config, global_config))
return misc.merge(config.normalize(cmdline_config), misc.merge(global_config))
end)
else
local bufnr = vim.api.nvim_get_current_buf()
@@ -111,9 +111,9 @@ config.get = function()
buffer_config.revision or 0,
}, function()
local c = {}
c = config.normalize(misc.merge(c, buffer_config))
c = config.normalize(misc.merge(c, filetype_config))
c = config.normalize(misc.merge(c, global_config))
c = misc.merge(config.normalize(c), config.normalize(buffer_config))
c = misc.merge(config.normalize(c), config.normalize(filetype_config))
c = misc.merge(config.normalize(c), config.normalize(global_config))
return c
end)
end