kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(extmark): only invalidate unpaired marks on deleted rows

Browse Source 
Problem:  Unpaired marks are invalidated if its column is deleted,
          which may just be a "placeholder" column, e.g. for signs.
Solution: Only remove unpaired marks if its entire row is deleted.
This commit is contained in:
Luuk van Baal 2023-12-13 23:30:19 +01:00 committed by Lewis Russell
parent aa05133b0e
commit 320e9c1c21
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/extmark.c
View File

@ -332,9 +332,13 @@ void extmark_splice_delete(buf_T *buf, int l_row, colnr_T l_col, int u_row, coln
if (endpos.row < 0) { if (endpos.row < 0) {
endpos = mark.pos; endpos = mark.pos;
} }
if ((endpos.col <= u_col || (!u_col && endpos.row == mark.pos.row)) // Invalidate unpaired marks in deleted lines and paired marks whose entire
&& mark.pos.col >= l_col // range has been deleted.
&& mark.pos.row >= l_row && endpos.row <= u_row - (u_col ? 0 : 1)) { if ((!mt_paired(mark) && mark.pos.row < u_row)
|| (mt_paired(mark)
&& (endpos.col <= u_col || (!u_col && endpos.row == mark.pos.row))
&& mark.pos.col >= l_col
&& mark.pos.row >= l_row && endpos.row <= u_row - (u_col ? 0 : 1))) {
if (mt_no_undo(mark)) { if (mt_no_undo(mark)) {
extmark_del(buf, itr, mark, true); extmark_del(buf, itr, mark, true);
continue; continue;

23
test/functional/ui/sign_spec.lua
View File

@ -218,14 +218,15 @@ describe('Signs', function()
]]) ]])
-- "auto:3" accommodates all the signs we defined so far. -- "auto:3" accommodates all the signs we defined so far.
command('set signcolumn=auto:3') command('set signcolumn=auto:3')
screen:expect([[ local s3 = [[
{1:>>}{8:XX}{2: }{6: 1 }a | {1:>>}{8:XX}{2: }{6: 1 }a |
{8:XX}{1:>>}{2: }{6: 2 }b | {8:XX}{1:>>}{2: }{6: 2 }b |
{8:XX}{1:>>}WW{6: 3 }c | {8:XX}{1:>>}WW{6: 3 }c |
{2: }{6: 4 }^ | {2: }{6: 4 }^ |
{0:~ }|*9 {0:~ }|*9
| |
]]) ]]
screen:expect(s3)
-- Check "yes:9". -- Check "yes:9".
command('set signcolumn=yes:9') command('set signcolumn=yes:9')
screen:expect([[ screen:expect([[
@ -239,14 +240,7 @@ describe('Signs', function()
-- Check "auto:N" larger than the maximum number of signs defined in -- Check "auto:N" larger than the maximum number of signs defined in
-- a single line (same result as "auto:3"). -- a single line (same result as "auto:3").
command('set signcolumn=auto:4') command('set signcolumn=auto:4')
screen:expect{grid=[[ screen:expect(s3)
{1:>>}{8:XX}{2: }{6: 1 }a |
{8:XX}{1:>>}{2: }{6: 2 }b |
{8:XX}{1:>>}WW{6: 3 }c |
{2: }{6: 4 }^ |
{0:~ }|*9
|
]]}
-- line deletion deletes signs. -- line deletion deletes signs.
command('3move1') command('3move1')
command('2d') command('2d')
@ -257,6 +251,15 @@ describe('Signs', function()
{0:~ }|*10 {0:~ }|*10
| |
]]) ]])
-- character deletion does not delete signs.
feed('x')
screen:expect([[
{1:>>}{8:XX}{6: 1 }a |
{8:XX}{1:>>}{6: 2 }^ |
{2: }{6: 3 } |
{0:~ }|*10
|
]])
end) end)
it('auto-resize sign column with minimum size (#13783)', function() it('auto-resize sign column with minimum size (#13783)', function()