barrett/diffs.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 13

refactor(conflict): drop unnecessary @as cast in parser

Browse source
This commit is contained in:
Barrett Ruth 2026-02-07 17:52:35 -05:00
parent 98a1a4028b
commit 1108c33526
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lua/diffs/conflict.lua
View file

@ -72,7 +72,7 @@ function M.parse(lines)
if line:match('^>>>>>>>') then if line:match('^>>>>>>>') then
current.theirs_end = idx current.theirs_end = idx
current.marker_theirs = idx current.marker_theirs = idx
table.insert(regions, current --[[@as diffs.ConflictRegion]]) table.insert(regions, current)
current = nil current = nil
state = 'idle' state = 'idle'
elseif line:match('^<<<<<<<') then elseif line:match('^<<<<<<<') then