IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3936: no proper test for maintaining change mark in diff mode

Browse Source 
Problem:    No proper test for maintaining change mark in diff mode.
Solution:   Run the test with internal and external diff. (Sean Dewar,
            closes vim/vim#9424)
ccc1644f95
This commit is contained in:
Sean Dewar 2021-12-29 16:57:40 +00:00 committed by zeertzjq
parent e8af051f1b
commit c0ff0cac87
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/nvim/testdir/test_diffmode.vim
View File

@ -1147,22 +1147,30 @@ func Test_diff_followwrap()
endfunc endfunc
func Test_diff_maintains_change_mark() func Test_diff_maintains_change_mark()
enew! func DiffMaintainsChangeMark()
call setline(1, ['a', 'b', 'c', 'd']) enew!
diffthis call setline(1, ['a', 'b', 'c', 'd'])
new diffthis
call setline(1, ['a', 'b', 'c', 'e']) new
" Set '[ and '] marks call setline(1, ['a', 'b', 'c', 'e'])
2,3yank " Set '[ and '] marks
call assert_equal([2, 3], [line("'["), line("']")]) 2,3yank
" Verify they aren't affected by the implicit diff call assert_equal([2, 3], [line("'["), line("']")])
diffthis " Verify they aren't affected by the implicit diff
call assert_equal([2, 3], [line("'["), line("']")]) diffthis
" Verify they aren't affected by an explicit diff call assert_equal([2, 3], [line("'["), line("']")])
diffupdate " Verify they aren't affected by an explicit diff
call assert_equal([2, 3], [line("'["), line("']")]) diffupdate
bwipe! call assert_equal([2, 3], [line("'["), line("']")])
bwipe! bwipe!
bwipe!
endfunc
set diffopt-=internal
call DiffMaintainsChangeMark()
set diffopt+=internal
call DiffMaintainsChangeMark()
set diffopt&
endfunc endfunc
func Test_diff_rnu() func Test_diff_rnu()