blob: 4a54f8c84c7e223e8186766e0f5d2e00c5ab4d39 [file] [log] [blame]
Bram Moolenaar42093c02016-07-30 16:16:54 +02001" Tests for diff mode
Bram Moolenaar6d91bcb2020-08-12 18:50:36 +02002
Bram Moolenaare828b762018-09-10 17:51:58 +02003source shared.vim
4source screendump.vim
Bram Moolenaar3c8ee622019-08-03 22:55:50 +02005source check.vim
Bram Moolenaar42093c02016-07-30 16:16:54 +02006
7func Test_diff_fold_sync()
8 enew!
Bram Moolenaare8fa05b2018-09-16 15:48:06 +02009 let g:update_count = 0
10 au DiffUpdated * let g:update_count += 1
11
Bram Moolenaar42093c02016-07-30 16:16:54 +020012 let l = range(50)
13 call setline(1, l)
14 diffthis
15 let winone = win_getid()
16 new
17 let l[25] = 'diff'
18 call setline(1, l)
19 diffthis
20 let wintwo = win_getid()
21 " line 15 is inside the closed fold
22 call assert_equal(19, foldclosedend(10))
23 call win_gotoid(winone)
24 call assert_equal(19, foldclosedend(10))
25 " open the fold
26 normal zv
27 call assert_equal(-1, foldclosedend(10))
28 " fold in other window must have opened too
29 call win_gotoid(wintwo)
30 call assert_equal(-1, foldclosedend(10))
31
32 " cursor position is in sync
33 normal 23G
34 call win_gotoid(winone)
35 call assert_equal(23, getcurpos()[1])
36
Bram Moolenaare8fa05b2018-09-16 15:48:06 +020037 call assert_equal(1, g:update_count)
38 au! DiffUpdated
39
Bram Moolenaar42093c02016-07-30 16:16:54 +020040 windo diffoff
41 close!
42 set nomodified
43endfunc
44
45func Test_vert_split()
Bram Moolenaare828b762018-09-10 17:51:58 +020046 set diffopt=filler
47 call Common_vert_split()
48 set diffopt&
49endfunc
50
51func Test_vert_split_internal()
52 set diffopt=internal,filler
53 call Common_vert_split()
54 set diffopt&
55endfunc
56
57func Common_vert_split()
Bram Moolenaar42093c02016-07-30 16:16:54 +020058 " Disable the title to avoid xterm keeping the wrong one.
59 set notitle noicon
60 new
61 let l = ['1 aa', '2 bb', '3 cc', '4 dd', '5 ee']
62 call setline(1, l)
63 w! Xtest
64 normal dd
65 $
66 put
67 normal kkrXoxxx
68 w! Xtest2
69 file Nop
70 normal ggoyyyjjjozzzz
71 set foldmethod=marker foldcolumn=4
72 call assert_equal(0, &diff)
73 call assert_equal('marker', &foldmethod)
74 call assert_equal(4, &foldcolumn)
75 call assert_equal(0, &scrollbind)
76 call assert_equal(0, &cursorbind)
77 call assert_equal(1, &wrap)
78
79 vert diffsplit Xtest
80 vert diffsplit Xtest2
81 call assert_equal(1, &diff)
82 call assert_equal('diff', &foldmethod)
83 call assert_equal(2, &foldcolumn)
84 call assert_equal(1, &scrollbind)
85 call assert_equal(1, &cursorbind)
86 call assert_equal(0, &wrap)
87
88 let diff_fdm = &fdm
89 let diff_fdc = &fdc
90 " repeat entering diff mode here to see if this saves the wrong settings
91 diffthis
92 " jump to second window for a moment to have filler line appear at start of
93 " first window
94 wincmd w
95 normal gg
96 wincmd p
97 normal gg
98 call assert_equal(2, winline())
99 normal j
100 call assert_equal(4, winline())
101 normal j
102 call assert_equal(5, winline())
103 normal j
104 call assert_equal(6, winline())
105 normal j
106 call assert_equal(8, winline())
107 normal j
108 call assert_equal(9, winline())
109
110 wincmd w
111 normal gg
112 call assert_equal(1, winline())
113 normal j
114 call assert_equal(2, winline())
115 normal j
116 call assert_equal(4, winline())
117 normal j
118 call assert_equal(5, winline())
119 normal j
120 call assert_equal(8, winline())
121
122 wincmd w
123 normal gg
124 call assert_equal(2, winline())
125 normal j
126 call assert_equal(3, winline())
127 normal j
128 call assert_equal(4, winline())
129 normal j
130 call assert_equal(5, winline())
131 normal j
132 call assert_equal(6, winline())
133 normal j
134 call assert_equal(7, winline())
135 normal j
136 call assert_equal(8, winline())
137
138 " Test diffoff
139 diffoff!
140 1wincmd 2
141 let &diff = 1
142 let &fdm = diff_fdm
143 let &fdc = diff_fdc
144 4wincmd w
145 diffoff!
146 1wincmd w
147 call assert_equal(0, &diff)
148 call assert_equal('marker', &foldmethod)
149 call assert_equal(4, &foldcolumn)
150 call assert_equal(0, &scrollbind)
151 call assert_equal(0, &cursorbind)
152 call assert_equal(1, &wrap)
153
154 wincmd w
155 call assert_equal(0, &diff)
156 call assert_equal('marker', &foldmethod)
157 call assert_equal(4, &foldcolumn)
158 call assert_equal(0, &scrollbind)
159 call assert_equal(0, &cursorbind)
160 call assert_equal(1, &wrap)
161
162 wincmd w
163 call assert_equal(0, &diff)
164 call assert_equal('marker', &foldmethod)
165 call assert_equal(4, &foldcolumn)
166 call assert_equal(0, &scrollbind)
167 call assert_equal(0, &cursorbind)
168 call assert_equal(1, &wrap)
169
Bram Moolenaar623cf882016-07-30 16:36:01 +0200170 call delete('Xtest')
171 call delete('Xtest2')
Bram Moolenaar42093c02016-07-30 16:16:54 +0200172 windo bw!
173endfunc
174
175func Test_filler_lines()
176 " Test that diffing shows correct filler lines
177 enew!
178 put =range(4,10)
179 1d _
180 vnew
181 put =range(1,10)
182 1d _
183 windo diffthis
184 wincmd h
185 call assert_equal(1, line('w0'))
186 unlet! diff_fdm diff_fdc
Bram Moolenaar90d121f2016-07-30 19:11:25 +0200187 windo diffoff
188 bwipe!
189 enew!
190endfunc
Bram Moolenaar42093c02016-07-30 16:16:54 +0200191
Bram Moolenaar90d121f2016-07-30 19:11:25 +0200192func Test_diffget_diffput()
193 enew!
194 let l = range(50)
195 call setline(1, l)
196 call assert_fails('diffget', 'E99:')
197 diffthis
198 call assert_fails('diffget', 'E100:')
199 new
200 let l[10] = 'one'
201 let l[20] = 'two'
202 let l[30] = 'three'
203 let l[40] = 'four'
204 call setline(1, l)
205 diffthis
206 call assert_equal('one', getline(11))
207 11diffget
208 call assert_equal('10', getline(11))
209 21diffput
210 wincmd w
211 call assert_equal('two', getline(21))
212 normal 31Gdo
213 call assert_equal('three', getline(31))
214 call assert_equal('40', getline(41))
215 normal 41Gdp
216 wincmd w
217 call assert_equal('40', getline(41))
218 new
219 diffthis
220 call assert_fails('diffget', 'E101:')
221
222 windo diffoff
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200223 %bwipe!
224endfunc
225
Bram Moolenaar5f57bdc2018-10-25 17:52:23 +0200226" Test putting two changes from one buffer to another
227func Test_diffput_two()
228 new a
229 let win_a = win_getid()
230 call setline(1, range(1, 10))
231 diffthis
232 new b
233 let win_b = win_getid()
234 call setline(1, range(1, 10))
235 8del
236 5del
237 diffthis
238 call win_gotoid(win_a)
239 %diffput
240 call win_gotoid(win_b)
241 call assert_equal(map(range(1, 10), 'string(v:val)'), getline(1, '$'))
242 bwipe! a
243 bwipe! b
244endfunc
245
Yegappan Lakshmanan30443242021-06-10 21:52:15 +0200246" Test for :diffget/:diffput with a range that is inside a diff chunk
247func Test_diffget_diffput_range()
248 call setline(1, range(1, 10))
249 new
250 call setline(1, range(11, 20))
251 windo diffthis
252 3,5diffget
253 call assert_equal(['13', '14', '15'], getline(3, 5))
254 call setline(1, range(1, 10))
255 4,8diffput
256 wincmd p
257 call assert_equal(['13', '4', '5', '6', '7', '8', '19'], getline(3, 9))
258 %bw!
259endfunc
260
261" Test for :diffget/:diffput with an empty buffer and a non-empty buffer
262func Test_diffget_diffput_empty_buffer()
263 %d _
264 new
265 call setline(1, 'one')
266 windo diffthis
267 diffget
268 call assert_equal(['one'], getline(1, '$'))
269 %d _
270 diffput
271 wincmd p
272 call assert_equal([''], getline(1, '$'))
273 %bw!
274endfunc
275
Bram Moolenaarefcc3292019-12-30 21:59:03 +0100276" :diffput and :diffget completes names of buffers which
277" are in diff mode and which are different then current buffer.
278" No completion when the current window is not in diff mode.
Bram Moolenaarae7dba82019-12-29 13:56:33 +0100279func Test_diffget_diffput_completion()
Bram Moolenaarefcc3292019-12-30 21:59:03 +0100280 e Xdiff1 | diffthis
281 botright new Xdiff2
282 botright new Xdiff3 | split | diffthis
283 botright new Xdiff4 | diffthis
Bram Moolenaarae7dba82019-12-29 13:56:33 +0100284
Bram Moolenaarefcc3292019-12-30 21:59:03 +0100285 wincmd t
286 call assert_equal('Xdiff1', bufname('%'))
Bram Moolenaarae7dba82019-12-29 13:56:33 +0100287 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
Bram Moolenaarefcc3292019-12-30 21:59:03 +0100288 call assert_equal('"diffput Xdiff3 Xdiff4', @:)
Bram Moolenaarae7dba82019-12-29 13:56:33 +0100289 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
Bram Moolenaarefcc3292019-12-30 21:59:03 +0100290 call assert_equal('"diffget Xdiff3 Xdiff4', @:)
291 call assert_equal(['Xdiff3', 'Xdiff4'], getcompletion('', 'diff_buffer'))
Bram Moolenaarae7dba82019-12-29 13:56:33 +0100292
Bram Moolenaarefcc3292019-12-30 21:59:03 +0100293 " Xdiff2 is not in diff mode, so no completion for :diffput, :diffget
294 wincmd j
295 call assert_equal('Xdiff2', bufname('%'))
Bram Moolenaarae7dba82019-12-29 13:56:33 +0100296 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
297 call assert_equal('"diffput ', @:)
298 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
299 call assert_equal('"diffget ', @:)
300 call assert_equal([], getcompletion('', 'diff_buffer'))
301
Bram Moolenaarefcc3292019-12-30 21:59:03 +0100302 " Xdiff3 is split in 2 windows, only the top one is in diff mode.
303 " So completion of :diffput :diffget only happens in the top window.
304 wincmd j
305 call assert_equal('Xdiff3', bufname('%'))
306 call assert_equal(1, &diff)
307 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
308 call assert_equal('"diffput Xdiff1 Xdiff4', @:)
309 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
310 call assert_equal('"diffget Xdiff1 Xdiff4', @:)
311 call assert_equal(['Xdiff1', 'Xdiff4'], getcompletion('', 'diff_buffer'))
312
313 wincmd j
314 call assert_equal('Xdiff3', bufname('%'))
315 call assert_equal(0, &diff)
316 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
317 call assert_equal('"diffput ', @:)
318 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
319 call assert_equal('"diffget ', @:)
320 call assert_equal([], getcompletion('', 'diff_buffer'))
321
322 wincmd j
323 call assert_equal('Xdiff4', bufname('%'))
324 call feedkeys(":diffput \<C-A>\<C-B>\"\<CR>", 'tx')
325 call assert_equal('"diffput Xdiff1 Xdiff3', @:)
326 call feedkeys(":diffget \<C-A>\<C-B>\"\<CR>", 'tx')
327 call assert_equal('"diffget Xdiff1 Xdiff3', @:)
328 call assert_equal(['Xdiff1', 'Xdiff3'], getcompletion('', 'diff_buffer'))
329
Bram Moolenaarae7dba82019-12-29 13:56:33 +0100330 %bwipe
331endfunc
332
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200333func Test_dp_do_buffer()
334 e! one
335 let bn1=bufnr('%')
336 let l = range(60)
337 call setline(1, l)
338 diffthis
339
340 new two
341 let l[10] = 'one'
342 let l[20] = 'two'
343 let l[30] = 'three'
344 let l[40] = 'four'
345 let l[50] = 'five'
346 call setline(1, l)
347 diffthis
348
349 " dp and do with invalid buffer number.
350 11
351 call assert_fails('norm 99999dp', 'E102:')
352 call assert_fails('norm 99999do', 'E102:')
353 call assert_fails('diffput non_existing_buffer', 'E94:')
354 call assert_fails('diffget non_existing_buffer', 'E94:')
355
356 " dp and do with valid buffer number.
357 call assert_equal('one', getline('.'))
358 exe 'norm ' . bn1 . 'do'
359 call assert_equal('10', getline('.'))
360 21
361 call assert_equal('two', getline('.'))
Yegappan Lakshmanan30443242021-06-10 21:52:15 +0200362 diffget one
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200363 call assert_equal('20', getline('.'))
364
365 31
366 exe 'norm ' . bn1 . 'dp'
367 41
368 diffput one
369 wincmd w
370 31
371 call assert_equal('three', getline('.'))
372 41
373 call assert_equal('four', getline('.'))
374
375 " dp and do with buffer number which is not in diff mode.
376 new not_in_diff_mode
377 let bn3=bufnr('%')
378 wincmd w
379 51
380 call assert_fails('exe "norm" . bn3 . "dp"', 'E103:')
381 call assert_fails('exe "norm" . bn3 . "do"', 'E103:')
382 call assert_fails('diffput not_in_diff_mode', 'E94:')
383 call assert_fails('diffget not_in_diff_mode', 'E94:')
384
385 windo diffoff
386 %bwipe!
Bram Moolenaar42093c02016-07-30 16:16:54 +0200387endfunc
Bram Moolenaare67d5462016-08-27 22:40:42 +0200388
Bram Moolenaardf77cef2018-10-07 17:46:42 +0200389func Test_do_lastline()
390 e! one
391 call setline(1, ['1','2','3','4','5','6'])
392 diffthis
393
394 new two
395 call setline(1, ['2','4','5'])
396 diffthis
397
398 1
399 norm dp]c
400 norm dp]c
401 wincmd w
402 call assert_equal(4, line('$'))
403 norm G
404 norm do
405 call assert_equal(3, line('$'))
406
407 windo diffoff
408 %bwipe!
409endfunc
410
Bram Moolenaare67d5462016-08-27 22:40:42 +0200411func Test_diffoff()
412 enew!
413 call setline(1, ['Two', 'Three'])
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200414 redraw
Bram Moolenaare67d5462016-08-27 22:40:42 +0200415 let normattr = screenattr(1, 1)
416 diffthis
417 botright vert new
418 call setline(1, ['One', '', 'Two', 'Three'])
419 diffthis
420 redraw
Bram Moolenaar196b4662019-09-06 21:34:30 +0200421 call assert_notequal(normattr, 1->screenattr(1))
Bram Moolenaare67d5462016-08-27 22:40:42 +0200422 diffoff!
423 redraw
424 call assert_equal(normattr, screenattr(1, 1))
425 bwipe!
426 bwipe!
427endfunc
Bram Moolenaar025e3e02016-10-18 14:50:18 +0200428
Bram Moolenaare828b762018-09-10 17:51:58 +0200429func Common_icase_test()
430 edit one
Bram Moolenaarda22b8c2017-09-02 18:01:50 +0200431 call setline(1, ['One', 'Two', 'Three', 'Four', 'Fi#ve'])
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200432 redraw
433 let normattr = screenattr(1, 1)
434 diffthis
435
436 botright vert new two
Bram Moolenaarda22b8c2017-09-02 18:01:50 +0200437 call setline(1, ['one', 'TWO', 'Three ', 'Four', 'fI=VE'])
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200438 diffthis
439
440 redraw
441 call assert_equal(normattr, screenattr(1, 1))
442 call assert_equal(normattr, screenattr(2, 1))
443 call assert_notequal(normattr, screenattr(3, 1))
444 call assert_equal(normattr, screenattr(4, 1))
445
Bram Moolenaarda22b8c2017-09-02 18:01:50 +0200446 let dtextattr = screenattr(5, 3)
447 call assert_notequal(dtextattr, screenattr(5, 1))
448 call assert_notequal(dtextattr, screenattr(5, 5))
449
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200450 diffoff!
451 %bwipe!
Bram Moolenaare828b762018-09-10 17:51:58 +0200452endfunc
453
454func Test_diffopt_icase()
455 set diffopt=icase,foldcolumn:0
456 call Common_icase_test()
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200457 set diffopt&
458endfunc
459
Bram Moolenaare828b762018-09-10 17:51:58 +0200460func Test_diffopt_icase_internal()
461 set diffopt=icase,foldcolumn:0,internal
462 call Common_icase_test()
463 set diffopt&
464endfunc
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200465
Bram Moolenaare828b762018-09-10 17:51:58 +0200466func Common_iwhite_test()
467 edit one
468 " Difference in trailing spaces and amount of spaces should be ignored,
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200469 " but not other space differences.
Bram Moolenaare828b762018-09-10 17:51:58 +0200470 call setline(1, ["One \t", 'Two', 'Three', 'one two', 'one two', 'Four'])
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200471 redraw
472 let normattr = screenattr(1, 1)
473 diffthis
474
475 botright vert new two
Bram Moolenaare828b762018-09-10 17:51:58 +0200476 call setline(1, ["One\t ", "Two\t ", 'Three', 'one two', 'onetwo', ' Four'])
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200477 diffthis
478
479 redraw
480 call assert_equal(normattr, screenattr(1, 1))
481 call assert_equal(normattr, screenattr(2, 1))
482 call assert_equal(normattr, screenattr(3, 1))
Bram Moolenaare828b762018-09-10 17:51:58 +0200483 call assert_equal(normattr, screenattr(4, 1))
484 call assert_notequal(normattr, screenattr(5, 1))
485 call assert_notequal(normattr, screenattr(6, 1))
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200486
487 diffoff!
488 %bwipe!
Bram Moolenaare828b762018-09-10 17:51:58 +0200489endfunc
490
491func Test_diffopt_iwhite()
492 set diffopt=iwhite,foldcolumn:0
493 call Common_iwhite_test()
494 set diffopt&
495endfunc
496
497func Test_diffopt_iwhite_internal()
498 set diffopt=internal,iwhite,foldcolumn:0
499 call Common_iwhite_test()
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200500 set diffopt&
501endfunc
502
503func Test_diffopt_context()
504 enew!
505 call setline(1, ['1', '2', '3', '4', '5', '6', '7'])
506 diffthis
507 new
508 call setline(1, ['1', '2', '3', '4', '5x', '6', '7'])
509 diffthis
510
511 set diffopt=context:2
512 call assert_equal('+-- 2 lines: 1', foldtextresult(1))
Bram Moolenaare828b762018-09-10 17:51:58 +0200513 set diffopt=internal,context:2
514 call assert_equal('+-- 2 lines: 1', foldtextresult(1))
515
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200516 set diffopt=context:1
517 call assert_equal('+-- 3 lines: 1', foldtextresult(1))
Bram Moolenaare828b762018-09-10 17:51:58 +0200518 set diffopt=internal,context:1
519 call assert_equal('+-- 3 lines: 1', foldtextresult(1))
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200520
521 diffoff!
522 %bwipe!
523 set diffopt&
524endfunc
525
526func Test_diffopt_horizontal()
Bram Moolenaare828b762018-09-10 17:51:58 +0200527 set diffopt=internal,horizontal
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200528 diffsplit
529
530 call assert_equal(&columns, winwidth(1))
531 call assert_equal(&columns, winwidth(2))
532 call assert_equal(&lines, winheight(1) + winheight(2) + 3)
533 call assert_inrange(0, 1, winheight(1) - winheight(2))
534
535 set diffopt&
536 diffoff!
537 %bwipe
538endfunc
539
540func Test_diffopt_vertical()
Bram Moolenaare828b762018-09-10 17:51:58 +0200541 set diffopt=internal,vertical
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200542 diffsplit
543
544 call assert_equal(&lines - 2, winheight(1))
545 call assert_equal(&lines - 2, winheight(2))
546 call assert_equal(&columns, winwidth(1) + winwidth(2) + 1)
547 call assert_inrange(0, 1, winwidth(1) - winwidth(2))
548
549 set diffopt&
550 diffoff!
551 %bwipe
552endfunc
553
Bram Moolenaar97ce4192017-12-01 20:35:58 +0100554func Test_diffopt_hiddenoff()
Bram Moolenaare828b762018-09-10 17:51:58 +0200555 set diffopt=internal,filler,foldcolumn:0,hiddenoff
Bram Moolenaar97ce4192017-12-01 20:35:58 +0100556 e! one
557 call setline(1, ['Two', 'Three'])
558 redraw
559 let normattr = screenattr(1, 1)
560 diffthis
561 botright vert new two
562 call setline(1, ['One', 'Four'])
563 diffthis
564 redraw
565 call assert_notequal(normattr, screenattr(1, 1))
566 set hidden
567 close
568 redraw
569 " should not diffing with hidden buffer two while 'hiddenoff' is enabled
570 call assert_equal(normattr, screenattr(1, 1))
571
572 bwipe!
573 bwipe!
574 set hidden& diffopt&
575endfunc
576
Bram Moolenaar25ea0542017-02-03 23:16:28 +0100577func Test_diffoff_hidden()
Bram Moolenaare828b762018-09-10 17:51:58 +0200578 set diffopt=internal,filler,foldcolumn:0
Bram Moolenaar25ea0542017-02-03 23:16:28 +0100579 e! one
580 call setline(1, ['Two', 'Three'])
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200581 redraw
Bram Moolenaar25ea0542017-02-03 23:16:28 +0100582 let normattr = screenattr(1, 1)
583 diffthis
584 botright vert new two
585 call setline(1, ['One', 'Four'])
586 diffthis
587 redraw
588 call assert_notequal(normattr, screenattr(1, 1))
589 set hidden
590 close
591 redraw
592 " diffing with hidden buffer two
593 call assert_notequal(normattr, screenattr(1, 1))
594 diffoff
595 redraw
596 call assert_equal(normattr, screenattr(1, 1))
597 diffthis
598 redraw
599 " still diffing with hidden buffer two
600 call assert_notequal(normattr, screenattr(1, 1))
601 diffoff!
602 redraw
603 call assert_equal(normattr, screenattr(1, 1))
604 diffthis
605 redraw
606 " no longer diffing with hidden buffer two
607 call assert_equal(normattr, screenattr(1, 1))
608
609 bwipe!
610 bwipe!
611 set hidden& diffopt&
612endfunc
613
Bram Moolenaar025e3e02016-10-18 14:50:18 +0200614func Test_setting_cursor()
615 new Xtest1
616 put =range(1,90)
617 wq
618 new Xtest2
619 put =range(1,100)
620 wq
Bram Moolenaar97fbc402017-09-26 19:41:46 +0200621
Bram Moolenaar025e3e02016-10-18 14:50:18 +0200622 tabe Xtest2
623 $
624 diffsp Xtest1
625 tabclose
626
627 call delete('Xtest1')
628 call delete('Xtest2')
629endfunc
Bram Moolenaaraeb661e2017-02-26 19:59:59 +0100630
631func Test_diff_move_to()
632 new
633 call setline(1, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
634 diffthis
635 vnew
636 call setline(1, [1, '2x', 3, 4, 4, 5, '6x', 7, '8x', 9, '10x'])
637 diffthis
638 norm ]c
639 call assert_equal(2, line('.'))
640 norm 3]c
641 call assert_equal(9, line('.'))
642 norm 10]c
643 call assert_equal(11, line('.'))
644 norm [c
645 call assert_equal(9, line('.'))
646 norm 2[c
647 call assert_equal(5, line('.'))
648 norm 10[c
649 call assert_equal(2, line('.'))
650 %bwipe!
651endfunc
652
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200653func Test_diffexpr()
Bram Moolenaaraeb313f2020-11-27 19:13:28 +0100654 CheckExecutable diff
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200655
656 func DiffExpr()
Bram Moolenaar485b6272021-05-18 19:19:03 +0200657 " Prepend some text to check diff type detection
Bram Moolenaar3b8defd2018-09-13 13:03:11 +0200658 call writefile(['warning', ' message'], v:fname_out)
659 silent exe '!diff ' . v:fname_in . ' ' . v:fname_new . '>>' . v:fname_out
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200660 endfunc
661 set diffexpr=DiffExpr()
662 set diffopt=foldcolumn:0
663
664 enew!
665 call setline(1, ['one', 'two', 'three'])
666 redraw
667 let normattr = screenattr(1, 1)
668 diffthis
669
670 botright vert new
671 call setline(1, ['one', 'two', 'three.'])
672 diffthis
673
674 redraw
675 call assert_equal(normattr, screenattr(1, 1))
676 call assert_equal(normattr, screenattr(2, 1))
677 call assert_notequal(normattr, screenattr(3, 1))
Yegappan Lakshmanan30443242021-06-10 21:52:15 +0200678 diffoff!
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200679
Yegappan Lakshmanan30443242021-06-10 21:52:15 +0200680 " Try using an non-existing function for 'diffexpr'.
681 set diffexpr=NewDiffFunc()
682 call assert_fails('windo diffthis', ['E117:', 'E97:'])
Bram Moolenaar79a213d2017-05-16 13:15:18 +0200683 diffoff!
684 %bwipe!
685 set diffexpr& diffopt&
686endfunc
687
Bram Moolenaaraeb661e2017-02-26 19:59:59 +0100688func Test_diffpatch()
689 " The patch program on MS-Windows may fail or hang.
Bram Moolenaar6d91bcb2020-08-12 18:50:36 +0200690 CheckExecutable patch
691 CheckUnix
Bram Moolenaaraeb661e2017-02-26 19:59:59 +0100692 new
693 insert
694***************
695*** 1,3 ****
696 1
697! 2
698 3
699--- 1,4 ----
700 1
701! 2x
702 3
703+ 4
704.
Bram Moolenaar97fbc402017-09-26 19:41:46 +0200705 saveas! Xpatch
Bram Moolenaaraeb661e2017-02-26 19:59:59 +0100706 bwipe!
707 new
708 call assert_fails('diffpatch Xpatch', 'E816:')
Bram Moolenaar1ef73e32017-03-09 19:21:30 +0100709
Bram Moolenaara95ab322017-03-11 19:21:53 +0100710 for name in ['Xpatch', 'Xpatch$HOME', 'Xpa''tch']
Bram Moolenaar1ef73e32017-03-09 19:21:30 +0100711 call setline(1, ['1', '2', '3'])
712 if name != 'Xpatch'
713 call rename('Xpatch', name)
714 endif
715 exe 'diffpatch ' . escape(name, '$')
716 call assert_equal(['1', '2x', '3', '4'], getline(1, '$'))
717 if name != 'Xpatch'
718 call rename(name, 'Xpatch')
719 endif
720 bwipe!
721 endfor
722
Bram Moolenaaraeb661e2017-02-26 19:59:59 +0100723 call delete('Xpatch')
724 bwipe!
725endfunc
726
727func Test_diff_too_many_buffers()
728 for i in range(1, 8)
729 exe "new Xtest" . i
730 diffthis
731 endfor
732 new Xtest9
733 call assert_fails('diffthis', 'E96:')
734 %bwipe!
735endfunc
736
737func Test_diff_nomodifiable()
738 new
739 call setline(1, [1, 2, 3, 4])
740 setl nomodifiable
741 diffthis
742 vnew
743 call setline(1, ['1x', 2, 3, 3, 4])
744 diffthis
745 call assert_fails('norm dp', 'E793:')
746 setl nomodifiable
747 call assert_fails('norm do', 'E21:')
748 %bwipe!
749endfunc
Bram Moolenaarf58a8472017-03-05 18:03:04 +0100750
Bram Moolenaar97fbc402017-09-26 19:41:46 +0200751func Test_diff_hlID()
752 new
753 call setline(1, [1, 2, 3])
754 diffthis
755 vnew
756 call setline(1, ['1x', 2, 'x', 3])
757 diffthis
758 redraw
759
Bram Moolenaara74e4942019-08-04 17:35:53 +0200760 call diff_hlID(-1, 1)->synIDattr("name")->assert_equal("")
Bram Moolenaar97fbc402017-09-26 19:41:46 +0200761
Bram Moolenaara74e4942019-08-04 17:35:53 +0200762 call diff_hlID(1, 1)->synIDattr("name")->assert_equal("DiffChange")
763 call diff_hlID(1, 2)->synIDattr("name")->assert_equal("DiffText")
764 call diff_hlID(2, 1)->synIDattr("name")->assert_equal("")
765 call diff_hlID(3, 1)->synIDattr("name")->assert_equal("DiffAdd")
Bram Moolenaar1a3a8912019-08-23 22:31:37 +0200766 eval 4->diff_hlID(1)->synIDattr("name")->assert_equal("")
Bram Moolenaar97fbc402017-09-26 19:41:46 +0200767
768 wincmd w
769 call assert_equal(synIDattr(diff_hlID(1, 1), "name"), "DiffChange")
770 call assert_equal(synIDattr(diff_hlID(2, 1), "name"), "")
771 call assert_equal(synIDattr(diff_hlID(3, 1), "name"), "")
772
773 %bwipe!
774endfunc
775
776func Test_diff_filler()
777 new
778 call setline(1, [1, 2, 3, 'x', 4])
779 diffthis
780 vnew
781 call setline(1, [1, 2, 'y', 'y', 3, 4])
782 diffthis
783 redraw
784
Bram Moolenaar1a3a8912019-08-23 22:31:37 +0200785 call assert_equal([0, 0, 0, 0, 0, 0, 0, 1, 0], map(range(-1, 7), 'v:val->diff_filler()'))
Bram Moolenaar97fbc402017-09-26 19:41:46 +0200786 wincmd w
787 call assert_equal([0, 0, 0, 0, 2, 0, 0, 0], map(range(-1, 6), 'diff_filler(v:val)'))
788
789 %bwipe!
790endfunc
791
Bram Moolenaarf58a8472017-03-05 18:03:04 +0100792func Test_diff_lastline()
793 enew!
794 only!
795 call setline(1, ['This is a ', 'line with five ', 'rows'])
796 diffthis
797 botright vert new
798 call setline(1, ['This is', 'a line with ', 'four rows'])
799 diffthis
800 1
801 call feedkeys("Je a\<CR>", 'tx')
802 call feedkeys("Je a\<CR>", 'tx')
803 let w1lines = winline()
804 wincmd w
805 $
806 let w2lines = winline()
807 call assert_equal(w2lines, w1lines)
808 bwipe!
809 bwipe!
810endfunc
Bram Moolenaare828b762018-09-10 17:51:58 +0200811
Bram Moolenaar785fc652018-09-15 19:17:38 +0200812func WriteDiffFiles(buf, list1, list2)
Bram Moolenaare828b762018-09-10 17:51:58 +0200813 call writefile(a:list1, 'Xfile1')
814 call writefile(a:list2, 'Xfile2')
Bram Moolenaar785fc652018-09-15 19:17:38 +0200815 if a:buf
816 call term_sendkeys(a:buf, ":checktime\<CR>")
817 endif
Bram Moolenaare828b762018-09-10 17:51:58 +0200818endfunc
819
Bram Moolenaar785fc652018-09-15 19:17:38 +0200820" Verify a screendump with both the internal and external diff.
Bram Moolenaare828b762018-09-10 17:51:58 +0200821func VerifyBoth(buf, dumpfile, extra)
Bram Moolenaare828b762018-09-10 17:51:58 +0200822 " trailing : for leaving the cursor on the command line
Bram Moolenaar785fc652018-09-15 19:17:38 +0200823 for cmd in [":set diffopt=filler" . a:extra . "\<CR>:", ":set diffopt+=internal\<CR>:"]
Bram Moolenaare828b762018-09-10 17:51:58 +0200824 call term_sendkeys(a:buf, cmd)
825 if VerifyScreenDump(a:buf, a:dumpfile, {}, cmd =~ 'internal' ? 'internal' : 'external')
Bram Moolenaar485b6272021-05-18 19:19:03 +0200826 " don't let the next iteration overwrite the "failed" file.
827 return
Bram Moolenaare828b762018-09-10 17:51:58 +0200828 endif
829 endfor
Bram Moolenaar485b6272021-05-18 19:19:03 +0200830
831 " also test unified diff
832 call term_sendkeys(a:buf, ":call SetupUnified()\<CR>:")
glacambread5c1782021-05-24 14:20:53 +0200833 call term_sendkeys(a:buf, ":redraw!\<CR>:")
Bram Moolenaar485b6272021-05-18 19:19:03 +0200834 call VerifyScreenDump(a:buf, a:dumpfile, {}, 'unified')
835 call term_sendkeys(a:buf, ":call StopUnified()\<CR>:")
Bram Moolenaare828b762018-09-10 17:51:58 +0200836endfunc
837
Bram Moolenaar785fc652018-09-15 19:17:38 +0200838" Verify a screendump with the internal diff only.
839func VerifyInternal(buf, dumpfile, extra)
840 call term_sendkeys(a:buf, ":diffupdate!\<CR>")
841 " trailing : for leaving the cursor on the command line
842 call term_sendkeys(a:buf, ":set diffopt=internal,filler" . a:extra . "\<CR>:")
Bram Moolenaar6a2c5a72020-04-08 21:50:25 +0200843 call TermWait(a:buf)
Bram Moolenaar785fc652018-09-15 19:17:38 +0200844 call VerifyScreenDump(a:buf, a:dumpfile, {})
845endfunc
846
Bram Moolenaare828b762018-09-10 17:51:58 +0200847func Test_diff_screen()
Bram Moolenaar3c8ee622019-08-03 22:55:50 +0200848 CheckScreendump
849 CheckFeature menu
850
Bram Moolenaar485b6272021-05-18 19:19:03 +0200851 let lines =<< trim END
852 func UnifiedDiffExpr()
853 " Prepend some text to check diff type detection
854 call writefile(['warning', ' message'], v:fname_out)
glacambread5c1782021-05-24 14:20:53 +0200855 silent exe '!diff -U0 ' .. v:fname_in .. ' ' .. v:fname_new .. '>>' .. v:fname_out
Bram Moolenaar485b6272021-05-18 19:19:03 +0200856 endfunc
857 func SetupUnified()
858 set diffexpr=UnifiedDiffExpr()
glacambread5c1782021-05-24 14:20:53 +0200859 diffupdate
Bram Moolenaar485b6272021-05-18 19:19:03 +0200860 endfunc
861 func StopUnified()
862 set diffexpr=
863 endfunc
864 END
865 call writefile(lines, 'XdiffSetup')
866
Bram Moolenaare828b762018-09-10 17:51:58 +0200867 " clean up already existing swap files, just in case
868 call delete('.Xfile1.swp')
869 call delete('.Xfile2.swp')
870
871 " Test 1: Add a line in beginning of file 2
Bram Moolenaar785fc652018-09-15 19:17:38 +0200872 call WriteDiffFiles(0, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
Bram Moolenaar485b6272021-05-18 19:19:03 +0200873 let buf = RunVimInTerminal('-d -S XdiffSetup Xfile1 Xfile2', {})
Bram Moolenaar8ee4c012019-03-29 18:08:18 +0100874 " Set autoread mode, so that Vim won't complain once we re-write the test
Bram Moolenaare828b762018-09-10 17:51:58 +0200875 " files
Bram Moolenaar785fc652018-09-15 19:17:38 +0200876 call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
Bram Moolenaare828b762018-09-10 17:51:58 +0200877
878 call VerifyBoth(buf, 'Test_diff_01', '')
879
880 " Test 2: Add a line in beginning of file 1
Bram Moolenaar785fc652018-09-15 19:17:38 +0200881 call WriteDiffFiles(buf, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
Bram Moolenaare828b762018-09-10 17:51:58 +0200882 call VerifyBoth(buf, 'Test_diff_02', '')
883
884 " Test 3: Add a line at the end of file 2
Bram Moolenaar785fc652018-09-15 19:17:38 +0200885 call WriteDiffFiles(buf, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11])
Bram Moolenaare828b762018-09-10 17:51:58 +0200886 call VerifyBoth(buf, 'Test_diff_03', '')
887
888 " Test 4: Add a line at the end of file 1
Bram Moolenaar785fc652018-09-15 19:17:38 +0200889 call WriteDiffFiles(buf, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
Bram Moolenaare828b762018-09-10 17:51:58 +0200890 call VerifyBoth(buf, 'Test_diff_04', '')
891
892 " Test 5: Add a line in the middle of file 2, remove on at the end of file 1
Bram Moolenaar785fc652018-09-15 19:17:38 +0200893 call WriteDiffFiles(buf, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], [1, 2, 3, 4, 4, 5, 6, 7, 8, 9, 10])
Bram Moolenaare828b762018-09-10 17:51:58 +0200894 call VerifyBoth(buf, 'Test_diff_05', '')
895
896 " Test 6: Add a line in the middle of file 1, remove on at the end of file 2
Bram Moolenaar785fc652018-09-15 19:17:38 +0200897 call WriteDiffFiles(buf, [1, 2, 3, 4, 4, 5, 6, 7, 8, 9, 10], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11])
Bram Moolenaare828b762018-09-10 17:51:58 +0200898 call VerifyBoth(buf, 'Test_diff_06', '')
899
Bram Moolenaarb9ddda62019-02-19 23:00:50 +0100900 " Variants on test 6 with different context settings
901 call term_sendkeys(buf, ":set diffopt+=context:2\<cr>")
902 call VerifyScreenDump(buf, 'Test_diff_06.2', {})
903 call term_sendkeys(buf, ":set diffopt-=context:2\<cr>")
904 call term_sendkeys(buf, ":set diffopt+=context:1\<cr>")
905 call VerifyScreenDump(buf, 'Test_diff_06.1', {})
906 call term_sendkeys(buf, ":set diffopt-=context:1\<cr>")
907 call term_sendkeys(buf, ":set diffopt+=context:0\<cr>")
908 call VerifyScreenDump(buf, 'Test_diff_06.0', {})
909 call term_sendkeys(buf, ":set diffopt-=context:0\<cr>")
910
Bram Moolenaare828b762018-09-10 17:51:58 +0200911 " Test 7 - 9: Test normal/patience/histogram diff algorithm
Bram Moolenaar785fc652018-09-15 19:17:38 +0200912 call WriteDiffFiles(buf, ['#include <stdio.h>', '', '// Frobs foo heartily', 'int frobnitz(int foo)', '{',
Bram Moolenaare828b762018-09-10 17:51:58 +0200913 \ ' int i;', ' for(i = 0; i < 10; i++)', ' {', ' printf("Your answer is: ");',
914 \ ' printf("%d\n", foo);', ' }', '}', '', 'int fact(int n)', '{', ' if(n > 1)', ' {',
915 \ ' return fact(n-1) * n;', ' }', ' return 1;', '}', '', 'int main(int argc, char **argv)',
916 \ '{', ' frobnitz(fact(10));', '}'],
917 \ ['#include <stdio.h>', '', 'int fib(int n)', '{', ' if(n > 2)', ' {',
918 \ ' return fib(n-1) + fib(n-2);', ' }', ' return 1;', '}', '', '// Frobs foo heartily',
919 \ 'int frobnitz(int foo)', '{', ' int i;', ' for(i = 0; i < 10; i++)', ' {',
920 \ ' printf("%d\n", foo);', ' }', '}', '',
921 \ 'int main(int argc, char **argv)', '{', ' frobnitz(fib(10));', '}'])
922 call term_sendkeys(buf, ":diffupdate!\<cr>")
923 call term_sendkeys(buf, ":set diffopt+=internal\<cr>")
924 call VerifyScreenDump(buf, 'Test_diff_07', {})
925
926 call term_sendkeys(buf, ":set diffopt+=algorithm:patience\<cr>")
927 call VerifyScreenDump(buf, 'Test_diff_08', {})
928
929 call term_sendkeys(buf, ":set diffopt+=algorithm:histogram\<cr>")
930 call VerifyScreenDump(buf, 'Test_diff_09', {})
931
932 " Test 10-11: normal/indent-heuristic
933 call term_sendkeys(buf, ":set diffopt&vim\<cr>")
Bram Moolenaar785fc652018-09-15 19:17:38 +0200934 call WriteDiffFiles(buf, ['', ' def finalize(values)', '', ' values.each do |v|', ' v.finalize', ' end'],
Bram Moolenaare828b762018-09-10 17:51:58 +0200935 \ ['', ' def finalize(values)', '', ' values.each do |v|', ' v.prepare', ' end', '',
936 \ ' values.each do |v|', ' v.finalize', ' end'])
937 call term_sendkeys(buf, ":diffupdate!\<cr>")
938 call term_sendkeys(buf, ":set diffopt+=internal\<cr>")
939 call VerifyScreenDump(buf, 'Test_diff_10', {})
940
Bram Moolenaarb6fc7282018-12-04 22:24:16 +0100941 " Leave trailing : at commandline!
942 call term_sendkeys(buf, ":set diffopt+=indent-heuristic\<cr>:\<cr>")
943 call VerifyScreenDump(buf, 'Test_diff_11', {}, 'one')
944 " shouldn't matter, if indent-algorithm comes before or after the algorithm
945 call term_sendkeys(buf, ":set diffopt&\<cr>")
946 call term_sendkeys(buf, ":set diffopt+=indent-heuristic,algorithm:patience\<cr>:\<cr>")
947 call VerifyScreenDump(buf, 'Test_diff_11', {}, 'two')
948 call term_sendkeys(buf, ":set diffopt&\<cr>")
949 call term_sendkeys(buf, ":set diffopt+=algorithm:patience,indent-heuristic\<cr>:\<cr>")
950 call VerifyScreenDump(buf, 'Test_diff_11', {}, 'three')
Bram Moolenaare828b762018-09-10 17:51:58 +0200951
952 " Test 12: diff the same file
Bram Moolenaar785fc652018-09-15 19:17:38 +0200953 call WriteDiffFiles(buf, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
Bram Moolenaare828b762018-09-10 17:51:58 +0200954 call VerifyBoth(buf, 'Test_diff_12', '')
955
956 " Test 13: diff an empty file
Bram Moolenaar785fc652018-09-15 19:17:38 +0200957 call WriteDiffFiles(buf, [], [])
Bram Moolenaare828b762018-09-10 17:51:58 +0200958 call VerifyBoth(buf, 'Test_diff_13', '')
959
960 " Test 14: test diffopt+=icase
Bram Moolenaar785fc652018-09-15 19:17:38 +0200961 call WriteDiffFiles(buf, ['a', 'b', 'cd'], ['A', 'b', 'cDe'])
Bram Moolenaare828b762018-09-10 17:51:58 +0200962 call VerifyBoth(buf, 'Test_diff_14', " diffopt+=filler diffopt+=icase")
963
964 " Test 15-16: test diffopt+=iwhite
Bram Moolenaar785fc652018-09-15 19:17:38 +0200965 call WriteDiffFiles(buf, ['int main()', '{', ' printf("Hello, World!");', ' return 0;', '}'],
Bram Moolenaare828b762018-09-10 17:51:58 +0200966 \ ['int main()', '{', ' if (0)', ' {', ' printf("Hello, World!");', ' return 0;', ' }', '}'])
967 call term_sendkeys(buf, ":diffupdate!\<cr>")
968 call term_sendkeys(buf, ":set diffopt&vim diffopt+=filler diffopt+=iwhite\<cr>")
969 call VerifyScreenDump(buf, 'Test_diff_15', {})
970 call term_sendkeys(buf, ":set diffopt+=internal\<cr>")
971 call VerifyScreenDump(buf, 'Test_diff_16', {})
972
Bram Moolenaar785fc652018-09-15 19:17:38 +0200973 " Test 17: test diffopt+=iblank
974 call WriteDiffFiles(buf, ['a', ' ', 'cd', 'ef', 'xxx'], ['a', 'cd', '', 'ef', 'yyy'])
975 call VerifyInternal(buf, 'Test_diff_17', " diffopt+=iblank")
976
977 " Test 18: test diffopt+=iblank,iwhite / iwhiteall / iwhiteeol
978 call VerifyInternal(buf, 'Test_diff_18', " diffopt+=iblank,iwhite")
979 call VerifyInternal(buf, 'Test_diff_18', " diffopt+=iblank,iwhiteall")
980 call VerifyInternal(buf, 'Test_diff_18', " diffopt+=iblank,iwhiteeol")
981
982 " Test 19: test diffopt+=iwhiteeol
983 call WriteDiffFiles(buf, ['a ', 'x', 'cd', 'ef', 'xx xx', 'foo', 'bar'], ['a', 'x', 'c d', ' ef', 'xx xx', 'foo', '', 'bar'])
984 call VerifyInternal(buf, 'Test_diff_19', " diffopt+=iwhiteeol")
985
986 " Test 19: test diffopt+=iwhiteall
987 call VerifyInternal(buf, 'Test_diff_20', " diffopt+=iwhiteall")
988
Bram Moolenaare828b762018-09-10 17:51:58 +0200989 " clean up
990 call StopVimInTerminal(buf)
991 call delete('Xfile1')
992 call delete('Xfile2')
Bram Moolenaar485b6272021-05-18 19:19:03 +0200993 call delete('XdiffSetup')
Bram Moolenaare828b762018-09-10 17:51:58 +0200994endfunc
995
Bram Moolenaar4a5abbd2018-10-02 18:26:10 +0200996func Test_diff_with_cursorline()
Bram Moolenaar3c8ee622019-08-03 22:55:50 +0200997 CheckScreendump
Bram Moolenaar4a5abbd2018-10-02 18:26:10 +0200998
999 call writefile([
1000 \ 'hi CursorLine ctermbg=red ctermfg=white',
1001 \ 'set cursorline',
1002 \ 'call setline(1, ["foo","foo","foo","bar"])',
1003 \ 'vnew',
1004 \ 'call setline(1, ["bee","foo","foo","baz"])',
1005 \ 'windo diffthis',
1006 \ '2wincmd w',
1007 \ ], 'Xtest_diff_cursorline')
1008 let buf = RunVimInTerminal('-S Xtest_diff_cursorline', {})
1009
1010 call VerifyScreenDump(buf, 'Test_diff_with_cursorline_01', {})
1011 call term_sendkeys(buf, "j")
1012 call VerifyScreenDump(buf, 'Test_diff_with_cursorline_02', {})
1013 call term_sendkeys(buf, "j")
1014 call VerifyScreenDump(buf, 'Test_diff_with_cursorline_03', {})
1015
1016 " clean up
1017 call StopVimInTerminal(buf)
1018 call delete('Xtest_diff_cursorline')
1019endfunc
Bram Moolenaarf7acf2b2018-11-01 21:14:53 +01001020
Bram Moolenaar248fdb32019-09-15 19:31:28 +02001021func Test_diff_with_syntax()
1022 CheckScreendump
1023
1024 let lines =<< trim END
1025 void doNothing() {
1026 int x = 0;
1027 char *s = "hello";
1028 return 5;
1029 }
1030 END
1031 call writefile(lines, 'Xprogram1.c')
1032 let lines =<< trim END
1033 void doSomething() {
1034 int x = 0;
1035 char *s = "there";
1036 return 5;
1037 }
1038 END
1039 call writefile(lines, 'Xprogram2.c')
1040
1041 let lines =<< trim END
1042 edit Xprogram1.c
1043 diffsplit Xprogram2.c
1044 END
1045 call writefile(lines, 'Xtest_diff_syntax')
1046 let buf = RunVimInTerminal('-S Xtest_diff_syntax', {})
1047
1048 call VerifyScreenDump(buf, 'Test_diff_syntax_1', {})
1049
1050 " clean up
1051 call StopVimInTerminal(buf)
1052 call delete('Xtest_diff_syntax')
1053 call delete('Xprogram1.c')
1054 call delete('Xprogram2.c')
1055endfunc
1056
Bram Moolenaarf7acf2b2018-11-01 21:14:53 +01001057func Test_diff_of_diff()
Bram Moolenaar3c8ee622019-08-03 22:55:50 +02001058 CheckScreendump
1059 CheckFeature rightleft
Bram Moolenaarf7acf2b2018-11-01 21:14:53 +01001060
1061 call writefile([
1062 \ 'call setline(1, ["aa","bb","cc","@@ -3,2 +5,7 @@","dd","ee","ff"])',
1063 \ 'vnew',
1064 \ 'call setline(1, ["aa","bb","cc"])',
1065 \ 'windo diffthis',
Bram Moolenaar8ee4c012019-03-29 18:08:18 +01001066 \ '1wincmd w',
1067 \ 'setlocal number',
Bram Moolenaarf7acf2b2018-11-01 21:14:53 +01001068 \ ], 'Xtest_diff_diff')
1069 let buf = RunVimInTerminal('-S Xtest_diff_diff', {})
1070
1071 call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {})
1072
Bram Moolenaare73f9112019-03-29 18:29:54 +01001073 call term_sendkeys(buf, ":set rightleft\<cr>")
1074 call VerifyScreenDump(buf, 'Test_diff_of_diff_02', {})
1075
Bram Moolenaarf7acf2b2018-11-01 21:14:53 +01001076 " clean up
1077 call StopVimInTerminal(buf)
1078 call delete('Xtest_diff_diff')
1079endfunc
Bram Moolenaarc8234772019-11-10 21:00:27 +01001080
1081func CloseoffSetup()
1082 enew
1083 call setline(1, ['one', 'two', 'three'])
1084 diffthis
1085 new
1086 call setline(1, ['one', 'tow', 'three'])
1087 diffthis
1088 call assert_equal(1, &diff)
1089 only!
1090endfunc
1091
1092func Test_diff_closeoff()
1093 " "closeoff" included by default: last diff win gets 'diff' reset'
1094 call CloseoffSetup()
1095 call assert_equal(0, &diff)
1096 enew!
1097
1098 " "closeoff" excluded: last diff win keeps 'diff' set'
1099 set diffopt-=closeoff
1100 call CloseoffSetup()
1101 call assert_equal(1, &diff)
1102 diffoff!
1103 enew!
1104endfunc
Bram Moolenaarf4a1d1c2019-11-16 13:50:25 +01001105
Bram Moolenaar4223d432021-02-10 13:18:17 +01001106func Test_diff_followwrap()
1107 new
1108 set diffopt+=followwrap
1109 set wrap
1110 diffthis
1111 call assert_equal(1, &wrap)
1112 diffoff
1113 set nowrap
1114 diffthis
1115 call assert_equal(0, &wrap)
1116 diffoff
1117 set diffopt&
1118 bwipe!
1119endfunc
1120
Bram Moolenaarf4a1d1c2019-11-16 13:50:25 +01001121func Test_diff_maintains_change_mark()
1122 enew!
1123 call setline(1, ['a', 'b', 'c', 'd'])
1124 diffthis
1125 new
1126 call setline(1, ['a', 'b', 'c', 'e'])
1127 " Set '[ and '] marks
1128 2,3yank
1129 call assert_equal([2, 3], [line("'["), line("']")])
1130 " Verify they aren't affected by the implicit diff
1131 diffthis
1132 call assert_equal([2, 3], [line("'["), line("']")])
1133 " Verify they aren't affected by an explicit diff
1134 diffupdate
1135 call assert_equal([2, 3], [line("'["), line("']")])
1136 bwipe!
1137 bwipe!
1138endfunc
Bram Moolenaar8dfcce32020-03-18 19:32:26 +01001139
1140" Test for 'patchexpr'
1141func Test_patchexpr()
1142 let g:patch_args = []
1143 func TPatch()
1144 call add(g:patch_args, readfile(v:fname_in))
1145 call add(g:patch_args, readfile(v:fname_diff))
1146 call writefile(['output file'], v:fname_out)
1147 endfunc
1148 set patchexpr=TPatch()
1149
1150 call writefile(['input file'], 'Xinput')
1151 call writefile(['diff file'], 'Xdiff')
1152 %bwipe!
1153 edit Xinput
1154 diffpatch Xdiff
1155 call assert_equal('output file', getline(1))
1156 call assert_equal('Xinput.new', bufname())
1157 call assert_equal(2, winnr('$'))
1158 call assert_true(&diff)
1159
1160 call delete('Xinput')
1161 call delete('Xdiff')
1162 set patchexpr&
1163 delfunc TPatch
1164 %bwipe!
1165endfunc
1166
Bram Moolenaar511feec2020-06-18 19:15:27 +02001167func Test_diff_rnu()
1168 CheckScreendump
1169
1170 let content =<< trim END
1171 call setline(1, ['a', 'a', 'a', 'y', 'b', 'b', 'b', 'b', 'b'])
1172 vnew
1173 call setline(1, ['a', 'a', 'a', 'x', 'x', 'x', 'b', 'b', 'b', 'b', 'b'])
1174 windo diffthis
1175 setlocal number rnu foldcolumn=0
1176 END
1177 call writefile(content, 'Xtest_diff_rnu')
1178 let buf = RunVimInTerminal('-S Xtest_diff_rnu', {})
1179
1180 call VerifyScreenDump(buf, 'Test_diff_rnu_01', {})
1181
1182 call term_sendkeys(buf, "j")
1183 call VerifyScreenDump(buf, 'Test_diff_rnu_02', {})
1184 call term_sendkeys(buf, "j")
1185 call VerifyScreenDump(buf, 'Test_diff_rnu_03', {})
1186
1187 " clean up
1188 call StopVimInTerminal(buf)
1189 call delete('Xtest_diff_rnu')
1190endfunc
1191
Bram Moolenaarfc838d62020-06-25 22:23:48 +02001192func Test_diff_multilineconceal()
1193 new
1194 diffthis
1195
1196 new
1197 call matchadd('Conceal', 'a\nb', 9, -1, {'conceal': 'Y'})
1198 set cole=2 cocu=n
1199 call setline(1, ["a", "b"])
1200 diffthis
1201 redraw
1202endfunc
1203
Bram Moolenaar8455c5e2020-07-14 21:22:30 +02001204func Test_diff_and_scroll()
1205 " this was causing an ml_get error
1206 set ls=2
1207 for i in range(winheight(0) * 2)
1208 call setline(i, i < winheight(0) - 10 ? i : i + 10)
1209 endfor
1210 vnew
1211 for i in range(winheight(0)*2 + 10)
1212 call setline(i, i < winheight(0) - 10 ? 0 : i)
1213 endfor
1214 diffthis
1215 wincmd p
1216 diffthis
1217 execute 'normal ' . winheight(0) . "\<C-d>"
1218
1219 bwipe!
1220 bwipe!
1221 set ls&
1222endfunc
1223
Bram Moolenaarfabc3ca2020-11-05 19:07:21 +01001224func Test_diff_filler_cursorcolumn()
1225 CheckScreendump
1226
1227 let content =<< trim END
1228 call setline(1, ['aa', 'bb', 'cc'])
1229 vnew
1230 call setline(1, ['aa', 'cc'])
1231 windo diffthis
1232 wincmd p
1233 setlocal cursorcolumn foldcolumn=0
1234 norm! gg0
1235 redraw!
1236 END
1237 call writefile(content, 'Xtest_diff_cuc')
1238 let buf = RunVimInTerminal('-S Xtest_diff_cuc', {})
1239
1240 call VerifyScreenDump(buf, 'Test_diff_cuc_01', {})
1241
1242 call term_sendkeys(buf, "l")
1243 call term_sendkeys(buf, "\<C-l>")
1244 call VerifyScreenDump(buf, 'Test_diff_cuc_02', {})
1245 call term_sendkeys(buf, "0j")
1246 call term_sendkeys(buf, "\<C-l>")
1247 call VerifyScreenDump(buf, 'Test_diff_cuc_03', {})
1248 call term_sendkeys(buf, "l")
1249 call term_sendkeys(buf, "\<C-l>")
1250 call VerifyScreenDump(buf, 'Test_diff_cuc_04', {})
1251
1252 " clean up
1253 call StopVimInTerminal(buf)
1254 call delete('Xtest_diff_cuc')
1255endfunc
1256
Yegappan Lakshmanan30443242021-06-10 21:52:15 +02001257" Test for adding/removing lines inside diff chunks, between diff chunks
1258" and before diff chunks
1259func Test_diff_modify_chunks()
1260 enew!
1261 let w2_id = win_getid()
1262 call setline(1, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
1263 new
1264 let w1_id = win_getid()
1265 call setline(1, ['a', '2', '3', 'd', 'e', 'f', '7', '8', 'i'])
1266 windo diffthis
1267
1268 " remove a line between two diff chunks and create a new diff chunk
1269 call win_gotoid(w2_id)
1270 5d
1271 call win_gotoid(w1_id)
1272 call diff_hlID(5, 1)->synIDattr('name')->assert_equal('DiffAdd')
1273
1274 " add a line between two diff chunks
1275 call win_gotoid(w2_id)
1276 normal! 4Goe
1277 call win_gotoid(w1_id)
1278 call diff_hlID(4, 1)->synIDattr('name')->assert_equal('')
1279 call diff_hlID(5, 1)->synIDattr('name')->assert_equal('')
1280
1281 " remove all the lines in a diff chunk.
1282 call win_gotoid(w2_id)
1283 7,8d
1284 call win_gotoid(w1_id)
1285 let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
1286 call assert_equal(['', 'DiffText', 'DiffText', '', '', '', 'DiffAdd',
1287 \ 'DiffAdd', ''], hl)
1288
1289 " remove lines from one diff chunk to just before the next diff chunk
1290 call win_gotoid(w2_id)
1291 call setline(1, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
1292 2,6d
1293 call win_gotoid(w1_id)
1294 let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
1295 call assert_equal(['', 'DiffText', 'DiffText', 'DiffAdd', 'DiffAdd',
1296 \ 'DiffAdd', 'DiffAdd', 'DiffAdd', ''], hl)
1297
1298 " remove lines just before the top of a diff chunk
1299 call win_gotoid(w2_id)
1300 call setline(1, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
1301 5,6d
1302 call win_gotoid(w1_id)
1303 let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
1304 call assert_equal(['', 'DiffText', 'DiffText', '', 'DiffText', 'DiffText',
1305 \ 'DiffAdd', 'DiffAdd', ''], hl)
1306
1307 " remove line after the end of a diff chunk
1308 call win_gotoid(w2_id)
1309 call setline(1, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
1310 4d
1311 call win_gotoid(w1_id)
1312 let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
1313 call assert_equal(['', 'DiffText', 'DiffText', 'DiffAdd', '', '', 'DiffText',
1314 \ 'DiffText', ''], hl)
1315
1316 " remove lines starting from the end of one diff chunk and ending inside
1317 " another diff chunk
1318 call win_gotoid(w2_id)
1319 call setline(1, ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'])
1320 4,7d
1321 call win_gotoid(w1_id)
1322 let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
1323 call assert_equal(['', 'DiffText', 'DiffText', 'DiffText', 'DiffAdd',
1324 \ 'DiffAdd', 'DiffAdd', 'DiffAdd', ''], hl)
1325
1326 " removing the only remaining diff chunk should make the files equal
1327 call win_gotoid(w2_id)
1328 call setline(1, ['a', '2', '3', 'x', 'd', 'e', 'f', 'x', '7', '8', 'i'])
1329 8d
1330 let hl = range(1, 10)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
1331 call assert_equal(['', '', '', 'DiffAdd', '', '', '', '', '', ''], hl)
1332 call win_gotoid(w2_id)
1333 4d
1334 call win_gotoid(w1_id)
1335 let hl = range(1, 9)->map({_, lnum -> diff_hlID(lnum, 1)->synIDattr('name')})
1336 call assert_equal(['', '', '', '', '', '', '', '', ''], hl)
1337
1338 %bw!
1339endfunc
glacambread5c1782021-05-24 14:20:53 +02001340
Bram Moolenaar8dfcce32020-03-18 19:32:26 +01001341" vim: shiftwidth=2 sts=2 expandtab