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

Fix onetime configuration handling

Browse Source
This commit is contained in:
hrsh7th
2022-08-20 20:27:16 +09:00
parent 27bc575d1e
commit db261b4e2b
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lua/cmp/config.lua
View File

@@ -74,7 +74,9 @@ end
---@return cmp.ConfigSchema ---@return cmp.ConfigSchema
config.get = function() config.get = function()
local global_config = config.global local global_config = config.global
if config.onetime and not vim.tbl_isempty(config.onetime) then
-- The config object already has `revision` key.
if #vim.tbl_keys(config.onetime) > 1 then
local onetime_config = config.onetime local onetime_config = config.onetime
return config.cache:ensure({ return config.cache:ensure({
'get', 'get',

7
lua/cmp/view.lua
View File

@@ -209,9 +209,16 @@ view._get_entries_view = function(self)
local c = config.get() local c = config.get()
local v = self.custom_entries_view local v = self.custom_entries_view
if (c.view and c.view.entries and (c.view.entries.name or c.view.entries)) == 'wildmenu' then if (c.view and c.view.entries and (c.view.entries.name or c.view.entries)) == 'wildmenu' then
self.custom_entries_view:close()
self.native_entries_view:close()
v = self.wildmenu_entries_view v = self.wildmenu_entries_view
elseif (c.view and c.view.entries and (c.view.entries.name or c.view.entries)) == 'native' then elseif (c.view and c.view.entries and (c.view.entries.name or c.view.entries)) == 'native' then
self.custom_entries_view:close()
self.wildmenu_entries_view:close()
v = self.native_entries_view v = self.native_entries_view
else
self.native_entries_view:close()
self.wildmenu_entries_view:close()
end end
v.event:on('change', function() v.event:on('change', function()
self:on_entry_change() self:on_entry_change()