Mercurial > vim
changeset 19007:0883a37ccf84 v8.2.0064
patch 8.2.0064: diffmode completion doesn't use per-window setting
Commit: https://github.com/vim/vim/commit/efcc329020ef089267f5f3994b8544eb58806311
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Dec 30 21:59:03 2019 +0100
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 https://github.com/vim/vim/issues/5419)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 30 Dec 2019 22:00:04 +0100 |
parents | 0de1352b2de9 |
children | 9dd74f906a75 |
files | src/buffer.c src/testdir/test_diffmode.vim src/version.c |
diffstat | 3 files changed, 51 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buffer.c +++ b/src/buffer.c @@ -2661,6 +2661,11 @@ ExpandBufnames( *num_file = 0; // return values in case of FAIL *file = NULL; +#ifdef FEAT_DIFF + if ((options & BUF_DIFF_FILTER) && !curwin->w_p_diff) + return FAIL; +#endif + // Make a copy of "pat" and change "^" to "\(^\|[\/]\)". if (*pat == '^') { @@ -2706,8 +2711,7 @@ ExpandBufnames( if (options & BUF_DIFF_FILTER) // Skip buffers not suitable for // :diffget or :diffput completion. - if (buf == curbuf - || !diff_mode_buf(curbuf) || !diff_mode_buf(buf)) + if (buf == curbuf || !diff_mode_buf(buf)) continue; #endif
--- 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 + 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 Xdiff3 Xdiff4', @:) + call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx') + call assert_equal('"diffget Xdiff3 Xdiff4', @:) + call assert_equal(['Xdiff3', 'Xdiff4'], getcompletion('', 'diff_buffer')) - " :diffput and :diffget completes names of buffers which - " are in diff mode and which are different then current buffer. - b Xdiff1 + " 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 ', @:) + call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx') + call assert_equal('"diffget ', @:) + call assert_equal([], getcompletion('', 'diff_buffer')) + + " 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 Xdiff2 Xdiff3', @:) + call assert_equal('"diffput Xdiff1 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 Xdiff1 Xdiff4', @:) + call assert_equal(['Xdiff1', 'Xdiff4'], getcompletion('', 'diff_buffer')) - b Xdiff2 + 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')) - b Xdiff3 - call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx') - call assert_equal('"diffput Xdiff1 Xdiff2', @:) - call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", '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 \<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')) - %bwipe endfunc