Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(renderer): check if current buffer is loaded #1406

Merged
merged 4 commits into from
Mar 21, 2024
Merged

fix(renderer): check if current buffer is loaded #1406

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19e3319
fix(renderer): check if current buffer is loaded
pysan3 Mar 20, 2024
7e1c333
fix(renderer): supply state.bufnr to tree on initialization
pysan3 Mar 20, 2024
934935a
fix(renderer): don't close buffer when toggled on
pysan3 Mar 21, 2024
2047d77
Merge branch 'main' into fix-check-buf-available
cseickel Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lua/neo-tree/ui/renderer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,14 @@ M.close = function(state, focus_prior_window)
end
state.winid = nil
end
local bufnr = utils.get_value(state, "bufnr", 0, true)
if bufnr > 0 and vim.api.nvim_buf_is_valid(bufnr) then
if window_existed then
local bufnr = utils.get_value(state, "bufnr", 0, true)
state.bufnr = nil
local success, err = pcall(vim.api.nvim_buf_delete, bufnr, { force = true })
if not success and err:match("E523") then
vim.schedule_wrap(function()
vim.schedule(function()
if bufnr > 0 and vim.api.nvim_buf_is_valid(bufnr) then
vim.api.nvim_buf_delete(bufnr, { force = true })
end)()
end
end
end)
end
return window_existed
end
Expand Down Expand Up @@ -781,6 +780,7 @@ create_tree = function(state)
state.tree = NuiTree({
ns_id = highlights.ns_id,
winid = state.winid,
bufnr = state.bufnr,
get_node_id = function(node)
return node.id
end,
Expand Down Expand Up @@ -1090,7 +1090,7 @@ M.window_exists = function(state)
window_exists = false
elseif position == "current" then
window_exists = vim.api.nvim_win_is_valid(winid)
and vim.api.nvim_buf_is_valid(bufnr)
and vim.api.nvim_buf_is_loaded(bufnr)
and vim.api.nvim_win_get_buf(winid) == bufnr
else
local isvalid = M.is_window_valid(winid)
Expand Down
Loading