aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00
Code Activity

patch 8.2.0054: :diffget and :diffput don't have good completion

Browse Source 
Problem:    :diffget and :diffput don't have good completion.
Solution:   Add proper completion. (Dominique Pelle, closes #5409)
This commit is contained in:
Bram Moolenaar
2019-12-29 13:56:33 +01:00
parent e20e68b40d
commit ae7dba8969
7 changed files with 68 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/testdir/test_diffmode.vim
View File

@@ -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 \<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"diffput Xdiff2 Xdiff3', @:)
call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"diffget Xdiff2 Xdiff3', @:)
call assert_equal(['Xdiff2', 'Xdiff3'], 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
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
func Test_dp_do_buffer()
e! one
let bn1=bufnr('%')