From 370e6ff076cc79b20dc133b90d1ea40959ba9ca4 Mon Sep 17 00:00:00 2001 From: hrsh7th Date: Sun, 10 Oct 2021 12:23:39 +0900 Subject: [PATCH] Use nvim_win_hide instead o nvim_win_close for supporting custom menu on cmdwin --- lua/cmp/utils/misc.lua | 6 ------ lua/cmp/utils/window.lua | 10 +++++----- lua/cmp/view.lua | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lua/cmp/utils/misc.lua b/lua/cmp/utils/misc.lua index 79a1461..8378b03 100644 --- a/lua/cmp/utils/misc.lua +++ b/lua/cmp/utils/misc.lua @@ -15,12 +15,6 @@ misc.concat = function(list1, list2) return new_list end ----Return is cmdwin or not. ----@return boolean -misc.is_cmdwin = function() - return vim.fn.getcmdwintype() ~= '' -end - ---Get cursor before line ---@return string misc.get_cursor_before_line = function() diff --git a/lua/cmp/utils/window.lua b/lua/cmp/utils/window.lua index c612748..871a9f6 100644 --- a/lua/cmp/utils/window.lua +++ b/lua/cmp/utils/window.lua @@ -144,11 +144,11 @@ window.update = function(self) end else if self.swin1 and vim.api.nvim_win_is_valid(self.swin1) then - vim.api.nvim_win_close(self.swin1, true) + vim.api.nvim_win_hide(self.swin1) self.swin1 = nil end if self.swin2 and vim.api.nvim_win_is_valid(self.swin2) then - vim.api.nvim_win_close(self.swin2, true) + vim.api.nvim_win_hide(self.swin2) self.swin2 = nil end end @@ -161,15 +161,15 @@ window.close = function(self) if id == self.id then if self.win and vim.api.nvim_win_is_valid(self.win) then if self.win and vim.api.nvim_win_is_valid(self.win) then - vim.api.nvim_win_close(self.win, true) + vim.api.nvim_win_hide(self.win) self.win = nil end if self.swin1 and vim.api.nvim_win_is_valid(self.swin1) then - vim.api.nvim_win_close(self.swin1, false) + vim.api.nvim_win_hide(self.swin1) self.swin1 = nil end if self.swin2 and vim.api.nvim_win_is_valid(self.swin2) then - vim.api.nvim_win_close(self.swin2, false) + vim.api.nvim_win_hide(self.swin2) self.swin2 = nil end end diff --git a/lua/cmp/view.lua b/lua/cmp/view.lua index e4e3bef..1abd0da 100644 --- a/lua/cmp/view.lua +++ b/lua/cmp/view.lua @@ -158,7 +158,7 @@ view._get_entries_view = function(self) self.native_entries_view.event:clear() self.custom_entries_view.event:clear() - if c.experimental.native_menu or misc.is_cmdwin() then + if c.experimental.native_menu then self.native_entries_view.event:on('change', function() self:on_entry_change() end)