mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-13 14:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.0064: diffmode completion doesn't use per-window setting

Browse Source 
Problem:    Diffmode completion doesn't use per-window setting.
Solution:   Check if a window is in diff mode. (Dominique Pell, closes vim/vim#5419)
efcc329020
This commit is contained in:
Jan Edmund Lazo
2021-02-13 18:17:57 -05:00
parent 54cd7298f8
commit e87c30a196
2 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/buffer.c
View File

@@ -2309,6 +2309,10 @@ int ExpandBufnames(char_u *pat, int *num_file, char_u ***file, int options)
*num_file = 0; // return values in case of FAIL
*file = NULL;
if ((options & BUF_DIFF_FILTER) && !curwin->w_p_diff) {
return FAIL;
}
// Make a copy of "pat" and change "^" to "\(^\|[\/]\)".
if (*pat == '^') {
patc = xmalloc(STRLEN(pat) + 11);
@@ -2348,9 +2352,7 @@ int ExpandBufnames(char_u *pat, int *num_file, char_u ***file, int options)
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;
}
}

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

@@ -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
" :diffput and :diffget completes names of buffers which
" are in diff mode and which are different then current buffer.
b Xdiff1
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
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
" 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 Xdiff1 Xdiff4', @:)
call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"diffget Xdiff1 Xdiff4', @:)
call assert_equal(['Xdiff1', 'Xdiff4'], getcompletion('', 'diff_buffer'))
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