Mercurial > vim

comparison src/testdir/test_diffmode.vim @ 19007:0883a37ccf84 v8.2.0064

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e378907d79bf
children da98d2ed8dc5
comparison
equal deleted inserted replaced
19006:0de1352b2de9 19007:0883a37ccf84
240 call assert_equal(map(range(1, 10), 'string(v:val)'), getline(1, '$')) 240 call assert_equal(map(range(1, 10), 'string(v:val)'), getline(1, '$'))
241 bwipe! a 241 bwipe! a
242 bwipe! b 242 bwipe! b
243 endfunc 243 endfunc
244 244
245 " :diffput and :diffget completes names of buffers which
246 " are in diff mode and which are different then current buffer.
247 " No completion when the current window is not in diff mode.
245 func Test_diffget_diffput_completion() 248 func Test_diffget_diffput_completion()
246 new Xdiff1 | diffthis 249 e Xdiff1 | diffthis
247 new Xdiff2 | diffthis 250 botright new Xdiff2
248 new Xdiff3 | diffthis 251 botright new Xdiff3 | split | diffthis
249 new Xdiff4 252 botright new Xdiff4 | diffthis
250 253
251 " :diffput and :diffget completes names of buffers which 254 wincmd t
252 " are in diff mode and which are different then current buffer. 255 call assert_equal('Xdiff1', bufname('%'))
253 b Xdiff1
254 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx') 256 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
255 call assert_equal('"diffput Xdiff2 Xdiff3', @:) 257 call assert_equal('"diffput Xdiff3 Xdiff4', @:)
256 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx') 258 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
257 call assert_equal('"diffget Xdiff2 Xdiff3', @:) 259 call assert_equal('"diffget Xdiff3 Xdiff4', @:)
258 call assert_equal(['Xdiff2', 'Xdiff3'], getcompletion('', 'diff_buffer')) 260 call assert_equal(['Xdiff3', 'Xdiff4'], getcompletion('', 'diff_buffer'))
259 261
260 b Xdiff2 262 " Xdiff2 is not in diff mode, so no completion for :diffput, :diffget
263 wincmd j
264 call assert_equal('Xdiff2', bufname('%'))
265 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
266 call assert_equal('"diffput ', @:)
267 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
268 call assert_equal('"diffget ', @:)
269 call assert_equal([], getcompletion('', 'diff_buffer'))
270
271 " Xdiff3 is split in 2 windows, only the top one is in diff mode.
272 " So completion of :diffput :diffget only happens in the top window.
273 wincmd j
274 call assert_equal('Xdiff3', bufname('%'))
275 call assert_equal(1, &diff)
276 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
277 call assert_equal('"diffput Xdiff1 Xdiff4', @:)
278 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
279 call assert_equal('"diffget Xdiff1 Xdiff4', @:)
280 call assert_equal(['Xdiff1', 'Xdiff4'], getcompletion('', 'diff_buffer'))
281
282 wincmd j
283 call assert_equal('Xdiff3', bufname('%'))
284 call assert_equal(0, &diff)
285 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
286 call assert_equal('"diffput ', @:)
287 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
288 call assert_equal('"diffget ', @:)
289 call assert_equal([], getcompletion('', 'diff_buffer'))
290
291 wincmd j
292 call assert_equal('Xdiff4', bufname('%'))
261 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx') 293 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
262 call assert_equal('"diffput Xdiff1 Xdiff3', @:) 294 call assert_equal('"diffput Xdiff1 Xdiff3', @:)
263 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx') 295 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
264 call assert_equal('"diffget Xdiff1 Xdiff3', @:) 296 call assert_equal('"diffget Xdiff1 Xdiff3', @:)
265 call assert_equal(['Xdiff1', 'Xdiff3'], getcompletion('', 'diff_buffer')) 297 call assert_equal(['Xdiff1', 'Xdiff3'], getcompletion('', 'diff_buffer'))
266
267 b Xdiff3
268 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
269 call assert_equal('"diffput Xdiff1 Xdiff2', @:)
270 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
271 call assert_equal('"diffget Xdiff1 Xdiff2', @:)
272 call assert_equal(['Xdiff1', 'Xdiff2'], getcompletion('', 'diff_buffer'))
273
274 " No completion when in Xdiff4, it's not in diff mode.
275 b Xdiff4
276 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
277 call assert_equal('"diffput ', @:)
278 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
279 call assert_equal('"diffget ', @:)
280 call assert_equal([], getcompletion('', 'diff_buffer'))
281 298
282 %bwipe 299 %bwipe
283 endfunc 300 endfunc
284 301
285 func Test_dp_do_buffer() 302 func Test_dp_do_buffer()