Skip to content

Commit 4971b97

Browse files
authored
fix: wire up buffer_changed event, fix diagnostics final severity, fix test (#1237)
1 parent f86e871 commit 4971b97

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

lua/neo-tree/setup/init.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ local define_events = function()
5454

5555
events.define_autocmd_event(events.VIM_AFTER_SESSION_LOAD, { "SessionLoadPost" }, 200)
5656
events.define_autocmd_event(events.VIM_BUFFER_ADDED, { "BufAdd" }, 200, update_opened_buffers)
57+
events.define_autocmd_event(events.VIM_BUFFER_CHANGED, { "BufWritePost" }, 200)
5758
events.define_autocmd_event(
5859
events.VIM_BUFFER_DELETED,
5960
{ "BufDelete" },

lua/neo-tree/utils/init.lua

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,25 @@ M.get_diagnostic_counts = function()
248248

249249
if #diagnostics > 0 then
250250
local severity_string = diag_severity_to_string(severity)
251-
if lookup[file_name] == nil then
252-
lookup[file_name] = {
251+
-- Get or create the entry for this file
252+
local entry = lookup[file_name]
253+
if entry == nil then
254+
entry = {
253255
severity_number = severity,
254256
severity_string = severity_string,
255257
}
258+
lookup[file_name] = entry
256259
end
260+
-- Set the count for this diagnostic type
257261
if severity_string ~= nil then
258-
lookup[file_name][severity_string] = #diagnostics
262+
entry[severity_string] = #diagnostics
263+
end
264+
265+
-- Set the overall severity to the most severe so far
266+
-- Error = 1, Warn = 2, Info = 3, Hint = 4
267+
if severity < entry.severity_number then
268+
entry.severity_number = severity
269+
entry.severity_string = severity_string
259270
end
260271
end
261272
end

tests/neo-tree/sources/filesystem/filesystem_netrw_hijack_spec.lua

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,6 @@ describe("Filesystem netrw hijack", function()
7373

7474
assert(#vim.api.nvim_list_wins() == 1, "Test should start with one window")
7575

76-
vim.cmd("edit .")
77-
78-
verify.eventually(200, function()
79-
assert(#vim.api.nvim_list_wins() == 1, "`edit .` should not open a new window")
80-
return vim.api.nvim_buf_get_option(0, "filetype") == "neo-tree"
81-
end, "neotree is not the only window")
82-
8376
vim.cmd("split .")
8477

8578
verify.eventually(200, function()

0 commit comments

Comments
 (0)