Add toggle functionality

- Ensure that preview window always closes on symbol window exit
This commit is contained in:
Omar Zeghouani
2021-08-19 18:55:11 +01:00
parent a1dd300530
commit 23f1299869
2 changed files with 35 additions and 19 deletions

View File

@@ -22,9 +22,7 @@ local function setup_global_autocmd()
vim.cmd( vim.cmd(
"au InsertLeave,WinEnter,BufEnter,BufWinEnter,TabEnter,BufWritePost * :lua require('symbols-outline')._refresh()") "au InsertLeave,WinEnter,BufEnter,BufWinEnter,TabEnter,BufWritePost * :lua require('symbols-outline')._refresh()")
vim.cmd "au BufLeave * lua require'symbols-outline'._prevent_buffer_override()" vim.cmd "au BufLeave * lua require'symbols-outline'._prevent_buffer_override()"
if config.options.auto_preview then vim.cmd("au WinEnter * lua require'symbols-outline.preview'.close()")
vim.cmd "au WinEnter * lua require'symbols-outline.preview'.close_if_not_in_outline()"
end
if config.options.highlight_hovered_item then if config.options.highlight_hovered_item then
vim.cmd( vim.cmd(
"autocmd CursorHold * :lua require('symbols-outline')._highlight_current_item()") "autocmd CursorHold * :lua require('symbols-outline')._highlight_current_item()")
@@ -34,8 +32,12 @@ end
local function setup_buffer_autocmd() local function setup_buffer_autocmd()
if config.options.auto_preview then if config.options.auto_preview then
vim.cmd( vim.cmd(
"au CursorHold <buffer> lua require'symbols-outline.preview'.show()") "au CursorHold <buffer> lua require'symbols-outline.preview'.show(true)")
else
vim.cmd(
"au CursorMoved <buffer> lua require'symbols-outline.preview'.close()")
end end
end end
local function getParams() local function getParams()
@@ -216,7 +218,7 @@ local function setup_keymaps(bufnr)
":lua require('symbols-outline.hover').show_hover()<Cr>") ":lua require('symbols-outline.hover').show_hover()<Cr>")
-- preview symbol -- preview symbol
nmap(config.options.keymaps.preview_symbol, nmap(config.options.keymaps.preview_symbol,
":lua require('symbols-outline.preview').show()<Cr>") ":lua require('symbols-outline.preview').toggle()<Cr>")
-- rename symbol -- rename symbol
nmap(config.options.keymaps.rename_symbol, nmap(config.options.keymaps.rename_symbol,
":lua require('symbols-outline.rename').rename()<Cr>") ":lua require('symbols-outline.rename').rename()<Cr>")

View File

@@ -135,18 +135,6 @@ local function setup_hover_buf()
update_hover() update_hover()
end end
function M.close_if_not_in_outline()
if not is_current_win_outline() and has_code_win() then
if state.preview_win ~= nil and
vim.api.nvim_win_is_valid(state.preview_win) then
vim.api.nvim_win_close(state.preview_win, true)
end
if state.hover_win ~= nil and vim.api.nvim_win_is_valid(state.hover_win) then
vim.api.nvim_win_close(state.hover_win, true)
end
end
end
local function show_preview() local function show_preview()
if state.preview_win == nil and state.preview_buf == nil then if state.preview_win == nil and state.preview_buf == nil then
state.preview_buf = vim.api.nvim_create_buf(false, true) state.preview_buf = vim.api.nvim_create_buf(false, true)
@@ -198,12 +186,38 @@ local function show_hover()
end end
end end
function M.show() function M.show(force)
if not is_current_win_outline() or #vim.api.nvim_list_wins() < 2 then if not is_current_win_outline() or
#vim.api.nvim_list_wins() < 2 then
return return
end end
if force ~= true and state.preview_win ~= nil then
return 1
end
show_preview() show_preview()
show_hover() show_hover()
end end
function M.close()
if has_code_win() then
if state.preview_win ~= nil and
vim.api.nvim_win_is_valid(state.preview_win) then
vim.api.nvim_win_close(state.preview_win, true)
end
if state.hover_win ~= nil and
vim.api.nvim_win_is_valid(state.hover_win) then
vim.api.nvim_win_close(state.hover_win, true)
end
end
end
function M.toggle()
code = M.show()
if code == 1 then
M.close()
end
end
return M return M