phyer/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: diff position (#312)

Browse Source
This commit is contained in:
yetone 2024-08-28 16:38:38 +08:00 committed by GitHub
parent 385522606c
commit af9c40811b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lua/avante/diff.lua
View File

@ -228,11 +228,10 @@ end
---@return ConflictPosition[] ---@return ConflictPosition[]
local function detect_conflicts(lines) local function detect_conflicts(lines)
local positions = {} local positions = {}
local position, has_start, has_middle, has_ancestor = nil, false, false, false local position, has_middle, has_ancestor = nil, false, false
for index, line in ipairs(lines) do for index, line in ipairs(lines) do
local lnum = index - 1 local lnum = index - 1
if line:match(conflict_start) then if line:match(conflict_start) then
has_start = true
position = { position = {
current = { range_start = lnum, content_start = lnum + 1 }, current = { range_start = lnum, content_start = lnum + 1 },
middle = {}, middle = {},
@ -240,14 +239,14 @@ local function detect_conflicts(lines)
ancestor = {}, ancestor = {},
} }
end end
if has_start and line:match(conflict_ancestor) then if position ~= nil and line:match(conflict_ancestor) then
has_ancestor = true has_ancestor = true
position.ancestor.range_start = lnum position.ancestor.range_start = lnum
position.ancestor.content_start = lnum + 1 position.ancestor.content_start = lnum + 1
position.current.range_end = lnum - 1 position.current.range_end = lnum - 1
position.current.content_end = lnum - 1 position.current.content_end = lnum - 1
end end
if has_start and line:match(conflict_middle) then if position ~= nil and line:match(conflict_middle) then
has_middle = true has_middle = true
if has_ancestor then if has_ancestor then
position.ancestor.content_end = lnum - 1 position.ancestor.content_end = lnum - 1
@ -261,12 +260,12 @@ local function detect_conflicts(lines)
position.incoming.range_start = lnum + 1 position.incoming.range_start = lnum + 1
position.incoming.content_start = lnum + 1 position.incoming.content_start = lnum + 1
end end
if has_start and has_middle and line:match(conflict_end) then if position ~= nil and has_middle and line:match(conflict_end) then
position.incoming.range_end = lnum position.incoming.range_end = lnum
position.incoming.content_end = lnum - 1 position.incoming.content_end = lnum - 1
positions[#positions + 1] = position positions[#positions + 1] = position
position, has_start, has_middle, has_ancestor = nil, false, false, false position, has_middle, has_ancestor = nil, false, false
end end
end end
return #positions > 0, positions return #positions > 0, positions