From 34291eba80fd2c07cbb3e6310d684e4ac3594fc4 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 13 Feb 2021 15:51:37 -0500 Subject: vim-patch:8.2.1058: multiline conceal causes display errors Problem: Multiline conceal causes display errors. Solution: Do not allow conceal cross over EOL. (closes vim/vim#6326, closes vim/vim#4854, closes vim/vim#6302) https://github.com/vim/vim/commit/fc838d6cb0f22c77a6ee2befd034b593e1c5ea06 Port test_conceal.vim but skip tests that require screendumps. --- src/nvim/testdir/test_diffmode.vim | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/nvim/testdir/test_diffmode.vim') diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim index 640de1bdc6..8a4276b2a6 100644 --- a/src/nvim/testdir/test_diffmode.vim +++ b/src/nvim/testdir/test_diffmode.vim @@ -1007,6 +1007,18 @@ func Test_diff_rnu() call delete('Xtest_diff_rnu') endfunc +func Test_diff_multilineconceal() + new + diffthis + + new + call matchadd('Conceal', 'a\nb', 9, -1, {'conceal': 'Y'}) + set cole=2 cocu=n + call setline(1, ["a", "b"]) + diffthis + redraw +endfunc + func Test_diff_and_scroll() " this was causing an ml_get error set ls=2 -- cgit From 54cd7298f8aa6adfa5a629b13ecb71b7779798bd Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 13 Feb 2021 18:04:39 -0500 Subject: vim-patch:8.2.0054: :diffget and :diffput don't have good completion Problem: :diffget and :diffput don't have good completion. Solution: Add proper completion. (Dominique Pelle, closes vim/vim#5409) https://github.com/vim/vim/commit/ae7dba896975051a3f0b7123faa08dac5635972d --- src/nvim/testdir/test_diffmode.vim | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'src/nvim/testdir/test_diffmode.vim') diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim index 8a4276b2a6..dd67806953 100644 --- a/src/nvim/testdir/test_diffmode.vim +++ b/src/nvim/testdir/test_diffmode.vim @@ -242,6 +242,46 @@ func Test_diffput_two() bwipe! b endfunc +func Test_diffget_diffput_completion() + new Xdiff1 | diffthis + new Xdiff2 | diffthis + new Xdiff3 | diffthis + new Xdiff4 + + " :diffput and :diffget completes names of buffers which + " are in diff mode and which are different then current buffer. + b Xdiff1 + call feedkeys(":diffput \\\"\", 'tx') + call assert_equal('"diffput Xdiff2 Xdiff3', @:) + call feedkeys(":diffget \\\"\", 'tx') + call assert_equal('"diffget Xdiff2 Xdiff3', @:) + call assert_equal(['Xdiff2', 'Xdiff3'], getcompletion('', 'diff_buffer')) + + b Xdiff2 + call feedkeys(":diffput \\\"\", 'tx') + call assert_equal('"diffput Xdiff1 Xdiff3', @:) + call feedkeys(":diffget \\\"\", 'tx') + call assert_equal('"diffget Xdiff1 Xdiff3', @:) + call assert_equal(['Xdiff1', 'Xdiff3'], getcompletion('', 'diff_buffer')) + + b Xdiff3 + call feedkeys(":diffput \\\"\", 'tx') + call assert_equal('"diffput Xdiff1 Xdiff2', @:) + call feedkeys(":diffget \\\"\", 'tx') + call assert_equal('"diffget Xdiff1 Xdiff2', @:) + call assert_equal(['Xdiff1', 'Xdiff2'], getcompletion('', 'diff_buffer')) + + " No completion when in Xdiff4, it's not in diff mode. + b Xdiff4 + call feedkeys(":diffput \\\"\", 'tx') + call assert_equal('"diffput ', @:) + call feedkeys(":diffget \\\"\", 'tx') + call assert_equal('"diffget ', @:) + call assert_equal([], getcompletion('', 'diff_buffer')) + + %bwipe +endfunc + func Test_dp_do_buffer() e! one let bn1=bufnr('%') -- cgit From e87c30a1963b59d1f9c27aa99faf26960b12265f Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 13 Feb 2021 18:17:57 -0500 Subject: vim-patch:8.2.0064: diffmode completion doesn't use per-window setting Problem: Diffmode completion doesn't use per-window setting. Solution: Check if a window is in diff mode. (Dominique Pell, closes vim/vim#5419) https://github.com/vim/vim/commit/efcc329020ef089267f5f3994b8544eb58806311 --- src/nvim/testdir/test_diffmode.vim | 59 ++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 21 deletions(-) (limited to 'src/nvim/testdir/test_diffmode.vim') diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim index dd67806953..21c1f98283 100644 --- a/src/nvim/testdir/test_diffmode.vim +++ b/src/nvim/testdir/test_diffmode.vim @@ -242,43 +242,60 @@ func Test_diffput_two() bwipe! b endfunc +" :diffput and :diffget completes names of buffers which +" are in diff mode and which are different then current buffer. +" No completion when the current window is not in diff mode. func Test_diffget_diffput_completion() - new Xdiff1 | diffthis - new Xdiff2 | diffthis - new Xdiff3 | diffthis - new Xdiff4 - - " :diffput and :diffget completes names of buffers which - " are in diff mode and which are different then current buffer. - b Xdiff1 + e Xdiff1 | diffthis + botright new Xdiff2 + botright new Xdiff3 | split | diffthis + botright new Xdiff4 | diffthis + + wincmd t + call assert_equal('Xdiff1', bufname('%')) call feedkeys(":diffput \\\"\", 'tx') - call assert_equal('"diffput Xdiff2 Xdiff3', @:) + call assert_equal('"diffput Xdiff3 Xdiff4', @:) call feedkeys(":diffget \\\"\", 'tx') - call assert_equal('"diffget Xdiff2 Xdiff3', @:) - call assert_equal(['Xdiff2', 'Xdiff3'], getcompletion('', 'diff_buffer')) + call assert_equal('"diffget Xdiff3 Xdiff4', @:) + call assert_equal(['Xdiff3', 'Xdiff4'], getcompletion('', 'diff_buffer')) - b Xdiff2 + " Xdiff2 is not in diff mode, so no completion for :diffput, :diffget + wincmd j + call assert_equal('Xdiff2', bufname('%')) call feedkeys(":diffput \\\"\", 'tx') - call assert_equal('"diffput Xdiff1 Xdiff3', @:) + call assert_equal('"diffput ', @:) call feedkeys(":diffget \\\"\", 'tx') - call assert_equal('"diffget Xdiff1 Xdiff3', @:) - call assert_equal(['Xdiff1', 'Xdiff3'], getcompletion('', 'diff_buffer')) + call assert_equal('"diffget ', @:) + call assert_equal([], getcompletion('', 'diff_buffer')) - b Xdiff3 + " Xdiff3 is split in 2 windows, only the top one is in diff mode. + " So completion of :diffput :diffget only happens in the top window. + wincmd j + call assert_equal('Xdiff3', bufname('%')) + call assert_equal(1, &diff) call feedkeys(":diffput \\\"\", 'tx') - call assert_equal('"diffput Xdiff1 Xdiff2', @:) + call assert_equal('"diffput Xdiff1 Xdiff4', @:) call feedkeys(":diffget \\\"\", 'tx') - call assert_equal('"diffget Xdiff1 Xdiff2', @:) - call assert_equal(['Xdiff1', 'Xdiff2'], getcompletion('', 'diff_buffer')) + call assert_equal('"diffget Xdiff1 Xdiff4', @:) + call assert_equal(['Xdiff1', 'Xdiff4'], getcompletion('', 'diff_buffer')) - " No completion when in Xdiff4, it's not in diff mode. - b Xdiff4 + wincmd j + call assert_equal('Xdiff3', bufname('%')) + call assert_equal(0, &diff) call feedkeys(":diffput \\\"\", 'tx') call assert_equal('"diffput ', @:) call feedkeys(":diffget \\\"\", 'tx') call assert_equal('"diffget ', @:) call assert_equal([], getcompletion('', 'diff_buffer')) + wincmd j + call assert_equal('Xdiff4', bufname('%')) + call feedkeys(":diffput \\\"\", 'tx') + call assert_equal('"diffput Xdiff1 Xdiff3', @:) + call feedkeys(":diffget \\\"\", 'tx') + call assert_equal('"diffget Xdiff1 Xdiff3', @:) + call assert_equal(['Xdiff1', 'Xdiff3'], getcompletion('', 'diff_buffer')) + %bwipe endfunc -- cgit