diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-12-30 21:59:03 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-12-30 21:59:03 +0100 |
commit | efcc329020ef089267f5f3994b8544eb58806311 (patch) | |
tree | ab8cb40fbc657f8642050905fb0771d7e70b99e5 /src/testdir/test_diffmode.vim | |
parent | 08b28b7ad52d5ee3cb5fa5982b647e325a410484 (diff) | |
download | vim-git-efcc329020ef089267f5f3994b8544eb58806311.tar.gz |
patch 8.2.0064: diffmode completion doesn't use per-window settingv8.2.0064
Problem: Diffmode completion doesn't use per-window setting.
Solution: Check if a window is in diff mode. (Dominique Pell, closes #5419)
Diffstat (limited to 'src/testdir/test_diffmode.vim')
-rw-r--r-- | src/testdir/test_diffmode.vim | 59 |
1 files changed, 38 insertions, 21 deletions
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index b93cc6d3e..d1160d09f 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/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 \<C-A>\<C-B>\"\<CR>", 'tx') - call assert_equal('"diffput Xdiff2 Xdiff3', @:) + call assert_equal('"diffput Xdiff3 Xdiff4', @:) call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", '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 \<C-A>\<C-B>\"\<CR>", 'tx') - call assert_equal('"diffput Xdiff1 Xdiff3', @:) + call assert_equal('"diffput ', @:) call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", '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 \<C-A>\<C-B>\"\<CR>", 'tx') - call assert_equal('"diffput Xdiff1 Xdiff2', @:) + call assert_equal('"diffput Xdiff1 Xdiff4', @:) call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", '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 \<C-A>\<C-B>\"\<CR>", 'tx') call assert_equal('"diffput ', @:) call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx') call assert_equal('"diffget ', @:) call assert_equal([], getcompletion('', 'diff_buffer')) + wincmd j + call assert_equal('Xdiff4', bufname('%')) + call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx') + call assert_equal('"diffput Xdiff1 Xdiff3', @:) + call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx') + call assert_equal('"diffget Xdiff1 Xdiff3', @:) + call assert_equal(['Xdiff1', 'Xdiff3'], getcompletion('', 'diff_buffer')) + %bwipe endfunc |