From 2e3308d95de6b0632041d0253d6d3b1a0735fc15 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Sun, 15 Mar 2026 12:39:32 -0400 Subject: [PATCH] ci: format --- lua/diffs/init.lua | 9 ++- spec/highlight_spec.lua | 152 +++++++++++++++++++++------------------- 2 files changed, 86 insertions(+), 75 deletions(-) diff --git a/lua/diffs/init.lua b/lua/diffs/init.lua index 327318e..585f187 100644 --- a/lua/diffs/init.lua +++ b/lua/diffs/init.lua @@ -522,8 +522,13 @@ end ---@param start_row integer ---@param end_row integer local function clear_ns_by_start(bufnr, ns_id, start_row, end_row) - local marks = - vim.api.nvim_buf_get_extmarks(bufnr, ns_id, { start_row, 0 }, { end_row - 1, 2147483647 }, {}) + local marks = vim.api.nvim_buf_get_extmarks( + bufnr, + ns_id, + { start_row, 0 }, + { end_row - 1, 2147483647 }, + {} + ) for _, m in ipairs(marks) do vim.api.nvim_buf_del_extmark(bufnr, ns_id, m[1]) end diff --git a/spec/highlight_spec.lua b/spec/highlight_spec.lua index 29856dc..ae1a4f2 100644 --- a/spec/highlight_spec.lua +++ b/spec/highlight_spec.lua @@ -397,92 +397,98 @@ describe('highlight', function() delete_buffer(bufnr) end) - it('nvim_buf_clear_namespace kills line bg extmark whose end_row bleeds into cleared range', function() - local bufnr = create_buffer({ - 'diff --git a/foo.py b/foo.py', - '@@ -1,2 +1,2 @@', - '-old', - '+new', - }) + it( + 'nvim_buf_clear_namespace kills line bg extmark whose end_row bleeds into cleared range', + function() + local bufnr = create_buffer({ + 'diff --git a/foo.py b/foo.py', + '@@ -1,2 +1,2 @@', + '-old', + '+new', + }) - local hunk = { - filename = 'foo.py', - header_start_line = 1, - start_line = 2, - lines = { '-old', '+new' }, - prefix_width = 1, - } + local hunk = { + filename = 'foo.py', + header_start_line = 1, + start_line = 2, + lines = { '-old', '+new' }, + prefix_width = 1, + } - highlight.highlight_hunk( - bufnr, - ns, - hunk, - default_opts({ highlights = { background = true, treesitter = { enabled = false } } }) - ) + highlight.highlight_hunk( + bufnr, + ns, + hunk, + default_opts({ highlights = { background = true, treesitter = { enabled = false } } }) + ) - local last_body_row = hunk.start_line + #hunk.lines - 1 - vim.api.nvim_buf_clear_namespace(bufnr, ns, last_body_row + 1, last_body_row + 10) + local last_body_row = hunk.start_line + #hunk.lines - 1 + vim.api.nvim_buf_clear_namespace(bufnr, ns, last_body_row + 1, last_body_row + 10) - local marks = vim.api.nvim_buf_get_extmarks( - bufnr, - ns, - { last_body_row, 0 }, - { last_body_row, -1 }, - { details = true } - ) - local has_line_bg = false - for _, mark in ipairs(marks) do - if mark[4] and mark[4].hl_group == 'DiffsAdd' then - has_line_bg = true + local marks = vim.api.nvim_buf_get_extmarks( + bufnr, + ns, + { last_body_row, 0 }, + { last_body_row, -1 }, + { details = true } + ) + local has_line_bg = false + for _, mark in ipairs(marks) do + if mark[4] and mark[4].hl_group == 'DiffsAdd' then + has_line_bg = true + end end + assert.is_false(has_line_bg) + delete_buffer(bufnr) end - assert.is_false(has_line_bg) - delete_buffer(bufnr) - end) + ) - it('clear_ns_by_start preserves line bg extmark whose end_row bleeds past cleared range', function() - local bufnr = create_buffer({ - 'diff --git a/foo.py b/foo.py', - '@@ -1,2 +1,2 @@', - '-old', - '+new', - }) + it( + 'clear_ns_by_start preserves line bg extmark whose end_row bleeds past cleared range', + function() + local bufnr = create_buffer({ + 'diff --git a/foo.py b/foo.py', + '@@ -1,2 +1,2 @@', + '-old', + '+new', + }) - local hunk = { - filename = 'foo.py', - header_start_line = 1, - start_line = 2, - lines = { '-old', '+new' }, - prefix_width = 1, - } + local hunk = { + filename = 'foo.py', + header_start_line = 1, + start_line = 2, + lines = { '-old', '+new' }, + prefix_width = 1, + } - highlight.highlight_hunk( - bufnr, - ns, - hunk, - default_opts({ highlights = { background = true, treesitter = { enabled = false } } }) - ) + highlight.highlight_hunk( + bufnr, + ns, + hunk, + default_opts({ highlights = { background = true, treesitter = { enabled = false } } }) + ) - local last_body_row = hunk.start_line + #hunk.lines - 1 - local clear_ns_by_start = require('diffs')._test.clear_ns_by_start - clear_ns_by_start(bufnr, ns, last_body_row + 1, last_body_row + 10) + local last_body_row = hunk.start_line + #hunk.lines - 1 + local clear_ns_by_start = require('diffs')._test.clear_ns_by_start + clear_ns_by_start(bufnr, ns, last_body_row + 1, last_body_row + 10) - local marks = vim.api.nvim_buf_get_extmarks( - bufnr, - ns, - { last_body_row, 0 }, - { last_body_row, -1 }, - { details = true } - ) - local has_line_bg = false - for _, mark in ipairs(marks) do - if mark[4] and mark[4].hl_group == 'DiffsAdd' then - has_line_bg = true + local marks = vim.api.nvim_buf_get_extmarks( + bufnr, + ns, + { last_body_row, 0 }, + { last_body_row, -1 }, + { details = true } + ) + local has_line_bg = false + for _, mark in ipairs(marks) do + if mark[4] and mark[4].hl_group == 'DiffsAdd' then + has_line_bg = true + end end + assert.is_true(has_line_bg) + delete_buffer(bufnr) end - assert.is_true(has_line_bg) - delete_buffer(bufnr) - end) + ) it('clear range covers last body line of hunk with header', function() local bufnr = create_buffer({