Use nvim_win_hide instead o nvim_win_close for supporting custom menu on cmdwin

This commit is contained in:
hrsh7th
2021-10-10 12:23:39 +09:00
parent babb8023c6
commit 370e6ff076
3 changed files with 6 additions and 12 deletions

View File

@@ -15,12 +15,6 @@ misc.concat = function(list1, list2)
return new_list return new_list
end end
---Return is cmdwin or not.
---@return boolean
misc.is_cmdwin = function()
return vim.fn.getcmdwintype() ~= ''
end
---Get cursor before line ---Get cursor before line
---@return string ---@return string
misc.get_cursor_before_line = function() misc.get_cursor_before_line = function()

View File

@@ -144,11 +144,11 @@ window.update = function(self)
end end
else else
if self.swin1 and vim.api.nvim_win_is_valid(self.swin1) then 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 self.swin1 = nil
end end
if self.swin2 and vim.api.nvim_win_is_valid(self.swin2) then 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 self.swin2 = nil
end end
end end
@@ -161,15 +161,15 @@ window.close = function(self)
if id == self.id then 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
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 self.win = nil
end end
if self.swin1 and vim.api.nvim_win_is_valid(self.swin1) then 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 self.swin1 = nil
end end
if self.swin2 and vim.api.nvim_win_is_valid(self.swin2) then 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 self.swin2 = nil
end end
end end

View File

@@ -158,7 +158,7 @@ view._get_entries_view = function(self)
self.native_entries_view.event:clear() self.native_entries_view.event:clear()
self.custom_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.native_entries_view.event:on('change', function()
self:on_entry_change() self:on_entry_change()
end) end)