142093c0eSBram Moolenaar" Tests for diff mode
2e828b762SBram Moolenaarsource shared.vim
3e828b762SBram Moolenaarsource screendump.vim
43c8ee629SBram Moolenaarsource check.vim
542093c0eSBram Moolenaar
642093c0eSBram Moolenaarfunc Test_diff_fold_sync()
742093c0eSBram Moolenaar  enew!
8e8fa05b5SBram Moolenaar  let g:update_count = 0
9e8fa05b5SBram Moolenaar  au DiffUpdated * let g:update_count += 1
10e8fa05b5SBram Moolenaar
1142093c0eSBram Moolenaar  let l = range(50)
1242093c0eSBram Moolenaar  call setline(1, l)
1342093c0eSBram Moolenaar  diffthis
1442093c0eSBram Moolenaar  let winone = win_getid()
1542093c0eSBram Moolenaar  new
1642093c0eSBram Moolenaar  let l[25] = 'diff'
1742093c0eSBram Moolenaar  call setline(1, l)
1842093c0eSBram Moolenaar  diffthis
1942093c0eSBram Moolenaar  let wintwo = win_getid()
2042093c0eSBram Moolenaar  " line 15 is inside the closed fold
2142093c0eSBram Moolenaar  call assert_equal(19, foldclosedend(10))
2242093c0eSBram Moolenaar  call win_gotoid(winone)
2342093c0eSBram Moolenaar  call assert_equal(19, foldclosedend(10))
2442093c0eSBram Moolenaar  " open the fold
2542093c0eSBram Moolenaar  normal zv
2642093c0eSBram Moolenaar  call assert_equal(-1, foldclosedend(10))
2742093c0eSBram Moolenaar  " fold in other window must have opened too
2842093c0eSBram Moolenaar  call win_gotoid(wintwo)
2942093c0eSBram Moolenaar  call assert_equal(-1, foldclosedend(10))
3042093c0eSBram Moolenaar
3142093c0eSBram Moolenaar  " cursor position is in sync
3242093c0eSBram Moolenaar  normal 23G
3342093c0eSBram Moolenaar  call win_gotoid(winone)
3442093c0eSBram Moolenaar  call assert_equal(23, getcurpos()[1])
3542093c0eSBram Moolenaar
36e8fa05b5SBram Moolenaar  call assert_equal(1, g:update_count)
37e8fa05b5SBram Moolenaar  au! DiffUpdated
38e8fa05b5SBram Moolenaar
3942093c0eSBram Moolenaar  windo diffoff
4042093c0eSBram Moolenaar  close!
4142093c0eSBram Moolenaar  set nomodified
4242093c0eSBram Moolenaarendfunc
4342093c0eSBram Moolenaar
4442093c0eSBram Moolenaarfunc Test_vert_split()
45e828b762SBram Moolenaar  set diffopt=filler
46e828b762SBram Moolenaar  call Common_vert_split()
47e828b762SBram Moolenaar  set diffopt&
48e828b762SBram Moolenaarendfunc
49e828b762SBram Moolenaar
50e828b762SBram Moolenaarfunc Test_vert_split_internal()
51e828b762SBram Moolenaar  set diffopt=internal,filler
52e828b762SBram Moolenaar  call Common_vert_split()
53e828b762SBram Moolenaar  set diffopt&
54e828b762SBram Moolenaarendfunc
55e828b762SBram Moolenaar
56e828b762SBram Moolenaarfunc Common_vert_split()
5742093c0eSBram Moolenaar  " Disable the title to avoid xterm keeping the wrong one.
5842093c0eSBram Moolenaar  set notitle noicon
5942093c0eSBram Moolenaar  new
6042093c0eSBram Moolenaar  let l = ['1 aa', '2 bb', '3 cc', '4 dd', '5 ee']
6142093c0eSBram Moolenaar  call setline(1, l)
6242093c0eSBram Moolenaar  w! Xtest
6342093c0eSBram Moolenaar  normal dd
6442093c0eSBram Moolenaar  $
6542093c0eSBram Moolenaar  put
6642093c0eSBram Moolenaar  normal kkrXoxxx
6742093c0eSBram Moolenaar  w! Xtest2
6842093c0eSBram Moolenaar  file Nop
6942093c0eSBram Moolenaar  normal ggoyyyjjjozzzz
7042093c0eSBram Moolenaar  set foldmethod=marker foldcolumn=4
7142093c0eSBram Moolenaar  call assert_equal(0, &diff)
7242093c0eSBram Moolenaar  call assert_equal('marker', &foldmethod)
7342093c0eSBram Moolenaar  call assert_equal(4, &foldcolumn)
7442093c0eSBram Moolenaar  call assert_equal(0, &scrollbind)
7542093c0eSBram Moolenaar  call assert_equal(0, &cursorbind)
7642093c0eSBram Moolenaar  call assert_equal(1, &wrap)
7742093c0eSBram Moolenaar
7842093c0eSBram Moolenaar  vert diffsplit Xtest
7942093c0eSBram Moolenaar  vert diffsplit Xtest2
8042093c0eSBram Moolenaar  call assert_equal(1, &diff)
8142093c0eSBram Moolenaar  call assert_equal('diff', &foldmethod)
8242093c0eSBram Moolenaar  call assert_equal(2, &foldcolumn)
8342093c0eSBram Moolenaar  call assert_equal(1, &scrollbind)
8442093c0eSBram Moolenaar  call assert_equal(1, &cursorbind)
8542093c0eSBram Moolenaar  call assert_equal(0, &wrap)
8642093c0eSBram Moolenaar
8742093c0eSBram Moolenaar  let diff_fdm = &fdm
8842093c0eSBram Moolenaar  let diff_fdc = &fdc
8942093c0eSBram Moolenaar  " repeat entering diff mode here to see if this saves the wrong settings
9042093c0eSBram Moolenaar  diffthis
9142093c0eSBram Moolenaar  " jump to second window for a moment to have filler line appear at start of
9242093c0eSBram Moolenaar  " first window
9342093c0eSBram Moolenaar  wincmd w
9442093c0eSBram Moolenaar  normal gg
9542093c0eSBram Moolenaar  wincmd p
9642093c0eSBram Moolenaar  normal gg
9742093c0eSBram Moolenaar  call assert_equal(2, winline())
9842093c0eSBram Moolenaar  normal j
9942093c0eSBram Moolenaar  call assert_equal(4, winline())
10042093c0eSBram Moolenaar  normal j
10142093c0eSBram Moolenaar  call assert_equal(5, winline())
10242093c0eSBram Moolenaar  normal j
10342093c0eSBram Moolenaar  call assert_equal(6, winline())
10442093c0eSBram Moolenaar  normal j
10542093c0eSBram Moolenaar  call assert_equal(8, winline())
10642093c0eSBram Moolenaar  normal j
10742093c0eSBram Moolenaar  call assert_equal(9, winline())
10842093c0eSBram Moolenaar
10942093c0eSBram Moolenaar  wincmd w
11042093c0eSBram Moolenaar  normal gg
11142093c0eSBram Moolenaar  call assert_equal(1, winline())
11242093c0eSBram Moolenaar  normal j
11342093c0eSBram Moolenaar  call assert_equal(2, winline())
11442093c0eSBram Moolenaar  normal j
11542093c0eSBram Moolenaar  call assert_equal(4, winline())
11642093c0eSBram Moolenaar  normal j
11742093c0eSBram Moolenaar  call assert_equal(5, winline())
11842093c0eSBram Moolenaar  normal j
11942093c0eSBram Moolenaar  call assert_equal(8, winline())
12042093c0eSBram Moolenaar
12142093c0eSBram Moolenaar  wincmd w
12242093c0eSBram Moolenaar  normal gg
12342093c0eSBram Moolenaar  call assert_equal(2, winline())
12442093c0eSBram Moolenaar  normal j
12542093c0eSBram Moolenaar  call assert_equal(3, winline())
12642093c0eSBram Moolenaar  normal j
12742093c0eSBram Moolenaar  call assert_equal(4, winline())
12842093c0eSBram Moolenaar  normal j
12942093c0eSBram Moolenaar  call assert_equal(5, winline())
13042093c0eSBram Moolenaar  normal j
13142093c0eSBram Moolenaar  call assert_equal(6, winline())
13242093c0eSBram Moolenaar  normal j
13342093c0eSBram Moolenaar  call assert_equal(7, winline())
13442093c0eSBram Moolenaar  normal j
13542093c0eSBram Moolenaar  call assert_equal(8, winline())
13642093c0eSBram Moolenaar
13742093c0eSBram Moolenaar  " Test diffoff
13842093c0eSBram Moolenaar  diffoff!
13942093c0eSBram Moolenaar  1wincmd 2
14042093c0eSBram Moolenaar  let &diff = 1
14142093c0eSBram Moolenaar  let &fdm = diff_fdm
14242093c0eSBram Moolenaar  let &fdc = diff_fdc
14342093c0eSBram Moolenaar  4wincmd w
14442093c0eSBram Moolenaar  diffoff!
14542093c0eSBram Moolenaar  1wincmd w
14642093c0eSBram Moolenaar  call assert_equal(0, &diff)
14742093c0eSBram Moolenaar  call assert_equal('marker', &foldmethod)
14842093c0eSBram Moolenaar  call assert_equal(4, &foldcolumn)
14942093c0eSBram Moolenaar  call assert_equal(0, &scrollbind)
15042093c0eSBram Moolenaar  call assert_equal(0, &cursorbind)
15142093c0eSBram Moolenaar  call assert_equal(1, &wrap)
15242093c0eSBram Moolenaar
15342093c0eSBram Moolenaar  wincmd w
15442093c0eSBram Moolenaar  call assert_equal(0, &diff)
15542093c0eSBram Moolenaar  call assert_equal('marker', &foldmethod)
15642093c0eSBram Moolenaar  call assert_equal(4, &foldcolumn)
15742093c0eSBram Moolenaar  call assert_equal(0, &scrollbind)
15842093c0eSBram Moolenaar  call assert_equal(0, &cursorbind)
15942093c0eSBram Moolenaar  call assert_equal(1, &wrap)
16042093c0eSBram Moolenaar
16142093c0eSBram Moolenaar  wincmd w
16242093c0eSBram Moolenaar  call assert_equal(0, &diff)
16342093c0eSBram Moolenaar  call assert_equal('marker', &foldmethod)
16442093c0eSBram Moolenaar  call assert_equal(4, &foldcolumn)
16542093c0eSBram Moolenaar  call assert_equal(0, &scrollbind)
16642093c0eSBram Moolenaar  call assert_equal(0, &cursorbind)
16742093c0eSBram Moolenaar  call assert_equal(1, &wrap)
16842093c0eSBram Moolenaar
169623cf88fSBram Moolenaar  call delete('Xtest')
170623cf88fSBram Moolenaar  call delete('Xtest2')
17142093c0eSBram Moolenaar  windo bw!
17242093c0eSBram Moolenaarendfunc
17342093c0eSBram Moolenaar
17442093c0eSBram Moolenaarfunc Test_filler_lines()
17542093c0eSBram Moolenaar  " Test that diffing shows correct filler lines
17642093c0eSBram Moolenaar  enew!
17742093c0eSBram Moolenaar  put =range(4,10)
17842093c0eSBram Moolenaar  1d _
17942093c0eSBram Moolenaar  vnew
18042093c0eSBram Moolenaar  put =range(1,10)
18142093c0eSBram Moolenaar  1d _
18242093c0eSBram Moolenaar  windo diffthis
18342093c0eSBram Moolenaar  wincmd h
18442093c0eSBram Moolenaar  call assert_equal(1, line('w0'))
18542093c0eSBram Moolenaar  unlet! diff_fdm diff_fdc
18690d121faSBram Moolenaar  windo diffoff
18790d121faSBram Moolenaar  bwipe!
18890d121faSBram Moolenaar  enew!
18990d121faSBram Moolenaarendfunc
19042093c0eSBram Moolenaar
19190d121faSBram Moolenaarfunc Test_diffget_diffput()
19290d121faSBram Moolenaar  enew!
19390d121faSBram Moolenaar  let l = range(50)
19490d121faSBram Moolenaar  call setline(1, l)
19590d121faSBram Moolenaar  call assert_fails('diffget', 'E99:')
19690d121faSBram Moolenaar  diffthis
19790d121faSBram Moolenaar  call assert_fails('diffget', 'E100:')
19890d121faSBram Moolenaar  new
19990d121faSBram Moolenaar  let l[10] = 'one'
20090d121faSBram Moolenaar  let l[20] = 'two'
20190d121faSBram Moolenaar  let l[30] = 'three'
20290d121faSBram Moolenaar  let l[40] = 'four'
20390d121faSBram Moolenaar  call setline(1, l)
20490d121faSBram Moolenaar  diffthis
20590d121faSBram Moolenaar  call assert_equal('one', getline(11))
20690d121faSBram Moolenaar  11diffget
20790d121faSBram Moolenaar  call assert_equal('10', getline(11))
20890d121faSBram Moolenaar  21diffput
20990d121faSBram Moolenaar  wincmd w
21090d121faSBram Moolenaar  call assert_equal('two', getline(21))
21190d121faSBram Moolenaar  normal 31Gdo
21290d121faSBram Moolenaar  call assert_equal('three', getline(31))
21390d121faSBram Moolenaar  call assert_equal('40', getline(41))
21490d121faSBram Moolenaar  normal 41Gdp
21590d121faSBram Moolenaar  wincmd w
21690d121faSBram Moolenaar  call assert_equal('40', getline(41))
21790d121faSBram Moolenaar  new
21890d121faSBram Moolenaar  diffthis
21990d121faSBram Moolenaar  call assert_fails('diffget', 'E101:')
22090d121faSBram Moolenaar
22190d121faSBram Moolenaar  windo diffoff
22279a213d6SBram Moolenaar  %bwipe!
22379a213d6SBram Moolenaarendfunc
22479a213d6SBram Moolenaar
2255f57bdcaSBram Moolenaar" Test putting two changes from one buffer to another
2265f57bdcaSBram Moolenaarfunc Test_diffput_two()
2275f57bdcaSBram Moolenaar  new a
2285f57bdcaSBram Moolenaar  let win_a = win_getid()
2295f57bdcaSBram Moolenaar  call setline(1, range(1, 10))
2305f57bdcaSBram Moolenaar  diffthis
2315f57bdcaSBram Moolenaar  new b
2325f57bdcaSBram Moolenaar  let win_b = win_getid()
2335f57bdcaSBram Moolenaar  call setline(1, range(1, 10))
2345f57bdcaSBram Moolenaar  8del
2355f57bdcaSBram Moolenaar  5del
2365f57bdcaSBram Moolenaar  diffthis
2375f57bdcaSBram Moolenaar  call win_gotoid(win_a)
2385f57bdcaSBram Moolenaar  %diffput
2395f57bdcaSBram Moolenaar  call win_gotoid(win_b)
2405f57bdcaSBram Moolenaar  call assert_equal(map(range(1, 10), 'string(v:val)'), getline(1, '$'))
2415f57bdcaSBram Moolenaar  bwipe! a
2425f57bdcaSBram Moolenaar  bwipe! b
2435f57bdcaSBram Moolenaarendfunc
2445f57bdcaSBram Moolenaar
24579a213d6SBram Moolenaarfunc Test_dp_do_buffer()
24679a213d6SBram Moolenaar  e! one
24779a213d6SBram Moolenaar  let bn1=bufnr('%')
24879a213d6SBram Moolenaar  let l = range(60)
24979a213d6SBram Moolenaar  call setline(1, l)
25079a213d6SBram Moolenaar  diffthis
25179a213d6SBram Moolenaar
25279a213d6SBram Moolenaar  new two
25379a213d6SBram Moolenaar  let l[10] = 'one'
25479a213d6SBram Moolenaar  let l[20] = 'two'
25579a213d6SBram Moolenaar  let l[30] = 'three'
25679a213d6SBram Moolenaar  let l[40] = 'four'
25779a213d6SBram Moolenaar  let l[50] = 'five'
25879a213d6SBram Moolenaar  call setline(1, l)
25979a213d6SBram Moolenaar  diffthis
26079a213d6SBram Moolenaar
26179a213d6SBram Moolenaar  " dp and do with invalid buffer number.
26279a213d6SBram Moolenaar  11
26379a213d6SBram Moolenaar  call assert_fails('norm 99999dp', 'E102:')
26479a213d6SBram Moolenaar  call assert_fails('norm 99999do', 'E102:')
26579a213d6SBram Moolenaar  call assert_fails('diffput non_existing_buffer', 'E94:')
26679a213d6SBram Moolenaar  call assert_fails('diffget non_existing_buffer', 'E94:')
26779a213d6SBram Moolenaar
26879a213d6SBram Moolenaar  " dp and do with valid buffer number.
26979a213d6SBram Moolenaar  call assert_equal('one', getline('.'))
27079a213d6SBram Moolenaar  exe 'norm ' . bn1 . 'do'
27179a213d6SBram Moolenaar  call assert_equal('10', getline('.'))
27279a213d6SBram Moolenaar  21
27379a213d6SBram Moolenaar  call assert_equal('two', getline('.'))
27479a213d6SBram Moolenaar  diffget one
27579a213d6SBram Moolenaar  call assert_equal('20', getline('.'))
27679a213d6SBram Moolenaar
27779a213d6SBram Moolenaar  31
27879a213d6SBram Moolenaar  exe 'norm ' . bn1 . 'dp'
27979a213d6SBram Moolenaar  41
28079a213d6SBram Moolenaar  diffput one
28179a213d6SBram Moolenaar  wincmd w
28279a213d6SBram Moolenaar  31
28379a213d6SBram Moolenaar  call assert_equal('three', getline('.'))
28479a213d6SBram Moolenaar  41
28579a213d6SBram Moolenaar  call assert_equal('four', getline('.'))
28679a213d6SBram Moolenaar
28779a213d6SBram Moolenaar  " dp and do with buffer number which is not in diff mode.
28879a213d6SBram Moolenaar  new not_in_diff_mode
28979a213d6SBram Moolenaar  let bn3=bufnr('%')
29079a213d6SBram Moolenaar  wincmd w
29179a213d6SBram Moolenaar  51
29279a213d6SBram Moolenaar  call assert_fails('exe "norm" . bn3 . "dp"', 'E103:')
29379a213d6SBram Moolenaar  call assert_fails('exe "norm" . bn3 . "do"', 'E103:')
29479a213d6SBram Moolenaar  call assert_fails('diffput not_in_diff_mode', 'E94:')
29579a213d6SBram Moolenaar  call assert_fails('diffget not_in_diff_mode', 'E94:')
29679a213d6SBram Moolenaar
29779a213d6SBram Moolenaar  windo diffoff
29879a213d6SBram Moolenaar  %bwipe!
29942093c0eSBram Moolenaarendfunc
300e67d546fSBram Moolenaar
301df77cef9SBram Moolenaarfunc Test_do_lastline()
302df77cef9SBram Moolenaar  e! one
303df77cef9SBram Moolenaar  call setline(1, ['1','2','3','4','5','6'])
304df77cef9SBram Moolenaar  diffthis
305df77cef9SBram Moolenaar
306df77cef9SBram Moolenaar  new two
307df77cef9SBram Moolenaar  call setline(1, ['2','4','5'])
308df77cef9SBram Moolenaar  diffthis
309df77cef9SBram Moolenaar
310df77cef9SBram Moolenaar  1
311df77cef9SBram Moolenaar  norm dp]c
312df77cef9SBram Moolenaar  norm dp]c
313df77cef9SBram Moolenaar  wincmd w
314df77cef9SBram Moolenaar  call assert_equal(4, line('$'))
315df77cef9SBram Moolenaar  norm G
316df77cef9SBram Moolenaar  norm do
317df77cef9SBram Moolenaar  call assert_equal(3, line('$'))
318df77cef9SBram Moolenaar
319df77cef9SBram Moolenaar  windo diffoff
320df77cef9SBram Moolenaar  %bwipe!
321df77cef9SBram Moolenaarendfunc
322df77cef9SBram Moolenaar
323e67d546fSBram Moolenaarfunc Test_diffoff()
324e67d546fSBram Moolenaar  enew!
325e67d546fSBram Moolenaar  call setline(1, ['Two', 'Three'])
32679a213d6SBram Moolenaar  redraw
327e67d546fSBram Moolenaar  let normattr = screenattr(1, 1)
328e67d546fSBram Moolenaar  diffthis
329e67d546fSBram Moolenaar  botright vert new
330e67d546fSBram Moolenaar  call setline(1, ['One', '', 'Two', 'Three'])
331e67d546fSBram Moolenaar  diffthis
332e67d546fSBram Moolenaar  redraw
333196b4664SBram Moolenaar  call assert_notequal(normattr, 1->screenattr(1))
334e67d546fSBram Moolenaar  diffoff!
335e67d546fSBram Moolenaar  redraw
336e67d546fSBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
337e67d546fSBram Moolenaar  bwipe!
338e67d546fSBram Moolenaar  bwipe!
339e67d546fSBram Moolenaarendfunc
340025e3e0bSBram Moolenaar
341e828b762SBram Moolenaarfunc Common_icase_test()
342e828b762SBram Moolenaar  edit one
343da22b8ccSBram Moolenaar  call setline(1, ['One', 'Two', 'Three', 'Four', 'Fi#ve'])
34479a213d6SBram Moolenaar  redraw
34579a213d6SBram Moolenaar  let normattr = screenattr(1, 1)
34679a213d6SBram Moolenaar  diffthis
34779a213d6SBram Moolenaar
34879a213d6SBram Moolenaar  botright vert new two
349da22b8ccSBram Moolenaar  call setline(1, ['one', 'TWO', 'Three ', 'Four', 'fI=VE'])
35079a213d6SBram Moolenaar  diffthis
35179a213d6SBram Moolenaar
35279a213d6SBram Moolenaar  redraw
35379a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
35479a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(2, 1))
35579a213d6SBram Moolenaar  call assert_notequal(normattr, screenattr(3, 1))
35679a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(4, 1))
35779a213d6SBram Moolenaar
358da22b8ccSBram Moolenaar  let dtextattr = screenattr(5, 3)
359da22b8ccSBram Moolenaar  call assert_notequal(dtextattr, screenattr(5, 1))
360da22b8ccSBram Moolenaar  call assert_notequal(dtextattr, screenattr(5, 5))
361da22b8ccSBram Moolenaar
36279a213d6SBram Moolenaar  diffoff!
36379a213d6SBram Moolenaar  %bwipe!
364e828b762SBram Moolenaarendfunc
365e828b762SBram Moolenaar
366e828b762SBram Moolenaarfunc Test_diffopt_icase()
367e828b762SBram Moolenaar  set diffopt=icase,foldcolumn:0
368e828b762SBram Moolenaar  call Common_icase_test()
36979a213d6SBram Moolenaar  set diffopt&
37079a213d6SBram Moolenaarendfunc
37179a213d6SBram Moolenaar
372e828b762SBram Moolenaarfunc Test_diffopt_icase_internal()
373e828b762SBram Moolenaar  set diffopt=icase,foldcolumn:0,internal
374e828b762SBram Moolenaar  call Common_icase_test()
375e828b762SBram Moolenaar  set diffopt&
376e828b762SBram Moolenaarendfunc
37779a213d6SBram Moolenaar
378e828b762SBram Moolenaarfunc Common_iwhite_test()
379e828b762SBram Moolenaar  edit one
380e828b762SBram Moolenaar  " Difference in trailing spaces and amount of spaces should be ignored,
38179a213d6SBram Moolenaar  " but not other space differences.
382e828b762SBram Moolenaar  call setline(1, ["One \t", 'Two', 'Three', 'one two', 'one two', 'Four'])
38379a213d6SBram Moolenaar  redraw
38479a213d6SBram Moolenaar  let normattr = screenattr(1, 1)
38579a213d6SBram Moolenaar  diffthis
38679a213d6SBram Moolenaar
38779a213d6SBram Moolenaar  botright vert new two
388e828b762SBram Moolenaar  call setline(1, ["One\t ", "Two\t ", 'Three', 'one   two', 'onetwo', ' Four'])
38979a213d6SBram Moolenaar  diffthis
39079a213d6SBram Moolenaar
39179a213d6SBram Moolenaar  redraw
39279a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
39379a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(2, 1))
39479a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(3, 1))
395e828b762SBram Moolenaar  call assert_equal(normattr, screenattr(4, 1))
396e828b762SBram Moolenaar  call assert_notequal(normattr, screenattr(5, 1))
397e828b762SBram Moolenaar  call assert_notequal(normattr, screenattr(6, 1))
39879a213d6SBram Moolenaar
39979a213d6SBram Moolenaar  diffoff!
40079a213d6SBram Moolenaar  %bwipe!
401e828b762SBram Moolenaarendfunc
402e828b762SBram Moolenaar
403e828b762SBram Moolenaarfunc Test_diffopt_iwhite()
404e828b762SBram Moolenaar  set diffopt=iwhite,foldcolumn:0
405e828b762SBram Moolenaar  call Common_iwhite_test()
406e828b762SBram Moolenaar  set diffopt&
407e828b762SBram Moolenaarendfunc
408e828b762SBram Moolenaar
409e828b762SBram Moolenaarfunc Test_diffopt_iwhite_internal()
410e828b762SBram Moolenaar  set diffopt=internal,iwhite,foldcolumn:0
411e828b762SBram Moolenaar  call Common_iwhite_test()
41279a213d6SBram Moolenaar  set diffopt&
41379a213d6SBram Moolenaarendfunc
41479a213d6SBram Moolenaar
41579a213d6SBram Moolenaarfunc Test_diffopt_context()
41679a213d6SBram Moolenaar  enew!
41779a213d6SBram Moolenaar  call setline(1, ['1', '2', '3', '4', '5', '6', '7'])
41879a213d6SBram Moolenaar  diffthis
41979a213d6SBram Moolenaar  new
42079a213d6SBram Moolenaar  call setline(1, ['1', '2', '3', '4', '5x', '6', '7'])
42179a213d6SBram Moolenaar  diffthis
42279a213d6SBram Moolenaar
42379a213d6SBram Moolenaar  set diffopt=context:2
42479a213d6SBram Moolenaar  call assert_equal('+--  2 lines: 1', foldtextresult(1))
425e828b762SBram Moolenaar  set diffopt=internal,context:2
426e828b762SBram Moolenaar  call assert_equal('+--  2 lines: 1', foldtextresult(1))
427e828b762SBram Moolenaar
42879a213d6SBram Moolenaar  set diffopt=context:1
42979a213d6SBram Moolenaar  call assert_equal('+--  3 lines: 1', foldtextresult(1))
430e828b762SBram Moolenaar  set diffopt=internal,context:1
431e828b762SBram Moolenaar  call assert_equal('+--  3 lines: 1', foldtextresult(1))
43279a213d6SBram Moolenaar
43379a213d6SBram Moolenaar  diffoff!
43479a213d6SBram Moolenaar  %bwipe!
43579a213d6SBram Moolenaar  set diffopt&
43679a213d6SBram Moolenaarendfunc
43779a213d6SBram Moolenaar
43879a213d6SBram Moolenaarfunc Test_diffopt_horizontal()
439e828b762SBram Moolenaar  set diffopt=internal,horizontal
44079a213d6SBram Moolenaar  diffsplit
44179a213d6SBram Moolenaar
44279a213d6SBram Moolenaar  call assert_equal(&columns, winwidth(1))
44379a213d6SBram Moolenaar  call assert_equal(&columns, winwidth(2))
44479a213d6SBram Moolenaar  call assert_equal(&lines, winheight(1) + winheight(2) + 3)
44579a213d6SBram Moolenaar  call assert_inrange(0, 1, winheight(1) - winheight(2))
44679a213d6SBram Moolenaar
44779a213d6SBram Moolenaar  set diffopt&
44879a213d6SBram Moolenaar  diffoff!
44979a213d6SBram Moolenaar  %bwipe
45079a213d6SBram Moolenaarendfunc
45179a213d6SBram Moolenaar
45279a213d6SBram Moolenaarfunc Test_diffopt_vertical()
453e828b762SBram Moolenaar  set diffopt=internal,vertical
45479a213d6SBram Moolenaar  diffsplit
45579a213d6SBram Moolenaar
45679a213d6SBram Moolenaar  call assert_equal(&lines - 2, winheight(1))
45779a213d6SBram Moolenaar  call assert_equal(&lines - 2, winheight(2))
45879a213d6SBram Moolenaar  call assert_equal(&columns, winwidth(1) + winwidth(2) + 1)
45979a213d6SBram Moolenaar  call assert_inrange(0, 1, winwidth(1) - winwidth(2))
46079a213d6SBram Moolenaar
46179a213d6SBram Moolenaar  set diffopt&
46279a213d6SBram Moolenaar  diffoff!
46379a213d6SBram Moolenaar  %bwipe
46479a213d6SBram Moolenaarendfunc
46579a213d6SBram Moolenaar
46697ce4192SBram Moolenaarfunc Test_diffopt_hiddenoff()
467e828b762SBram Moolenaar  set diffopt=internal,filler,foldcolumn:0,hiddenoff
46897ce4192SBram Moolenaar  e! one
46997ce4192SBram Moolenaar  call setline(1, ['Two', 'Three'])
47097ce4192SBram Moolenaar  redraw
47197ce4192SBram Moolenaar  let normattr = screenattr(1, 1)
47297ce4192SBram Moolenaar  diffthis
47397ce4192SBram Moolenaar  botright vert new two
47497ce4192SBram Moolenaar  call setline(1, ['One', 'Four'])
47597ce4192SBram Moolenaar  diffthis
47697ce4192SBram Moolenaar  redraw
47797ce4192SBram Moolenaar  call assert_notequal(normattr, screenattr(1, 1))
47897ce4192SBram Moolenaar  set hidden
47997ce4192SBram Moolenaar  close
48097ce4192SBram Moolenaar  redraw
48197ce4192SBram Moolenaar  " should not diffing with hidden buffer two while 'hiddenoff' is enabled
48297ce4192SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
48397ce4192SBram Moolenaar
48497ce4192SBram Moolenaar  bwipe!
48597ce4192SBram Moolenaar  bwipe!
48697ce4192SBram Moolenaar  set hidden& diffopt&
48797ce4192SBram Moolenaarendfunc
48897ce4192SBram Moolenaar
48925ea0544SBram Moolenaarfunc Test_diffoff_hidden()
490e828b762SBram Moolenaar  set diffopt=internal,filler,foldcolumn:0
49125ea0544SBram Moolenaar  e! one
49225ea0544SBram Moolenaar  call setline(1, ['Two', 'Three'])
49379a213d6SBram Moolenaar  redraw
49425ea0544SBram Moolenaar  let normattr = screenattr(1, 1)
49525ea0544SBram Moolenaar  diffthis
49625ea0544SBram Moolenaar  botright vert new two
49725ea0544SBram Moolenaar  call setline(1, ['One', 'Four'])
49825ea0544SBram Moolenaar  diffthis
49925ea0544SBram Moolenaar  redraw
50025ea0544SBram Moolenaar  call assert_notequal(normattr, screenattr(1, 1))
50125ea0544SBram Moolenaar  set hidden
50225ea0544SBram Moolenaar  close
50325ea0544SBram Moolenaar  redraw
50425ea0544SBram Moolenaar  " diffing with hidden buffer two
50525ea0544SBram Moolenaar  call assert_notequal(normattr, screenattr(1, 1))
50625ea0544SBram Moolenaar  diffoff
50725ea0544SBram Moolenaar  redraw
50825ea0544SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
50925ea0544SBram Moolenaar  diffthis
51025ea0544SBram Moolenaar  redraw
51125ea0544SBram Moolenaar  " still diffing with hidden buffer two
51225ea0544SBram Moolenaar  call assert_notequal(normattr, screenattr(1, 1))
51325ea0544SBram Moolenaar  diffoff!
51425ea0544SBram Moolenaar  redraw
51525ea0544SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
51625ea0544SBram Moolenaar  diffthis
51725ea0544SBram Moolenaar  redraw
51825ea0544SBram Moolenaar  " no longer diffing with hidden buffer two
51925ea0544SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
52025ea0544SBram Moolenaar
52125ea0544SBram Moolenaar  bwipe!
52225ea0544SBram Moolenaar  bwipe!
52325ea0544SBram Moolenaar  set hidden& diffopt&
52425ea0544SBram Moolenaarendfunc
52525ea0544SBram Moolenaar
526025e3e0bSBram Moolenaarfunc Test_setting_cursor()
527025e3e0bSBram Moolenaar  new Xtest1
528025e3e0bSBram Moolenaar  put =range(1,90)
529025e3e0bSBram Moolenaar  wq
530025e3e0bSBram Moolenaar  new Xtest2
531025e3e0bSBram Moolenaar  put =range(1,100)
532025e3e0bSBram Moolenaar  wq
533025e3e0bSBram Moolenaar
534025e3e0bSBram Moolenaar  tabe Xtest2
535025e3e0bSBram Moolenaar  $
536025e3e0bSBram Moolenaar  diffsp Xtest1
537025e3e0bSBram Moolenaar  tabclose
538025e3e0bSBram Moolenaar
539025e3e0bSBram Moolenaar  call delete('Xtest1')
540025e3e0bSBram Moolenaar  call delete('Xtest2')
541025e3e0bSBram Moolenaarendfunc
542aeb661e1SBram Moolenaar
543aeb661e1SBram Moolenaarfunc Test_diff_move_to()
544aeb661e1SBram Moolenaar  new
545aeb661e1SBram Moolenaar  call setline(1, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
546aeb661e1SBram Moolenaar  diffthis
547aeb661e1SBram Moolenaar  vnew
548aeb661e1SBram Moolenaar  call setline(1, [1, '2x', 3, 4, 4, 5, '6x', 7, '8x', 9, '10x'])
549aeb661e1SBram Moolenaar  diffthis
550aeb661e1SBram Moolenaar  norm ]c
551aeb661e1SBram Moolenaar  call assert_equal(2, line('.'))
552aeb661e1SBram Moolenaar  norm 3]c
553aeb661e1SBram Moolenaar  call assert_equal(9, line('.'))
554aeb661e1SBram Moolenaar  norm 10]c
555aeb661e1SBram Moolenaar  call assert_equal(11, line('.'))
556aeb661e1SBram Moolenaar  norm [c
557aeb661e1SBram Moolenaar  call assert_equal(9, line('.'))
558aeb661e1SBram Moolenaar  norm 2[c
559aeb661e1SBram Moolenaar  call assert_equal(5, line('.'))
560aeb661e1SBram Moolenaar  norm 10[c
561aeb661e1SBram Moolenaar  call assert_equal(2, line('.'))
562aeb661e1SBram Moolenaar  %bwipe!
563aeb661e1SBram Moolenaarendfunc
564aeb661e1SBram Moolenaar
56579a213d6SBram Moolenaarfunc Test_diffexpr()
56679a213d6SBram Moolenaar  if !executable('diff')
56779a213d6SBram Moolenaar    return
56879a213d6SBram Moolenaar  endif
56979a213d6SBram Moolenaar
57079a213d6SBram Moolenaar  func DiffExpr()
5713b8defd0SBram Moolenaar    " Prepent some text to check diff type detection
5723b8defd0SBram Moolenaar    call writefile(['warning', '  message'], v:fname_out)
5733b8defd0SBram Moolenaar    silent exe '!diff ' . v:fname_in . ' ' . v:fname_new . '>>' . v:fname_out
57479a213d6SBram Moolenaar  endfunc
57579a213d6SBram Moolenaar  set diffexpr=DiffExpr()
57679a213d6SBram Moolenaar  set diffopt=foldcolumn:0
57779a213d6SBram Moolenaar
57879a213d6SBram Moolenaar  enew!
57979a213d6SBram Moolenaar  call setline(1, ['one', 'two', 'three'])
58079a213d6SBram Moolenaar  redraw
58179a213d6SBram Moolenaar  let normattr = screenattr(1, 1)
58279a213d6SBram Moolenaar  diffthis
58379a213d6SBram Moolenaar
58479a213d6SBram Moolenaar  botright vert new
58579a213d6SBram Moolenaar  call setline(1, ['one', 'two', 'three.'])
58679a213d6SBram Moolenaar  diffthis
58779a213d6SBram Moolenaar
58879a213d6SBram Moolenaar  redraw
58979a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
59079a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(2, 1))
59179a213d6SBram Moolenaar  call assert_notequal(normattr, screenattr(3, 1))
59279a213d6SBram Moolenaar
59379a213d6SBram Moolenaar  diffoff!
59479a213d6SBram Moolenaar  %bwipe!
59579a213d6SBram Moolenaar  set diffexpr& diffopt&
59679a213d6SBram Moolenaarendfunc
59779a213d6SBram Moolenaar
598aeb661e1SBram Moolenaarfunc Test_diffpatch()
599aeb661e1SBram Moolenaar  " The patch program on MS-Windows may fail or hang.
600aeb661e1SBram Moolenaar  if !executable('patch') || !has('unix')
601aeb661e1SBram Moolenaar    return
602aeb661e1SBram Moolenaar  endif
603aeb661e1SBram Moolenaar  new
604aeb661e1SBram Moolenaar  insert
605aeb661e1SBram Moolenaar***************
606aeb661e1SBram Moolenaar*** 1,3 ****
607aeb661e1SBram Moolenaar  1
608aeb661e1SBram Moolenaar! 2
609aeb661e1SBram Moolenaar  3
610aeb661e1SBram Moolenaar--- 1,4 ----
611aeb661e1SBram Moolenaar  1
612aeb661e1SBram Moolenaar! 2x
613aeb661e1SBram Moolenaar  3
614aeb661e1SBram Moolenaar+ 4
615aeb661e1SBram Moolenaar.
61697fbc404SBram Moolenaar  saveas! Xpatch
617aeb661e1SBram Moolenaar  bwipe!
618aeb661e1SBram Moolenaar  new
619aeb661e1SBram Moolenaar  call assert_fails('diffpatch Xpatch', 'E816:')
6201ef73e33SBram Moolenaar
621a95ab321SBram Moolenaar  for name in ['Xpatch', 'Xpatch$HOME', 'Xpa''tch']
622aeb661e1SBram Moolenaar    call setline(1, ['1', '2', '3'])
6231ef73e33SBram Moolenaar    if name != 'Xpatch'
6241ef73e33SBram Moolenaar      call rename('Xpatch', name)
6251ef73e33SBram Moolenaar    endif
6261ef73e33SBram Moolenaar    exe 'diffpatch ' . escape(name, '$')
627aeb661e1SBram Moolenaar    call assert_equal(['1', '2x', '3', '4'], getline(1, '$'))
6281ef73e33SBram Moolenaar    if name != 'Xpatch'
6291ef73e33SBram Moolenaar      call rename(name, 'Xpatch')
6301ef73e33SBram Moolenaar    endif
6311ef73e33SBram Moolenaar    bwipe!
6321ef73e33SBram Moolenaar  endfor
6331ef73e33SBram Moolenaar
634aeb661e1SBram Moolenaar  call delete('Xpatch')
635aeb661e1SBram Moolenaar  bwipe!
636aeb661e1SBram Moolenaarendfunc
637aeb661e1SBram Moolenaar
638aeb661e1SBram Moolenaarfunc Test_diff_too_many_buffers()
639aeb661e1SBram Moolenaar  for i in range(1, 8)
640aeb661e1SBram Moolenaar    exe "new Xtest" . i
641aeb661e1SBram Moolenaar    diffthis
642aeb661e1SBram Moolenaar  endfor
643aeb661e1SBram Moolenaar  new Xtest9
644aeb661e1SBram Moolenaar  call assert_fails('diffthis', 'E96:')
645aeb661e1SBram Moolenaar  %bwipe!
646aeb661e1SBram Moolenaarendfunc
647aeb661e1SBram Moolenaar
648aeb661e1SBram Moolenaarfunc Test_diff_nomodifiable()
649aeb661e1SBram Moolenaar  new
650aeb661e1SBram Moolenaar  call setline(1, [1, 2, 3, 4])
651aeb661e1SBram Moolenaar  setl nomodifiable
652aeb661e1SBram Moolenaar  diffthis
653aeb661e1SBram Moolenaar  vnew
654aeb661e1SBram Moolenaar  call setline(1, ['1x', 2, 3, 3, 4])
655aeb661e1SBram Moolenaar  diffthis
656aeb661e1SBram Moolenaar  call assert_fails('norm dp', 'E793:')
657aeb661e1SBram Moolenaar  setl nomodifiable
658aeb661e1SBram Moolenaar  call assert_fails('norm do', 'E21:')
659aeb661e1SBram Moolenaar  %bwipe!
660aeb661e1SBram Moolenaarendfunc
661f58a8475SBram Moolenaar
66297fbc404SBram Moolenaarfunc Test_diff_hlID()
66397fbc404SBram Moolenaar  new
66497fbc404SBram Moolenaar  call setline(1, [1, 2, 3])
66597fbc404SBram Moolenaar  diffthis
66697fbc404SBram Moolenaar  vnew
66797fbc404SBram Moolenaar  call setline(1, ['1x', 2, 'x', 3])
66897fbc404SBram Moolenaar  diffthis
66997fbc404SBram Moolenaar  redraw
67097fbc404SBram Moolenaar
671a74e4946SBram Moolenaar  call diff_hlID(-1, 1)->synIDattr("name")->assert_equal("")
67297fbc404SBram Moolenaar
673a74e4946SBram Moolenaar  call diff_hlID(1, 1)->synIDattr("name")->assert_equal("DiffChange")
674a74e4946SBram Moolenaar  call diff_hlID(1, 2)->synIDattr("name")->assert_equal("DiffText")
675a74e4946SBram Moolenaar  call diff_hlID(2, 1)->synIDattr("name")->assert_equal("")
676a74e4946SBram Moolenaar  call diff_hlID(3, 1)->synIDattr("name")->assert_equal("DiffAdd")
6771a3a8916SBram Moolenaar  eval 4->diff_hlID(1)->synIDattr("name")->assert_equal("")
67897fbc404SBram Moolenaar
67997fbc404SBram Moolenaar  wincmd w
68097fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(1, 1), "name"), "DiffChange")
68197fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(2, 1), "name"), "")
68297fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(3, 1), "name"), "")
68397fbc404SBram Moolenaar
68497fbc404SBram Moolenaar  %bwipe!
68597fbc404SBram Moolenaarendfunc
68697fbc404SBram Moolenaar
68797fbc404SBram Moolenaarfunc Test_diff_filler()
68897fbc404SBram Moolenaar  new
68997fbc404SBram Moolenaar  call setline(1, [1, 2, 3, 'x', 4])
69097fbc404SBram Moolenaar  diffthis
69197fbc404SBram Moolenaar  vnew
69297fbc404SBram Moolenaar  call setline(1, [1, 2, 'y', 'y', 3, 4])
69397fbc404SBram Moolenaar  diffthis
69497fbc404SBram Moolenaar  redraw
69597fbc404SBram Moolenaar
6961a3a8916SBram Moolenaar  call assert_equal([0, 0, 0, 0, 0, 0, 0, 1, 0], map(range(-1, 7), 'v:val->diff_filler()'))
69797fbc404SBram Moolenaar  wincmd w
69897fbc404SBram Moolenaar  call assert_equal([0, 0, 0, 0, 2, 0, 0, 0], map(range(-1, 6), 'diff_filler(v:val)'))
69997fbc404SBram Moolenaar
70097fbc404SBram Moolenaar  %bwipe!
70197fbc404SBram Moolenaarendfunc
70297fbc404SBram Moolenaar
703f58a8475SBram Moolenaarfunc Test_diff_lastline()
704f58a8475SBram Moolenaar  enew!
705f58a8475SBram Moolenaar  only!
706f58a8475SBram Moolenaar  call setline(1, ['This is a ', 'line with five ', 'rows'])
707f58a8475SBram Moolenaar  diffthis
708f58a8475SBram Moolenaar  botright vert new
709f58a8475SBram Moolenaar  call setline(1, ['This is', 'a line with ', 'four rows'])
710f58a8475SBram Moolenaar  diffthis
711f58a8475SBram Moolenaar  1
712f58a8475SBram Moolenaar  call feedkeys("Je a\<CR>", 'tx')
713f58a8475SBram Moolenaar  call feedkeys("Je a\<CR>", 'tx')
714f58a8475SBram Moolenaar  let w1lines = winline()
715f58a8475SBram Moolenaar  wincmd w
716f58a8475SBram Moolenaar  $
717f58a8475SBram Moolenaar  let w2lines = winline()
718f58a8475SBram Moolenaar  call assert_equal(w2lines, w1lines)
719f58a8475SBram Moolenaar  bwipe!
720f58a8475SBram Moolenaar  bwipe!
721f58a8475SBram Moolenaarendfunc
722e828b762SBram Moolenaar
723785fc656SBram Moolenaarfunc WriteDiffFiles(buf, list1, list2)
724e828b762SBram Moolenaar  call writefile(a:list1, 'Xfile1')
725e828b762SBram Moolenaar  call writefile(a:list2, 'Xfile2')
726785fc656SBram Moolenaar  if a:buf
727785fc656SBram Moolenaar    call term_sendkeys(a:buf, ":checktime\<CR>")
728785fc656SBram Moolenaar  endif
729e828b762SBram Moolenaarendfunc
730e828b762SBram Moolenaar
731785fc656SBram Moolenaar" Verify a screendump with both the internal and external diff.
732e828b762SBram Moolenaarfunc VerifyBoth(buf, dumpfile, extra)
733e828b762SBram Moolenaar  " trailing : for leaving the cursor on the command line
734785fc656SBram Moolenaar  for cmd in [":set diffopt=filler" . a:extra . "\<CR>:", ":set diffopt+=internal\<CR>:"]
735e828b762SBram Moolenaar    call term_sendkeys(a:buf, cmd)
736e828b762SBram Moolenaar    if VerifyScreenDump(a:buf, a:dumpfile, {}, cmd =~ 'internal' ? 'internal' : 'external')
737e828b762SBram Moolenaar      break " don't let the next iteration overwrite the "failed" file.
738e828b762SBram Moolenaar    endif
739e828b762SBram Moolenaar  endfor
740e828b762SBram Moolenaarendfunc
741e828b762SBram Moolenaar
742785fc656SBram Moolenaar" Verify a screendump with the internal diff only.
743785fc656SBram Moolenaarfunc VerifyInternal(buf, dumpfile, extra)
744785fc656SBram Moolenaar  call term_sendkeys(a:buf, ":diffupdate!\<CR>")
745785fc656SBram Moolenaar  " trailing : for leaving the cursor on the command line
746785fc656SBram Moolenaar  call term_sendkeys(a:buf, ":set diffopt=internal,filler" . a:extra . "\<CR>:")
74737d9f175SBram Moolenaar  call term_wait(a:buf)
748785fc656SBram Moolenaar  call VerifyScreenDump(a:buf, a:dumpfile, {})
749785fc656SBram Moolenaarendfunc
750785fc656SBram Moolenaar
751e828b762SBram Moolenaarfunc Test_diff_screen()
7523c8ee629SBram Moolenaar  CheckScreendump
7533c8ee629SBram Moolenaar  CheckFeature menu
7543c8ee629SBram Moolenaar
755e828b762SBram Moolenaar  " clean up already existing swap files, just in case
756e828b762SBram Moolenaar  call delete('.Xfile1.swp')
757e828b762SBram Moolenaar  call delete('.Xfile2.swp')
758e828b762SBram Moolenaar
759e828b762SBram Moolenaar  " Test 1: Add a line in beginning of file 2
760785fc656SBram Moolenaar  call WriteDiffFiles(0, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
761e828b762SBram Moolenaar  let buf = RunVimInTerminal('-d Xfile1 Xfile2', {})
7628ee4c01bSBram Moolenaar  " Set autoread mode, so that Vim won't complain once we re-write the test
763e828b762SBram Moolenaar  " files
764785fc656SBram Moolenaar  call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
765e828b762SBram Moolenaar
766e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_01', '')
767e828b762SBram Moolenaar
768e828b762SBram Moolenaar  " Test 2: Add a line in beginning of file 1
769785fc656SBram Moolenaar  call WriteDiffFiles(buf, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
770e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_02', '')
771e828b762SBram Moolenaar
772e828b762SBram Moolenaar  " Test 3: Add a line at the end of file 2
773785fc656SBram Moolenaar  call WriteDiffFiles(buf, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11])
774e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_03', '')
775e828b762SBram Moolenaar
776e828b762SBram Moolenaar  " Test 4: Add a line at the end of file 1
777785fc656SBram Moolenaar  call WriteDiffFiles(buf, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
778e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_04', '')
779e828b762SBram Moolenaar
780e828b762SBram Moolenaar  " Test 5: Add a line in the middle of file 2, remove on at the end of file 1
781785fc656SBram Moolenaar  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])
782e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_05', '')
783e828b762SBram Moolenaar
784e828b762SBram Moolenaar  " Test 6: Add a line in the middle of file 1, remove on at the end of file 2
785785fc656SBram Moolenaar  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])
786e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_06', '')
787e828b762SBram Moolenaar
788b9ddda6cSBram Moolenaar  " Variants on test 6 with different context settings
789b9ddda6cSBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=context:2\<cr>")
790b9ddda6cSBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_06.2', {})
791b9ddda6cSBram Moolenaar  call term_sendkeys(buf, ":set diffopt-=context:2\<cr>")
792b9ddda6cSBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=context:1\<cr>")
793b9ddda6cSBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_06.1', {})
794b9ddda6cSBram Moolenaar  call term_sendkeys(buf, ":set diffopt-=context:1\<cr>")
795b9ddda6cSBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=context:0\<cr>")
796b9ddda6cSBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_06.0', {})
797b9ddda6cSBram Moolenaar  call term_sendkeys(buf, ":set diffopt-=context:0\<cr>")
798b9ddda6cSBram Moolenaar
799e828b762SBram Moolenaar  " Test 7 - 9: Test normal/patience/histogram diff algorithm
800785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['#include <stdio.h>', '', '// Frobs foo heartily', 'int frobnitz(int foo)', '{',
801e828b762SBram Moolenaar      \ '    int i;', '    for(i = 0; i < 10; i++)', '    {', '        printf("Your answer is: ");',
802e828b762SBram Moolenaar      \ '        printf("%d\n", foo);', '    }', '}', '', 'int fact(int n)', '{', '    if(n > 1)', '    {',
803e828b762SBram Moolenaar      \ '        return fact(n-1) * n;', '    }', '    return 1;', '}', '', 'int main(int argc, char **argv)',
804e828b762SBram Moolenaar      \ '{', '    frobnitz(fact(10));', '}'],
805e828b762SBram Moolenaar      \ ['#include <stdio.h>', '', 'int fib(int n)', '{', '    if(n > 2)', '    {',
806e828b762SBram Moolenaar      \ '        return fib(n-1) + fib(n-2);', '    }', '    return 1;', '}', '', '// Frobs foo heartily',
807e828b762SBram Moolenaar      \ 'int frobnitz(int foo)', '{', '    int i;', '    for(i = 0; i < 10; i++)', '    {',
808e828b762SBram Moolenaar      \ '        printf("%d\n", foo);', '    }', '}', '',
809e828b762SBram Moolenaar      \ 'int main(int argc, char **argv)', '{', '    frobnitz(fib(10));', '}'])
810e828b762SBram Moolenaar  call term_sendkeys(buf, ":diffupdate!\<cr>")
811e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=internal\<cr>")
812e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_07', {})
813e828b762SBram Moolenaar
814e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=algorithm:patience\<cr>")
815e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_08', {})
816e828b762SBram Moolenaar
817e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=algorithm:histogram\<cr>")
818e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_09', {})
819e828b762SBram Moolenaar
820e828b762SBram Moolenaar  " Test 10-11: normal/indent-heuristic
821e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt&vim\<cr>")
822785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['', '  def finalize(values)', '', '    values.each do |v|', '      v.finalize', '    end'],
823e828b762SBram Moolenaar      \ ['', '  def finalize(values)', '', '    values.each do |v|', '      v.prepare', '    end', '',
824e828b762SBram Moolenaar      \ '    values.each do |v|', '      v.finalize', '    end'])
825e828b762SBram Moolenaar  call term_sendkeys(buf, ":diffupdate!\<cr>")
826e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=internal\<cr>")
827e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_10', {})
828e828b762SBram Moolenaar
829b6fc7285SBram Moolenaar  " Leave trailing : at commandline!
830b6fc7285SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=indent-heuristic\<cr>:\<cr>")
831b6fc7285SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_11', {}, 'one')
832b6fc7285SBram Moolenaar  " shouldn't matter, if indent-algorithm comes before or after the algorithm
833b6fc7285SBram Moolenaar  call term_sendkeys(buf, ":set diffopt&\<cr>")
834b6fc7285SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=indent-heuristic,algorithm:patience\<cr>:\<cr>")
835b6fc7285SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_11', {}, 'two')
836b6fc7285SBram Moolenaar  call term_sendkeys(buf, ":set diffopt&\<cr>")
837b6fc7285SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=algorithm:patience,indent-heuristic\<cr>:\<cr>")
838b6fc7285SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_11', {}, 'three')
839e828b762SBram Moolenaar
840e828b762SBram Moolenaar  " Test 12: diff the same file
841785fc656SBram Moolenaar  call WriteDiffFiles(buf, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
842e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_12', '')
843e828b762SBram Moolenaar
844e828b762SBram Moolenaar  " Test 13: diff an empty file
845785fc656SBram Moolenaar  call WriteDiffFiles(buf, [], [])
846e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_13', '')
847e828b762SBram Moolenaar
848e828b762SBram Moolenaar  " Test 14: test diffopt+=icase
849785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['a', 'b', 'cd'], ['A', 'b', 'cDe'])
850e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_14', " diffopt+=filler diffopt+=icase")
851e828b762SBram Moolenaar
852e828b762SBram Moolenaar  " Test 15-16: test diffopt+=iwhite
853785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['int main()', '{', '   printf("Hello, World!");', '   return 0;', '}'],
854e828b762SBram Moolenaar      \ ['int main()', '{', '   if (0)', '   {', '      printf("Hello, World!");', '      return 0;', '   }', '}'])
855e828b762SBram Moolenaar  call term_sendkeys(buf, ":diffupdate!\<cr>")
856e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt&vim diffopt+=filler diffopt+=iwhite\<cr>")
857e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_15', {})
858e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=internal\<cr>")
859e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_16', {})
860e828b762SBram Moolenaar
861785fc656SBram Moolenaar  " Test 17: test diffopt+=iblank
862785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['a', ' ', 'cd', 'ef', 'xxx'], ['a', 'cd', '', 'ef', 'yyy'])
863785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_17', " diffopt+=iblank")
864785fc656SBram Moolenaar
865785fc656SBram Moolenaar  " Test 18: test diffopt+=iblank,iwhite / iwhiteall / iwhiteeol
866785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_18', " diffopt+=iblank,iwhite")
867785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_18', " diffopt+=iblank,iwhiteall")
868785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_18', " diffopt+=iblank,iwhiteeol")
869785fc656SBram Moolenaar
870785fc656SBram Moolenaar  " Test 19: test diffopt+=iwhiteeol
871785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['a ', 'x', 'cd', 'ef', 'xx  xx', 'foo', 'bar'], ['a', 'x', 'c d', ' ef', 'xx xx', 'foo', '', 'bar'])
872785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_19', " diffopt+=iwhiteeol")
873785fc656SBram Moolenaar
874785fc656SBram Moolenaar  " Test 19: test diffopt+=iwhiteall
875785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_20', " diffopt+=iwhiteall")
876785fc656SBram Moolenaar
877e828b762SBram Moolenaar  " clean up
878e828b762SBram Moolenaar  call StopVimInTerminal(buf)
879e828b762SBram Moolenaar  call delete('Xfile1')
880e828b762SBram Moolenaar  call delete('Xfile2')
881e828b762SBram Moolenaarendfunc
882e828b762SBram Moolenaar
8834a5abbd6SBram Moolenaarfunc Test_diff_with_cursorline()
8843c8ee629SBram Moolenaar  CheckScreendump
8854a5abbd6SBram Moolenaar
8864a5abbd6SBram Moolenaar  call writefile([
8874a5abbd6SBram Moolenaar	\ 'hi CursorLine ctermbg=red ctermfg=white',
8884a5abbd6SBram Moolenaar	\ 'set cursorline',
8894a5abbd6SBram Moolenaar	\ 'call setline(1, ["foo","foo","foo","bar"])',
8904a5abbd6SBram Moolenaar	\ 'vnew',
8914a5abbd6SBram Moolenaar	\ 'call setline(1, ["bee","foo","foo","baz"])',
8924a5abbd6SBram Moolenaar	\ 'windo diffthis',
8934a5abbd6SBram Moolenaar	\ '2wincmd w',
8944a5abbd6SBram Moolenaar	\ ], 'Xtest_diff_cursorline')
8954a5abbd6SBram Moolenaar  let buf = RunVimInTerminal('-S Xtest_diff_cursorline', {})
8964a5abbd6SBram Moolenaar
8974a5abbd6SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_with_cursorline_01', {})
8984a5abbd6SBram Moolenaar  call term_sendkeys(buf, "j")
8994a5abbd6SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_with_cursorline_02', {})
9004a5abbd6SBram Moolenaar  call term_sendkeys(buf, "j")
9014a5abbd6SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_with_cursorline_03', {})
9024a5abbd6SBram Moolenaar
9034a5abbd6SBram Moolenaar  " clean up
9044a5abbd6SBram Moolenaar  call StopVimInTerminal(buf)
9054a5abbd6SBram Moolenaar  call delete('Xtest_diff_cursorline')
9064a5abbd6SBram Moolenaarendfunc
907f7acf2b6SBram Moolenaar
908*248fdb33SBram Moolenaarfunc Test_diff_with_syntax()
909*248fdb33SBram Moolenaar  CheckScreendump
910*248fdb33SBram Moolenaar
911*248fdb33SBram Moolenaar  let lines =<< trim END
912*248fdb33SBram Moolenaar  	void doNothing() {
913*248fdb33SBram Moolenaar	   int x = 0;
914*248fdb33SBram Moolenaar	   char *s = "hello";
915*248fdb33SBram Moolenaar	   return 5;
916*248fdb33SBram Moolenaar	}
917*248fdb33SBram Moolenaar  END
918*248fdb33SBram Moolenaar  call writefile(lines, 'Xprogram1.c')
919*248fdb33SBram Moolenaar  let lines =<< trim END
920*248fdb33SBram Moolenaar  	void doSomething() {
921*248fdb33SBram Moolenaar	   int x = 0;
922*248fdb33SBram Moolenaar	   char *s = "there";
923*248fdb33SBram Moolenaar	   return 5;
924*248fdb33SBram Moolenaar	}
925*248fdb33SBram Moolenaar  END
926*248fdb33SBram Moolenaar  call writefile(lines, 'Xprogram2.c')
927*248fdb33SBram Moolenaar
928*248fdb33SBram Moolenaar  let lines =<< trim END
929*248fdb33SBram Moolenaar  	edit Xprogram1.c
930*248fdb33SBram Moolenaar	diffsplit Xprogram2.c
931*248fdb33SBram Moolenaar  END
932*248fdb33SBram Moolenaar  call writefile(lines, 'Xtest_diff_syntax')
933*248fdb33SBram Moolenaar  let buf = RunVimInTerminal('-S Xtest_diff_syntax', {})
934*248fdb33SBram Moolenaar
935*248fdb33SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_syntax_1', {})
936*248fdb33SBram Moolenaar
937*248fdb33SBram Moolenaar  " clean up
938*248fdb33SBram Moolenaar  call StopVimInTerminal(buf)
939*248fdb33SBram Moolenaar  call delete('Xtest_diff_syntax')
940*248fdb33SBram Moolenaar  call delete('Xprogram1.c')
941*248fdb33SBram Moolenaar  call delete('Xprogram2.c')
942*248fdb33SBram Moolenaarendfunc
943*248fdb33SBram Moolenaar
944f7acf2b6SBram Moolenaarfunc Test_diff_of_diff()
9453c8ee629SBram Moolenaar  CheckScreendump
9463c8ee629SBram Moolenaar  CheckFeature rightleft
947f7acf2b6SBram Moolenaar
948f7acf2b6SBram Moolenaar  call writefile([
949f7acf2b6SBram Moolenaar	\ 'call setline(1, ["aa","bb","cc","@@ -3,2 +5,7 @@","dd","ee","ff"])',
950f7acf2b6SBram Moolenaar	\ 'vnew',
951f7acf2b6SBram Moolenaar	\ 'call setline(1, ["aa","bb","cc"])',
952f7acf2b6SBram Moolenaar	\ 'windo diffthis',
9538ee4c01bSBram Moolenaar	\ '1wincmd w',
9548ee4c01bSBram Moolenaar	\ 'setlocal number',
955f7acf2b6SBram Moolenaar	\ ], 'Xtest_diff_diff')
956f7acf2b6SBram Moolenaar  let buf = RunVimInTerminal('-S Xtest_diff_diff', {})
957f7acf2b6SBram Moolenaar
958f7acf2b6SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {})
959f7acf2b6SBram Moolenaar
960e73f911cSBram Moolenaar  call term_sendkeys(buf, ":set rightleft\<cr>")
961e73f911cSBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_of_diff_02', {})
962e73f911cSBram Moolenaar
963f7acf2b6SBram Moolenaar  " clean up
964f7acf2b6SBram Moolenaar  call StopVimInTerminal(buf)
965f7acf2b6SBram Moolenaar  call delete('Xtest_diff_diff')
966f7acf2b6SBram Moolenaarendfunc
967