35067151e4
## Problem Three minor issues remain before the v0.2.0 release: 1. Git quotes filenames containing spaces, unicode, or special characters in the fugitive status buffer. `parse_file_line` passed the quotes through verbatim, causing file-not-found errors on diff operations. 2. Navigation wrap-around in both conflict and merge modules was silent, giving no indication when jumping past the last/first item back to the beginning/end. 3. `resolved_hunks` and `(resolved)` virtual text in the merge module persisted across buffer re-reads, showing stale markers for hunks that were no longer resolved. ## Solution 1. Add an `unquote()` helper to fugitive.lua that strips surrounding quotes and unescapes `\\`, `\"`, `\n`, `\t`, and octal `\NNN` sequences. Applied to both return paths in `parse_file_line`. 2. Add `vim.notify` before the wrap-around jump in all four navigation functions (`goto_next`/`goto_prev` in conflict.lua and merge.lua). 3. Clear `resolved_hunks[bufnr]` and the merge namespace at the top of `setup_keymaps` so each buffer init starts fresh. Closes #66
479 lines
14 KiB
Lua
479 lines
14 KiB
Lua
---@class diffs.ConflictRegion
|
|
---@field marker_ours integer
|
|
---@field ours_start integer
|
|
---@field ours_end integer
|
|
---@field marker_base integer?
|
|
---@field base_start integer?
|
|
---@field base_end integer?
|
|
---@field marker_sep integer
|
|
---@field theirs_start integer
|
|
---@field theirs_end integer
|
|
---@field marker_theirs integer
|
|
|
|
local M = {}
|
|
|
|
local ns = vim.api.nvim_create_namespace('diffs-conflict')
|
|
|
|
---@type table<integer, true>
|
|
local attached_buffers = {}
|
|
|
|
---@type table<integer, boolean>
|
|
local diagnostics_suppressed = {}
|
|
|
|
---@param lines string[]
|
|
---@return diffs.ConflictRegion[]
|
|
function M.parse(lines)
|
|
local regions = {}
|
|
local state = 'idle'
|
|
---@type table?
|
|
local current = nil
|
|
|
|
for i, line in ipairs(lines) do
|
|
local idx = i - 1
|
|
|
|
if state == 'idle' then
|
|
if line:match('^<<<<<<<') then
|
|
current = { marker_ours = idx, ours_start = idx + 1 }
|
|
state = 'in_ours'
|
|
end
|
|
elseif state == 'in_ours' then
|
|
if line:match('^|||||||') then
|
|
current.ours_end = idx
|
|
current.marker_base = idx
|
|
current.base_start = idx + 1
|
|
state = 'in_base'
|
|
elseif line:match('^=======') then
|
|
current.ours_end = idx
|
|
current.marker_sep = idx
|
|
current.theirs_start = idx + 1
|
|
state = 'in_theirs'
|
|
elseif line:match('^<<<<<<<') then
|
|
current = { marker_ours = idx, ours_start = idx + 1 }
|
|
elseif line:match('^>>>>>>>') then
|
|
current = nil
|
|
state = 'idle'
|
|
end
|
|
elseif state == 'in_base' then
|
|
if line:match('^=======') then
|
|
current.base_end = idx
|
|
current.marker_sep = idx
|
|
current.theirs_start = idx + 1
|
|
state = 'in_theirs'
|
|
elseif line:match('^<<<<<<<') then
|
|
current = { marker_ours = idx, ours_start = idx + 1 }
|
|
state = 'in_ours'
|
|
elseif line:match('^>>>>>>>') then
|
|
current = nil
|
|
state = 'idle'
|
|
end
|
|
elseif state == 'in_theirs' then
|
|
if line:match('^>>>>>>>') then
|
|
current.theirs_end = idx
|
|
current.marker_theirs = idx
|
|
table.insert(regions, current)
|
|
current = nil
|
|
state = 'idle'
|
|
elseif line:match('^<<<<<<<') then
|
|
current = { marker_ours = idx, ours_start = idx + 1 }
|
|
state = 'in_ours'
|
|
end
|
|
end
|
|
end
|
|
|
|
return regions
|
|
end
|
|
|
|
---@param bufnr integer
|
|
---@return diffs.ConflictRegion[]
|
|
local function parse_buffer(bufnr)
|
|
local lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
|
|
return M.parse(lines)
|
|
end
|
|
|
|
---@param side string
|
|
---@param config diffs.ConflictConfig
|
|
---@return string?
|
|
local function get_virtual_text_label(side, config)
|
|
if config.format_virtual_text then
|
|
local keymap = side == 'ours' and config.keymaps.ours or config.keymaps.theirs
|
|
return config.format_virtual_text(side, keymap)
|
|
end
|
|
return side == 'ours' and 'current' or 'incoming'
|
|
end
|
|
|
|
---@param bufnr integer
|
|
---@param regions diffs.ConflictRegion[]
|
|
---@param config diffs.ConflictConfig
|
|
local function apply_highlights(bufnr, regions, config)
|
|
vim.api.nvim_buf_clear_namespace(bufnr, ns, 0, -1)
|
|
|
|
for _, region in ipairs(regions) do
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, region.marker_ours, 0, {
|
|
end_row = region.marker_ours + 1,
|
|
hl_group = 'DiffsConflictMarker',
|
|
hl_eol = true,
|
|
priority = config.priority,
|
|
})
|
|
|
|
if config.show_virtual_text then
|
|
local ours_label = get_virtual_text_label('ours', config)
|
|
if ours_label then
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, region.marker_ours, 0, {
|
|
virt_text = { { ' (' .. ours_label .. ')', 'DiffsConflictMarker' } },
|
|
virt_text_pos = 'eol',
|
|
})
|
|
end
|
|
end
|
|
|
|
if config.show_actions then
|
|
local parts = {}
|
|
local actions = {
|
|
{ 'Current', config.keymaps.ours },
|
|
{ 'Incoming', config.keymaps.theirs },
|
|
{ 'Both', config.keymaps.both },
|
|
{ 'None', config.keymaps.none },
|
|
}
|
|
for _, action in ipairs(actions) do
|
|
if action[2] then
|
|
if #parts > 0 then
|
|
table.insert(parts, { ' \226\148\130 ', 'DiffsConflictActions' })
|
|
end
|
|
table.insert(parts, { ('%s (%s)'):format(action[1], action[2]), 'DiffsConflictActions' })
|
|
end
|
|
end
|
|
if #parts > 0 then
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, region.marker_ours, 0, {
|
|
virt_lines = { parts },
|
|
virt_lines_above = true,
|
|
})
|
|
end
|
|
end
|
|
|
|
for line = region.ours_start, region.ours_end - 1 do
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, line, 0, {
|
|
end_row = line + 1,
|
|
hl_group = 'DiffsConflictOurs',
|
|
hl_eol = true,
|
|
priority = config.priority,
|
|
})
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, line, 0, {
|
|
number_hl_group = 'DiffsConflictOursNr',
|
|
priority = config.priority,
|
|
})
|
|
end
|
|
|
|
if region.marker_base then
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, region.marker_base, 0, {
|
|
end_row = region.marker_base + 1,
|
|
hl_group = 'DiffsConflictMarker',
|
|
hl_eol = true,
|
|
priority = config.priority,
|
|
})
|
|
|
|
for line = region.base_start, region.base_end - 1 do
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, line, 0, {
|
|
end_row = line + 1,
|
|
hl_group = 'DiffsConflictBase',
|
|
hl_eol = true,
|
|
priority = config.priority,
|
|
})
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, line, 0, {
|
|
number_hl_group = 'DiffsConflictBaseNr',
|
|
priority = config.priority,
|
|
})
|
|
end
|
|
end
|
|
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, region.marker_sep, 0, {
|
|
end_row = region.marker_sep + 1,
|
|
hl_group = 'DiffsConflictMarker',
|
|
hl_eol = true,
|
|
priority = config.priority,
|
|
})
|
|
|
|
for line = region.theirs_start, region.theirs_end - 1 do
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, line, 0, {
|
|
end_row = line + 1,
|
|
hl_group = 'DiffsConflictTheirs',
|
|
hl_eol = true,
|
|
priority = config.priority,
|
|
})
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, line, 0, {
|
|
number_hl_group = 'DiffsConflictTheirsNr',
|
|
priority = config.priority,
|
|
})
|
|
end
|
|
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, region.marker_theirs, 0, {
|
|
end_row = region.marker_theirs + 1,
|
|
hl_group = 'DiffsConflictMarker',
|
|
hl_eol = true,
|
|
priority = config.priority,
|
|
})
|
|
|
|
if config.show_virtual_text then
|
|
local theirs_label = get_virtual_text_label('theirs', config)
|
|
if theirs_label then
|
|
pcall(vim.api.nvim_buf_set_extmark, bufnr, ns, region.marker_theirs, 0, {
|
|
virt_text = { { ' (' .. theirs_label .. ')', 'DiffsConflictMarker' } },
|
|
virt_text_pos = 'eol',
|
|
})
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
---@param cursor_line integer
|
|
---@param regions diffs.ConflictRegion[]
|
|
---@return diffs.ConflictRegion?
|
|
local function find_conflict_at_cursor(cursor_line, regions)
|
|
for _, region in ipairs(regions) do
|
|
if cursor_line >= region.marker_ours and cursor_line <= region.marker_theirs then
|
|
return region
|
|
end
|
|
end
|
|
return nil
|
|
end
|
|
|
|
---@param bufnr integer
|
|
---@param region diffs.ConflictRegion
|
|
---@param replacement string[]
|
|
function M.replace_region(bufnr, region, replacement)
|
|
vim.api.nvim_buf_set_lines(
|
|
bufnr,
|
|
region.marker_ours,
|
|
region.marker_theirs + 1,
|
|
false,
|
|
replacement
|
|
)
|
|
end
|
|
|
|
---@param bufnr integer
|
|
---@param config diffs.ConflictConfig
|
|
function M.refresh(bufnr, config)
|
|
local regions = parse_buffer(bufnr)
|
|
if #regions == 0 then
|
|
vim.api.nvim_buf_clear_namespace(bufnr, ns, 0, -1)
|
|
if diagnostics_suppressed[bufnr] then
|
|
pcall(vim.diagnostic.reset, nil, bufnr)
|
|
pcall(vim.diagnostic.enable, true, { bufnr = bufnr })
|
|
diagnostics_suppressed[bufnr] = nil
|
|
end
|
|
vim.api.nvim_exec_autocmds('User', { pattern = 'DiffsConflictResolved' })
|
|
return
|
|
end
|
|
apply_highlights(bufnr, regions, config)
|
|
if config.disable_diagnostics and not diagnostics_suppressed[bufnr] then
|
|
pcall(vim.diagnostic.enable, false, { bufnr = bufnr })
|
|
diagnostics_suppressed[bufnr] = true
|
|
end
|
|
end
|
|
|
|
---@param bufnr integer
|
|
---@param config diffs.ConflictConfig
|
|
function M.resolve_ours(bufnr, config)
|
|
if not vim.api.nvim_get_option_value('modifiable', { buf = bufnr }) then
|
|
vim.notify('[diffs.nvim]: buffer is not modifiable', vim.log.levels.WARN)
|
|
return
|
|
end
|
|
local regions = parse_buffer(bufnr)
|
|
local cursor = vim.api.nvim_win_get_cursor(0)
|
|
local region = find_conflict_at_cursor(cursor[1] - 1, regions)
|
|
if not region then
|
|
return
|
|
end
|
|
local lines = vim.api.nvim_buf_get_lines(bufnr, region.ours_start, region.ours_end, false)
|
|
M.replace_region(bufnr, region, lines)
|
|
M.refresh(bufnr, config)
|
|
end
|
|
|
|
---@param bufnr integer
|
|
---@param config diffs.ConflictConfig
|
|
function M.resolve_theirs(bufnr, config)
|
|
if not vim.api.nvim_get_option_value('modifiable', { buf = bufnr }) then
|
|
vim.notify('[diffs.nvim]: buffer is not modifiable', vim.log.levels.WARN)
|
|
return
|
|
end
|
|
local regions = parse_buffer(bufnr)
|
|
local cursor = vim.api.nvim_win_get_cursor(0)
|
|
local region = find_conflict_at_cursor(cursor[1] - 1, regions)
|
|
if not region then
|
|
return
|
|
end
|
|
local lines = vim.api.nvim_buf_get_lines(bufnr, region.theirs_start, region.theirs_end, false)
|
|
M.replace_region(bufnr, region, lines)
|
|
M.refresh(bufnr, config)
|
|
end
|
|
|
|
---@param bufnr integer
|
|
---@param config diffs.ConflictConfig
|
|
function M.resolve_both(bufnr, config)
|
|
if not vim.api.nvim_get_option_value('modifiable', { buf = bufnr }) then
|
|
vim.notify('[diffs.nvim]: buffer is not modifiable', vim.log.levels.WARN)
|
|
return
|
|
end
|
|
local regions = parse_buffer(bufnr)
|
|
local cursor = vim.api.nvim_win_get_cursor(0)
|
|
local region = find_conflict_at_cursor(cursor[1] - 1, regions)
|
|
if not region then
|
|
return
|
|
end
|
|
local ours = vim.api.nvim_buf_get_lines(bufnr, region.ours_start, region.ours_end, false)
|
|
local theirs = vim.api.nvim_buf_get_lines(bufnr, region.theirs_start, region.theirs_end, false)
|
|
local combined = {}
|
|
for _, l in ipairs(ours) do
|
|
table.insert(combined, l)
|
|
end
|
|
for _, l in ipairs(theirs) do
|
|
table.insert(combined, l)
|
|
end
|
|
M.replace_region(bufnr, region, combined)
|
|
M.refresh(bufnr, config)
|
|
end
|
|
|
|
---@param bufnr integer
|
|
---@param config diffs.ConflictConfig
|
|
function M.resolve_none(bufnr, config)
|
|
if not vim.api.nvim_get_option_value('modifiable', { buf = bufnr }) then
|
|
vim.notify('[diffs.nvim]: buffer is not modifiable', vim.log.levels.WARN)
|
|
return
|
|
end
|
|
local regions = parse_buffer(bufnr)
|
|
local cursor = vim.api.nvim_win_get_cursor(0)
|
|
local region = find_conflict_at_cursor(cursor[1] - 1, regions)
|
|
if not region then
|
|
return
|
|
end
|
|
M.replace_region(bufnr, region, {})
|
|
M.refresh(bufnr, config)
|
|
end
|
|
|
|
---@param bufnr integer
|
|
function M.goto_next(bufnr)
|
|
local regions = parse_buffer(bufnr)
|
|
if #regions == 0 then
|
|
return
|
|
end
|
|
local cursor = vim.api.nvim_win_get_cursor(0)
|
|
local cursor_line = cursor[1] - 1
|
|
for _, region in ipairs(regions) do
|
|
if region.marker_ours > cursor_line then
|
|
vim.api.nvim_win_set_cursor(0, { region.marker_ours + 1, 0 })
|
|
return
|
|
end
|
|
end
|
|
vim.notify('[diffs.nvim]: wrapped to first conflict', vim.log.levels.INFO)
|
|
vim.api.nvim_win_set_cursor(0, { regions[1].marker_ours + 1, 0 })
|
|
end
|
|
|
|
---@param bufnr integer
|
|
function M.goto_prev(bufnr)
|
|
local regions = parse_buffer(bufnr)
|
|
if #regions == 0 then
|
|
return
|
|
end
|
|
local cursor = vim.api.nvim_win_get_cursor(0)
|
|
local cursor_line = cursor[1] - 1
|
|
for i = #regions, 1, -1 do
|
|
if regions[i].marker_ours < cursor_line then
|
|
vim.api.nvim_win_set_cursor(0, { regions[i].marker_ours + 1, 0 })
|
|
return
|
|
end
|
|
end
|
|
vim.notify('[diffs.nvim]: wrapped to last conflict', vim.log.levels.INFO)
|
|
vim.api.nvim_win_set_cursor(0, { regions[#regions].marker_ours + 1, 0 })
|
|
end
|
|
|
|
---@param bufnr integer
|
|
---@param config diffs.ConflictConfig
|
|
local function setup_keymaps(bufnr, config)
|
|
local km = config.keymaps
|
|
|
|
local maps = {
|
|
{ km.ours, '<Plug>(diffs-conflict-ours)' },
|
|
{ km.theirs, '<Plug>(diffs-conflict-theirs)' },
|
|
{ km.both, '<Plug>(diffs-conflict-both)' },
|
|
{ km.none, '<Plug>(diffs-conflict-none)' },
|
|
{ km.next, '<Plug>(diffs-conflict-next)' },
|
|
{ km.prev, '<Plug>(diffs-conflict-prev)' },
|
|
}
|
|
|
|
for _, map in ipairs(maps) do
|
|
if map[1] then
|
|
vim.keymap.set('n', map[1], map[2], { buffer = bufnr })
|
|
end
|
|
end
|
|
end
|
|
|
|
---@param bufnr integer
|
|
function M.detach(bufnr)
|
|
vim.api.nvim_buf_clear_namespace(bufnr, ns, 0, -1)
|
|
attached_buffers[bufnr] = nil
|
|
|
|
if diagnostics_suppressed[bufnr] then
|
|
pcall(vim.diagnostic.reset, nil, bufnr)
|
|
pcall(vim.diagnostic.enable, true, { bufnr = bufnr })
|
|
diagnostics_suppressed[bufnr] = nil
|
|
end
|
|
end
|
|
|
|
---@param bufnr integer
|
|
---@param config diffs.ConflictConfig
|
|
function M.attach(bufnr, config)
|
|
if attached_buffers[bufnr] then
|
|
return
|
|
end
|
|
|
|
local buftype = vim.api.nvim_get_option_value('buftype', { buf = bufnr })
|
|
if buftype ~= '' then
|
|
return
|
|
end
|
|
|
|
local lines = vim.api.nvim_buf_get_lines(bufnr, 0, -1, false)
|
|
local has_marker = false
|
|
for _, line in ipairs(lines) do
|
|
if line:match('^<<<<<<<') then
|
|
has_marker = true
|
|
break
|
|
end
|
|
end
|
|
if not has_marker then
|
|
return
|
|
end
|
|
|
|
attached_buffers[bufnr] = true
|
|
|
|
local regions = M.parse(lines)
|
|
apply_highlights(bufnr, regions, config)
|
|
setup_keymaps(bufnr, config)
|
|
|
|
if config.disable_diagnostics then
|
|
pcall(vim.diagnostic.enable, false, { bufnr = bufnr })
|
|
diagnostics_suppressed[bufnr] = true
|
|
end
|
|
|
|
vim.api.nvim_create_autocmd({ 'TextChanged', 'TextChangedI' }, {
|
|
buffer = bufnr,
|
|
callback = function()
|
|
if not attached_buffers[bufnr] then
|
|
return true
|
|
end
|
|
M.refresh(bufnr, config)
|
|
end,
|
|
})
|
|
|
|
vim.api.nvim_create_autocmd('BufWipeout', {
|
|
buffer = bufnr,
|
|
callback = function()
|
|
attached_buffers[bufnr] = nil
|
|
diagnostics_suppressed[bufnr] = nil
|
|
end,
|
|
})
|
|
end
|
|
|
|
---@return integer
|
|
function M.get_namespace()
|
|
return ns
|
|
end
|
|
|
|
return M
|