142093c0eSBram Moolenaar" Tests for diff mode
2e828b762SBram Moolenaarsource shared.vim
3e828b762SBram Moolenaarsource screendump.vim
442093c0eSBram Moolenaar
542093c0eSBram Moolenaarfunc Test_diff_fold_sync()
642093c0eSBram Moolenaar  enew!
7e8fa05b5SBram Moolenaar  let g:update_count = 0
8e8fa05b5SBram Moolenaar  au DiffUpdated * let g:update_count += 1
9e8fa05b5SBram Moolenaar
1042093c0eSBram Moolenaar  let l = range(50)
1142093c0eSBram Moolenaar  call setline(1, l)
1242093c0eSBram Moolenaar  diffthis
1342093c0eSBram Moolenaar  let winone = win_getid()
1442093c0eSBram Moolenaar  new
1542093c0eSBram Moolenaar  let l[25] = 'diff'
1642093c0eSBram Moolenaar  call setline(1, l)
1742093c0eSBram Moolenaar  diffthis
1842093c0eSBram Moolenaar  let wintwo = win_getid()
1942093c0eSBram Moolenaar  " line 15 is inside the closed fold
2042093c0eSBram Moolenaar  call assert_equal(19, foldclosedend(10))
2142093c0eSBram Moolenaar  call win_gotoid(winone)
2242093c0eSBram Moolenaar  call assert_equal(19, foldclosedend(10))
2342093c0eSBram Moolenaar  " open the fold
2442093c0eSBram Moolenaar  normal zv
2542093c0eSBram Moolenaar  call assert_equal(-1, foldclosedend(10))
2642093c0eSBram Moolenaar  " fold in other window must have opened too
2742093c0eSBram Moolenaar  call win_gotoid(wintwo)
2842093c0eSBram Moolenaar  call assert_equal(-1, foldclosedend(10))
2942093c0eSBram Moolenaar
3042093c0eSBram Moolenaar  " cursor position is in sync
3142093c0eSBram Moolenaar  normal 23G
3242093c0eSBram Moolenaar  call win_gotoid(winone)
3342093c0eSBram Moolenaar  call assert_equal(23, getcurpos()[1])
3442093c0eSBram Moolenaar
35e8fa05b5SBram Moolenaar  call assert_equal(1, g:update_count)
36e8fa05b5SBram Moolenaar  au! DiffUpdated
37e8fa05b5SBram Moolenaar
3842093c0eSBram Moolenaar  windo diffoff
3942093c0eSBram Moolenaar  close!
4042093c0eSBram Moolenaar  set nomodified
4142093c0eSBram Moolenaarendfunc
4242093c0eSBram Moolenaar
4342093c0eSBram Moolenaarfunc Test_vert_split()
44e828b762SBram Moolenaar  set diffopt=filler
45e828b762SBram Moolenaar  call Common_vert_split()
46e828b762SBram Moolenaar  set diffopt&
47e828b762SBram Moolenaarendfunc
48e828b762SBram Moolenaar
49e828b762SBram Moolenaarfunc Test_vert_split_internal()
50e828b762SBram Moolenaar  set diffopt=internal,filler
51e828b762SBram Moolenaar  call Common_vert_split()
52e828b762SBram Moolenaar  set diffopt&
53e828b762SBram Moolenaarendfunc
54e828b762SBram Moolenaar
55e828b762SBram Moolenaarfunc Common_vert_split()
5642093c0eSBram Moolenaar  " Disable the title to avoid xterm keeping the wrong one.
5742093c0eSBram Moolenaar  set notitle noicon
5842093c0eSBram Moolenaar  new
5942093c0eSBram Moolenaar  let l = ['1 aa', '2 bb', '3 cc', '4 dd', '5 ee']
6042093c0eSBram Moolenaar  call setline(1, l)
6142093c0eSBram Moolenaar  w! Xtest
6242093c0eSBram Moolenaar  normal dd
6342093c0eSBram Moolenaar  $
6442093c0eSBram Moolenaar  put
6542093c0eSBram Moolenaar  normal kkrXoxxx
6642093c0eSBram Moolenaar  w! Xtest2
6742093c0eSBram Moolenaar  file Nop
6842093c0eSBram Moolenaar  normal ggoyyyjjjozzzz
6942093c0eSBram Moolenaar  set foldmethod=marker foldcolumn=4
7042093c0eSBram Moolenaar  call assert_equal(0, &diff)
7142093c0eSBram Moolenaar  call assert_equal('marker', &foldmethod)
7242093c0eSBram Moolenaar  call assert_equal(4, &foldcolumn)
7342093c0eSBram Moolenaar  call assert_equal(0, &scrollbind)
7442093c0eSBram Moolenaar  call assert_equal(0, &cursorbind)
7542093c0eSBram Moolenaar  call assert_equal(1, &wrap)
7642093c0eSBram Moolenaar
7742093c0eSBram Moolenaar  vert diffsplit Xtest
7842093c0eSBram Moolenaar  vert diffsplit Xtest2
7942093c0eSBram Moolenaar  call assert_equal(1, &diff)
8042093c0eSBram Moolenaar  call assert_equal('diff', &foldmethod)
8142093c0eSBram Moolenaar  call assert_equal(2, &foldcolumn)
8242093c0eSBram Moolenaar  call assert_equal(1, &scrollbind)
8342093c0eSBram Moolenaar  call assert_equal(1, &cursorbind)
8442093c0eSBram Moolenaar  call assert_equal(0, &wrap)
8542093c0eSBram Moolenaar
8642093c0eSBram Moolenaar  let diff_fdm = &fdm
8742093c0eSBram Moolenaar  let diff_fdc = &fdc
8842093c0eSBram Moolenaar  " repeat entering diff mode here to see if this saves the wrong settings
8942093c0eSBram Moolenaar  diffthis
9042093c0eSBram Moolenaar  " jump to second window for a moment to have filler line appear at start of
9142093c0eSBram Moolenaar  " first window
9242093c0eSBram Moolenaar  wincmd w
9342093c0eSBram Moolenaar  normal gg
9442093c0eSBram Moolenaar  wincmd p
9542093c0eSBram Moolenaar  normal gg
9642093c0eSBram Moolenaar  call assert_equal(2, winline())
9742093c0eSBram Moolenaar  normal j
9842093c0eSBram Moolenaar  call assert_equal(4, winline())
9942093c0eSBram Moolenaar  normal j
10042093c0eSBram Moolenaar  call assert_equal(5, winline())
10142093c0eSBram Moolenaar  normal j
10242093c0eSBram Moolenaar  call assert_equal(6, winline())
10342093c0eSBram Moolenaar  normal j
10442093c0eSBram Moolenaar  call assert_equal(8, winline())
10542093c0eSBram Moolenaar  normal j
10642093c0eSBram Moolenaar  call assert_equal(9, winline())
10742093c0eSBram Moolenaar
10842093c0eSBram Moolenaar  wincmd w
10942093c0eSBram Moolenaar  normal gg
11042093c0eSBram Moolenaar  call assert_equal(1, winline())
11142093c0eSBram Moolenaar  normal j
11242093c0eSBram Moolenaar  call assert_equal(2, winline())
11342093c0eSBram Moolenaar  normal j
11442093c0eSBram Moolenaar  call assert_equal(4, winline())
11542093c0eSBram Moolenaar  normal j
11642093c0eSBram Moolenaar  call assert_equal(5, winline())
11742093c0eSBram Moolenaar  normal j
11842093c0eSBram Moolenaar  call assert_equal(8, winline())
11942093c0eSBram Moolenaar
12042093c0eSBram Moolenaar  wincmd w
12142093c0eSBram Moolenaar  normal gg
12242093c0eSBram Moolenaar  call assert_equal(2, winline())
12342093c0eSBram Moolenaar  normal j
12442093c0eSBram Moolenaar  call assert_equal(3, winline())
12542093c0eSBram Moolenaar  normal j
12642093c0eSBram Moolenaar  call assert_equal(4, winline())
12742093c0eSBram Moolenaar  normal j
12842093c0eSBram Moolenaar  call assert_equal(5, winline())
12942093c0eSBram Moolenaar  normal j
13042093c0eSBram Moolenaar  call assert_equal(6, winline())
13142093c0eSBram Moolenaar  normal j
13242093c0eSBram Moolenaar  call assert_equal(7, winline())
13342093c0eSBram Moolenaar  normal j
13442093c0eSBram Moolenaar  call assert_equal(8, winline())
13542093c0eSBram Moolenaar
13642093c0eSBram Moolenaar  " Test diffoff
13742093c0eSBram Moolenaar  diffoff!
13842093c0eSBram Moolenaar  1wincmd 2
13942093c0eSBram Moolenaar  let &diff = 1
14042093c0eSBram Moolenaar  let &fdm = diff_fdm
14142093c0eSBram Moolenaar  let &fdc = diff_fdc
14242093c0eSBram Moolenaar  4wincmd w
14342093c0eSBram Moolenaar  diffoff!
14442093c0eSBram Moolenaar  1wincmd w
14542093c0eSBram Moolenaar  call assert_equal(0, &diff)
14642093c0eSBram Moolenaar  call assert_equal('marker', &foldmethod)
14742093c0eSBram Moolenaar  call assert_equal(4, &foldcolumn)
14842093c0eSBram Moolenaar  call assert_equal(0, &scrollbind)
14942093c0eSBram Moolenaar  call assert_equal(0, &cursorbind)
15042093c0eSBram Moolenaar  call assert_equal(1, &wrap)
15142093c0eSBram Moolenaar
15242093c0eSBram Moolenaar  wincmd w
15342093c0eSBram Moolenaar  call assert_equal(0, &diff)
15442093c0eSBram Moolenaar  call assert_equal('marker', &foldmethod)
15542093c0eSBram Moolenaar  call assert_equal(4, &foldcolumn)
15642093c0eSBram Moolenaar  call assert_equal(0, &scrollbind)
15742093c0eSBram Moolenaar  call assert_equal(0, &cursorbind)
15842093c0eSBram Moolenaar  call assert_equal(1, &wrap)
15942093c0eSBram Moolenaar
16042093c0eSBram Moolenaar  wincmd w
16142093c0eSBram Moolenaar  call assert_equal(0, &diff)
16242093c0eSBram Moolenaar  call assert_equal('marker', &foldmethod)
16342093c0eSBram Moolenaar  call assert_equal(4, &foldcolumn)
16442093c0eSBram Moolenaar  call assert_equal(0, &scrollbind)
16542093c0eSBram Moolenaar  call assert_equal(0, &cursorbind)
16642093c0eSBram Moolenaar  call assert_equal(1, &wrap)
16742093c0eSBram Moolenaar
168623cf88fSBram Moolenaar  call delete('Xtest')
169623cf88fSBram Moolenaar  call delete('Xtest2')
17042093c0eSBram Moolenaar  windo bw!
17142093c0eSBram Moolenaarendfunc
17242093c0eSBram Moolenaar
17342093c0eSBram Moolenaarfunc Test_filler_lines()
17442093c0eSBram Moolenaar  " Test that diffing shows correct filler lines
17542093c0eSBram Moolenaar  enew!
17642093c0eSBram Moolenaar  put =range(4,10)
17742093c0eSBram Moolenaar  1d _
17842093c0eSBram Moolenaar  vnew
17942093c0eSBram Moolenaar  put =range(1,10)
18042093c0eSBram Moolenaar  1d _
18142093c0eSBram Moolenaar  windo diffthis
18242093c0eSBram Moolenaar  wincmd h
18342093c0eSBram Moolenaar  call assert_equal(1, line('w0'))
18442093c0eSBram Moolenaar  unlet! diff_fdm diff_fdc
18590d121faSBram Moolenaar  windo diffoff
18690d121faSBram Moolenaar  bwipe!
18790d121faSBram Moolenaar  enew!
18890d121faSBram Moolenaarendfunc
18942093c0eSBram Moolenaar
19090d121faSBram Moolenaarfunc Test_diffget_diffput()
19190d121faSBram Moolenaar  enew!
19290d121faSBram Moolenaar  let l = range(50)
19390d121faSBram Moolenaar  call setline(1, l)
19490d121faSBram Moolenaar  call assert_fails('diffget', 'E99:')
19590d121faSBram Moolenaar  diffthis
19690d121faSBram Moolenaar  call assert_fails('diffget', 'E100:')
19790d121faSBram Moolenaar  new
19890d121faSBram Moolenaar  let l[10] = 'one'
19990d121faSBram Moolenaar  let l[20] = 'two'
20090d121faSBram Moolenaar  let l[30] = 'three'
20190d121faSBram Moolenaar  let l[40] = 'four'
20290d121faSBram Moolenaar  call setline(1, l)
20390d121faSBram Moolenaar  diffthis
20490d121faSBram Moolenaar  call assert_equal('one', getline(11))
20590d121faSBram Moolenaar  11diffget
20690d121faSBram Moolenaar  call assert_equal('10', getline(11))
20790d121faSBram Moolenaar  21diffput
20890d121faSBram Moolenaar  wincmd w
20990d121faSBram Moolenaar  call assert_equal('two', getline(21))
21090d121faSBram Moolenaar  normal 31Gdo
21190d121faSBram Moolenaar  call assert_equal('three', getline(31))
21290d121faSBram Moolenaar  call assert_equal('40', getline(41))
21390d121faSBram Moolenaar  normal 41Gdp
21490d121faSBram Moolenaar  wincmd w
21590d121faSBram Moolenaar  call assert_equal('40', getline(41))
21690d121faSBram Moolenaar  new
21790d121faSBram Moolenaar  diffthis
21890d121faSBram Moolenaar  call assert_fails('diffget', 'E101:')
21990d121faSBram Moolenaar
22090d121faSBram Moolenaar  windo diffoff
22179a213d6SBram Moolenaar  %bwipe!
22279a213d6SBram Moolenaarendfunc
22379a213d6SBram Moolenaar
22479a213d6SBram Moolenaarfunc Test_dp_do_buffer()
22579a213d6SBram Moolenaar  e! one
22679a213d6SBram Moolenaar  let bn1=bufnr('%')
22779a213d6SBram Moolenaar  let l = range(60)
22879a213d6SBram Moolenaar  call setline(1, l)
22979a213d6SBram Moolenaar  diffthis
23079a213d6SBram Moolenaar
23179a213d6SBram Moolenaar  new two
23279a213d6SBram Moolenaar  let l[10] = 'one'
23379a213d6SBram Moolenaar  let l[20] = 'two'
23479a213d6SBram Moolenaar  let l[30] = 'three'
23579a213d6SBram Moolenaar  let l[40] = 'four'
23679a213d6SBram Moolenaar  let l[50] = 'five'
23779a213d6SBram Moolenaar  call setline(1, l)
23879a213d6SBram Moolenaar  diffthis
23979a213d6SBram Moolenaar
24079a213d6SBram Moolenaar  " dp and do with invalid buffer number.
24179a213d6SBram Moolenaar  11
24279a213d6SBram Moolenaar  call assert_fails('norm 99999dp', 'E102:')
24379a213d6SBram Moolenaar  call assert_fails('norm 99999do', 'E102:')
24479a213d6SBram Moolenaar  call assert_fails('diffput non_existing_buffer', 'E94:')
24579a213d6SBram Moolenaar  call assert_fails('diffget non_existing_buffer', 'E94:')
24679a213d6SBram Moolenaar
24779a213d6SBram Moolenaar  " dp and do with valid buffer number.
24879a213d6SBram Moolenaar  call assert_equal('one', getline('.'))
24979a213d6SBram Moolenaar  exe 'norm ' . bn1 . 'do'
25079a213d6SBram Moolenaar  call assert_equal('10', getline('.'))
25179a213d6SBram Moolenaar  21
25279a213d6SBram Moolenaar  call assert_equal('two', getline('.'))
25379a213d6SBram Moolenaar  diffget one
25479a213d6SBram Moolenaar  call assert_equal('20', getline('.'))
25579a213d6SBram Moolenaar
25679a213d6SBram Moolenaar  31
25779a213d6SBram Moolenaar  exe 'norm ' . bn1 . 'dp'
25879a213d6SBram Moolenaar  41
25979a213d6SBram Moolenaar  diffput one
26079a213d6SBram Moolenaar  wincmd w
26179a213d6SBram Moolenaar  31
26279a213d6SBram Moolenaar  call assert_equal('three', getline('.'))
26379a213d6SBram Moolenaar  41
26479a213d6SBram Moolenaar  call assert_equal('four', getline('.'))
26579a213d6SBram Moolenaar
26679a213d6SBram Moolenaar  " dp and do with buffer number which is not in diff mode.
26779a213d6SBram Moolenaar  new not_in_diff_mode
26879a213d6SBram Moolenaar  let bn3=bufnr('%')
26979a213d6SBram Moolenaar  wincmd w
27079a213d6SBram Moolenaar  51
27179a213d6SBram Moolenaar  call assert_fails('exe "norm" . bn3 . "dp"', 'E103:')
27279a213d6SBram Moolenaar  call assert_fails('exe "norm" . bn3 . "do"', 'E103:')
27379a213d6SBram Moolenaar  call assert_fails('diffput not_in_diff_mode', 'E94:')
27479a213d6SBram Moolenaar  call assert_fails('diffget not_in_diff_mode', 'E94:')
27579a213d6SBram Moolenaar
27679a213d6SBram Moolenaar  windo diffoff
27779a213d6SBram Moolenaar  %bwipe!
27842093c0eSBram Moolenaarendfunc
279e67d546fSBram Moolenaar
280*df77cef9SBram Moolenaarfunc Test_do_lastline()
281*df77cef9SBram Moolenaar  e! one
282*df77cef9SBram Moolenaar  call setline(1, ['1','2','3','4','5','6'])
283*df77cef9SBram Moolenaar  diffthis
284*df77cef9SBram Moolenaar
285*df77cef9SBram Moolenaar  new two
286*df77cef9SBram Moolenaar  call setline(1, ['2','4','5'])
287*df77cef9SBram Moolenaar  diffthis
288*df77cef9SBram Moolenaar
289*df77cef9SBram Moolenaar  1
290*df77cef9SBram Moolenaar  norm dp]c
291*df77cef9SBram Moolenaar  norm dp]c
292*df77cef9SBram Moolenaar  wincmd w
293*df77cef9SBram Moolenaar  call assert_equal(4, line('$'))
294*df77cef9SBram Moolenaar  norm G
295*df77cef9SBram Moolenaar  norm do
296*df77cef9SBram Moolenaar  call assert_equal(3, line('$'))
297*df77cef9SBram Moolenaar
298*df77cef9SBram Moolenaar  windo diffoff
299*df77cef9SBram Moolenaar  %bwipe!
300*df77cef9SBram Moolenaarendfunc
301*df77cef9SBram Moolenaar
302e67d546fSBram Moolenaarfunc Test_diffoff()
303e67d546fSBram Moolenaar  enew!
304e67d546fSBram Moolenaar  call setline(1, ['Two', 'Three'])
30579a213d6SBram Moolenaar  redraw
306e67d546fSBram Moolenaar  let normattr = screenattr(1, 1)
307e67d546fSBram Moolenaar  diffthis
308e67d546fSBram Moolenaar  botright vert new
309e67d546fSBram Moolenaar  call setline(1, ['One', '', 'Two', 'Three'])
310e67d546fSBram Moolenaar  diffthis
311e67d546fSBram Moolenaar  redraw
31225ea0544SBram Moolenaar  call assert_notequal(normattr, screenattr(1, 1))
313e67d546fSBram Moolenaar  diffoff!
314e67d546fSBram Moolenaar  redraw
315e67d546fSBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
316e67d546fSBram Moolenaar  bwipe!
317e67d546fSBram Moolenaar  bwipe!
318e67d546fSBram Moolenaarendfunc
319025e3e0bSBram Moolenaar
320e828b762SBram Moolenaarfunc Common_icase_test()
321e828b762SBram Moolenaar  edit one
322da22b8ccSBram Moolenaar  call setline(1, ['One', 'Two', 'Three', 'Four', 'Fi#ve'])
32379a213d6SBram Moolenaar  redraw
32479a213d6SBram Moolenaar  let normattr = screenattr(1, 1)
32579a213d6SBram Moolenaar  diffthis
32679a213d6SBram Moolenaar
32779a213d6SBram Moolenaar  botright vert new two
328da22b8ccSBram Moolenaar  call setline(1, ['one', 'TWO', 'Three ', 'Four', 'fI=VE'])
32979a213d6SBram Moolenaar  diffthis
33079a213d6SBram Moolenaar
33179a213d6SBram Moolenaar  redraw
33279a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
33379a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(2, 1))
33479a213d6SBram Moolenaar  call assert_notequal(normattr, screenattr(3, 1))
33579a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(4, 1))
33679a213d6SBram Moolenaar
337da22b8ccSBram Moolenaar  let dtextattr = screenattr(5, 3)
338da22b8ccSBram Moolenaar  call assert_notequal(dtextattr, screenattr(5, 1))
339da22b8ccSBram Moolenaar  call assert_notequal(dtextattr, screenattr(5, 5))
340da22b8ccSBram Moolenaar
34179a213d6SBram Moolenaar  diffoff!
34279a213d6SBram Moolenaar  %bwipe!
343e828b762SBram Moolenaarendfunc
344e828b762SBram Moolenaar
345e828b762SBram Moolenaarfunc Test_diffopt_icase()
346e828b762SBram Moolenaar  set diffopt=icase,foldcolumn:0
347e828b762SBram Moolenaar  call Common_icase_test()
34879a213d6SBram Moolenaar  set diffopt&
34979a213d6SBram Moolenaarendfunc
35079a213d6SBram Moolenaar
351e828b762SBram Moolenaarfunc Test_diffopt_icase_internal()
352e828b762SBram Moolenaar  set diffopt=icase,foldcolumn:0,internal
353e828b762SBram Moolenaar  call Common_icase_test()
354e828b762SBram Moolenaar  set diffopt&
355e828b762SBram Moolenaarendfunc
35679a213d6SBram Moolenaar
357e828b762SBram Moolenaarfunc Common_iwhite_test()
358e828b762SBram Moolenaar  edit one
359e828b762SBram Moolenaar  " Difference in trailing spaces and amount of spaces should be ignored,
36079a213d6SBram Moolenaar  " but not other space differences.
361e828b762SBram Moolenaar  call setline(1, ["One \t", 'Two', 'Three', 'one two', 'one two', 'Four'])
36279a213d6SBram Moolenaar  redraw
36379a213d6SBram Moolenaar  let normattr = screenattr(1, 1)
36479a213d6SBram Moolenaar  diffthis
36579a213d6SBram Moolenaar
36679a213d6SBram Moolenaar  botright vert new two
367e828b762SBram Moolenaar  call setline(1, ["One\t ", "Two\t ", 'Three', 'one   two', 'onetwo', ' Four'])
36879a213d6SBram Moolenaar  diffthis
36979a213d6SBram Moolenaar
37079a213d6SBram Moolenaar  redraw
37179a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
37279a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(2, 1))
37379a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(3, 1))
374e828b762SBram Moolenaar  call assert_equal(normattr, screenattr(4, 1))
375e828b762SBram Moolenaar  call assert_notequal(normattr, screenattr(5, 1))
376e828b762SBram Moolenaar  call assert_notequal(normattr, screenattr(6, 1))
37779a213d6SBram Moolenaar
37879a213d6SBram Moolenaar  diffoff!
37979a213d6SBram Moolenaar  %bwipe!
380e828b762SBram Moolenaarendfunc
381e828b762SBram Moolenaar
382e828b762SBram Moolenaarfunc Test_diffopt_iwhite()
383e828b762SBram Moolenaar  set diffopt=iwhite,foldcolumn:0
384e828b762SBram Moolenaar  call Common_iwhite_test()
385e828b762SBram Moolenaar  set diffopt&
386e828b762SBram Moolenaarendfunc
387e828b762SBram Moolenaar
388e828b762SBram Moolenaarfunc Test_diffopt_iwhite_internal()
389e828b762SBram Moolenaar  set diffopt=internal,iwhite,foldcolumn:0
390e828b762SBram Moolenaar  call Common_iwhite_test()
39179a213d6SBram Moolenaar  set diffopt&
39279a213d6SBram Moolenaarendfunc
39379a213d6SBram Moolenaar
39479a213d6SBram Moolenaarfunc Test_diffopt_context()
39579a213d6SBram Moolenaar  enew!
39679a213d6SBram Moolenaar  call setline(1, ['1', '2', '3', '4', '5', '6', '7'])
39779a213d6SBram Moolenaar  diffthis
39879a213d6SBram Moolenaar  new
39979a213d6SBram Moolenaar  call setline(1, ['1', '2', '3', '4', '5x', '6', '7'])
40079a213d6SBram Moolenaar  diffthis
40179a213d6SBram Moolenaar
40279a213d6SBram Moolenaar  set diffopt=context:2
40379a213d6SBram Moolenaar  call assert_equal('+--  2 lines: 1', foldtextresult(1))
404e828b762SBram Moolenaar  set diffopt=internal,context:2
405e828b762SBram Moolenaar  call assert_equal('+--  2 lines: 1', foldtextresult(1))
406e828b762SBram Moolenaar
40779a213d6SBram Moolenaar  set diffopt=context:1
40879a213d6SBram Moolenaar  call assert_equal('+--  3 lines: 1', foldtextresult(1))
409e828b762SBram Moolenaar  set diffopt=internal,context:1
410e828b762SBram Moolenaar  call assert_equal('+--  3 lines: 1', foldtextresult(1))
41179a213d6SBram Moolenaar
41279a213d6SBram Moolenaar  diffoff!
41379a213d6SBram Moolenaar  %bwipe!
41479a213d6SBram Moolenaar  set diffopt&
41579a213d6SBram Moolenaarendfunc
41679a213d6SBram Moolenaar
41779a213d6SBram Moolenaarfunc Test_diffopt_horizontal()
418e828b762SBram Moolenaar  set diffopt=internal,horizontal
41979a213d6SBram Moolenaar  diffsplit
42079a213d6SBram Moolenaar
42179a213d6SBram Moolenaar  call assert_equal(&columns, winwidth(1))
42279a213d6SBram Moolenaar  call assert_equal(&columns, winwidth(2))
42379a213d6SBram Moolenaar  call assert_equal(&lines, winheight(1) + winheight(2) + 3)
42479a213d6SBram Moolenaar  call assert_inrange(0, 1, winheight(1) - winheight(2))
42579a213d6SBram Moolenaar
42679a213d6SBram Moolenaar  set diffopt&
42779a213d6SBram Moolenaar  diffoff!
42879a213d6SBram Moolenaar  %bwipe
42979a213d6SBram Moolenaarendfunc
43079a213d6SBram Moolenaar
43179a213d6SBram Moolenaarfunc Test_diffopt_vertical()
432e828b762SBram Moolenaar  set diffopt=internal,vertical
43379a213d6SBram Moolenaar  diffsplit
43479a213d6SBram Moolenaar
43579a213d6SBram Moolenaar  call assert_equal(&lines - 2, winheight(1))
43679a213d6SBram Moolenaar  call assert_equal(&lines - 2, winheight(2))
43779a213d6SBram Moolenaar  call assert_equal(&columns, winwidth(1) + winwidth(2) + 1)
43879a213d6SBram Moolenaar  call assert_inrange(0, 1, winwidth(1) - winwidth(2))
43979a213d6SBram Moolenaar
44079a213d6SBram Moolenaar  set diffopt&
44179a213d6SBram Moolenaar  diffoff!
44279a213d6SBram Moolenaar  %bwipe
44379a213d6SBram Moolenaarendfunc
44479a213d6SBram Moolenaar
44597ce4192SBram Moolenaarfunc Test_diffopt_hiddenoff()
446e828b762SBram Moolenaar  set diffopt=internal,filler,foldcolumn:0,hiddenoff
44797ce4192SBram Moolenaar  e! one
44897ce4192SBram Moolenaar  call setline(1, ['Two', 'Three'])
44997ce4192SBram Moolenaar  redraw
45097ce4192SBram Moolenaar  let normattr = screenattr(1, 1)
45197ce4192SBram Moolenaar  diffthis
45297ce4192SBram Moolenaar  botright vert new two
45397ce4192SBram Moolenaar  call setline(1, ['One', 'Four'])
45497ce4192SBram Moolenaar  diffthis
45597ce4192SBram Moolenaar  redraw
45697ce4192SBram Moolenaar  call assert_notequal(normattr, screenattr(1, 1))
45797ce4192SBram Moolenaar  set hidden
45897ce4192SBram Moolenaar  close
45997ce4192SBram Moolenaar  redraw
46097ce4192SBram Moolenaar  " should not diffing with hidden buffer two while 'hiddenoff' is enabled
46197ce4192SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
46297ce4192SBram Moolenaar
46397ce4192SBram Moolenaar  bwipe!
46497ce4192SBram Moolenaar  bwipe!
46597ce4192SBram Moolenaar  set hidden& diffopt&
46697ce4192SBram Moolenaarendfunc
46797ce4192SBram Moolenaar
46825ea0544SBram Moolenaarfunc Test_diffoff_hidden()
469e828b762SBram Moolenaar  set diffopt=internal,filler,foldcolumn:0
47025ea0544SBram Moolenaar  e! one
47125ea0544SBram Moolenaar  call setline(1, ['Two', 'Three'])
47279a213d6SBram Moolenaar  redraw
47325ea0544SBram Moolenaar  let normattr = screenattr(1, 1)
47425ea0544SBram Moolenaar  diffthis
47525ea0544SBram Moolenaar  botright vert new two
47625ea0544SBram Moolenaar  call setline(1, ['One', 'Four'])
47725ea0544SBram Moolenaar  diffthis
47825ea0544SBram Moolenaar  redraw
47925ea0544SBram Moolenaar  call assert_notequal(normattr, screenattr(1, 1))
48025ea0544SBram Moolenaar  set hidden
48125ea0544SBram Moolenaar  close
48225ea0544SBram Moolenaar  redraw
48325ea0544SBram Moolenaar  " diffing with hidden buffer two
48425ea0544SBram Moolenaar  call assert_notequal(normattr, screenattr(1, 1))
48525ea0544SBram Moolenaar  diffoff
48625ea0544SBram Moolenaar  redraw
48725ea0544SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
48825ea0544SBram Moolenaar  diffthis
48925ea0544SBram Moolenaar  redraw
49025ea0544SBram Moolenaar  " still diffing with hidden buffer two
49125ea0544SBram Moolenaar  call assert_notequal(normattr, screenattr(1, 1))
49225ea0544SBram Moolenaar  diffoff!
49325ea0544SBram Moolenaar  redraw
49425ea0544SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
49525ea0544SBram Moolenaar  diffthis
49625ea0544SBram Moolenaar  redraw
49725ea0544SBram Moolenaar  " no longer diffing with hidden buffer two
49825ea0544SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
49925ea0544SBram Moolenaar
50025ea0544SBram Moolenaar  bwipe!
50125ea0544SBram Moolenaar  bwipe!
50225ea0544SBram Moolenaar  set hidden& diffopt&
50325ea0544SBram Moolenaarendfunc
50425ea0544SBram Moolenaar
505025e3e0bSBram Moolenaarfunc Test_setting_cursor()
506025e3e0bSBram Moolenaar  new Xtest1
507025e3e0bSBram Moolenaar  put =range(1,90)
508025e3e0bSBram Moolenaar  wq
509025e3e0bSBram Moolenaar  new Xtest2
510025e3e0bSBram Moolenaar  put =range(1,100)
511025e3e0bSBram Moolenaar  wq
512025e3e0bSBram Moolenaar
513025e3e0bSBram Moolenaar  tabe Xtest2
514025e3e0bSBram Moolenaar  $
515025e3e0bSBram Moolenaar  diffsp Xtest1
516025e3e0bSBram Moolenaar  tabclose
517025e3e0bSBram Moolenaar
518025e3e0bSBram Moolenaar  call delete('Xtest1')
519025e3e0bSBram Moolenaar  call delete('Xtest2')
520025e3e0bSBram Moolenaarendfunc
521aeb661e1SBram Moolenaar
522aeb661e1SBram Moolenaarfunc Test_diff_move_to()
523aeb661e1SBram Moolenaar  new
524aeb661e1SBram Moolenaar  call setline(1, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
525aeb661e1SBram Moolenaar  diffthis
526aeb661e1SBram Moolenaar  vnew
527aeb661e1SBram Moolenaar  call setline(1, [1, '2x', 3, 4, 4, 5, '6x', 7, '8x', 9, '10x'])
528aeb661e1SBram Moolenaar  diffthis
529aeb661e1SBram Moolenaar  norm ]c
530aeb661e1SBram Moolenaar  call assert_equal(2, line('.'))
531aeb661e1SBram Moolenaar  norm 3]c
532aeb661e1SBram Moolenaar  call assert_equal(9, line('.'))
533aeb661e1SBram Moolenaar  norm 10]c
534aeb661e1SBram Moolenaar  call assert_equal(11, line('.'))
535aeb661e1SBram Moolenaar  norm [c
536aeb661e1SBram Moolenaar  call assert_equal(9, line('.'))
537aeb661e1SBram Moolenaar  norm 2[c
538aeb661e1SBram Moolenaar  call assert_equal(5, line('.'))
539aeb661e1SBram Moolenaar  norm 10[c
540aeb661e1SBram Moolenaar  call assert_equal(2, line('.'))
541aeb661e1SBram Moolenaar  %bwipe!
542aeb661e1SBram Moolenaarendfunc
543aeb661e1SBram Moolenaar
54479a213d6SBram Moolenaarfunc Test_diffexpr()
54579a213d6SBram Moolenaar  if !executable('diff')
54679a213d6SBram Moolenaar    return
54779a213d6SBram Moolenaar  endif
54879a213d6SBram Moolenaar
54979a213d6SBram Moolenaar  func DiffExpr()
5503b8defd0SBram Moolenaar    " Prepent some text to check diff type detection
5513b8defd0SBram Moolenaar    call writefile(['warning', '  message'], v:fname_out)
5523b8defd0SBram Moolenaar    silent exe '!diff ' . v:fname_in . ' ' . v:fname_new . '>>' . v:fname_out
55379a213d6SBram Moolenaar  endfunc
55479a213d6SBram Moolenaar  set diffexpr=DiffExpr()
55579a213d6SBram Moolenaar  set diffopt=foldcolumn:0
55679a213d6SBram Moolenaar
55779a213d6SBram Moolenaar  enew!
55879a213d6SBram Moolenaar  call setline(1, ['one', 'two', 'three'])
55979a213d6SBram Moolenaar  redraw
56079a213d6SBram Moolenaar  let normattr = screenattr(1, 1)
56179a213d6SBram Moolenaar  diffthis
56279a213d6SBram Moolenaar
56379a213d6SBram Moolenaar  botright vert new
56479a213d6SBram Moolenaar  call setline(1, ['one', 'two', 'three.'])
56579a213d6SBram Moolenaar  diffthis
56679a213d6SBram Moolenaar
56779a213d6SBram Moolenaar  redraw
56879a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(1, 1))
56979a213d6SBram Moolenaar  call assert_equal(normattr, screenattr(2, 1))
57079a213d6SBram Moolenaar  call assert_notequal(normattr, screenattr(3, 1))
57179a213d6SBram Moolenaar
57279a213d6SBram Moolenaar  diffoff!
57379a213d6SBram Moolenaar  %bwipe!
57479a213d6SBram Moolenaar  set diffexpr& diffopt&
57579a213d6SBram Moolenaarendfunc
57679a213d6SBram Moolenaar
577aeb661e1SBram Moolenaarfunc Test_diffpatch()
578aeb661e1SBram Moolenaar  " The patch program on MS-Windows may fail or hang.
579aeb661e1SBram Moolenaar  if !executable('patch') || !has('unix')
580aeb661e1SBram Moolenaar    return
581aeb661e1SBram Moolenaar  endif
582aeb661e1SBram Moolenaar  new
583aeb661e1SBram Moolenaar  insert
584aeb661e1SBram Moolenaar***************
585aeb661e1SBram Moolenaar*** 1,3 ****
586aeb661e1SBram Moolenaar  1
587aeb661e1SBram Moolenaar! 2
588aeb661e1SBram Moolenaar  3
589aeb661e1SBram Moolenaar--- 1,4 ----
590aeb661e1SBram Moolenaar  1
591aeb661e1SBram Moolenaar! 2x
592aeb661e1SBram Moolenaar  3
593aeb661e1SBram Moolenaar+ 4
594aeb661e1SBram Moolenaar.
59597fbc404SBram Moolenaar  saveas! Xpatch
596aeb661e1SBram Moolenaar  bwipe!
597aeb661e1SBram Moolenaar  new
598aeb661e1SBram Moolenaar  call assert_fails('diffpatch Xpatch', 'E816:')
5991ef73e33SBram Moolenaar
600a95ab321SBram Moolenaar  for name in ['Xpatch', 'Xpatch$HOME', 'Xpa''tch']
601aeb661e1SBram Moolenaar    call setline(1, ['1', '2', '3'])
6021ef73e33SBram Moolenaar    if name != 'Xpatch'
6031ef73e33SBram Moolenaar      call rename('Xpatch', name)
6041ef73e33SBram Moolenaar    endif
6051ef73e33SBram Moolenaar    exe 'diffpatch ' . escape(name, '$')
606aeb661e1SBram Moolenaar    call assert_equal(['1', '2x', '3', '4'], getline(1, '$'))
6071ef73e33SBram Moolenaar    if name != 'Xpatch'
6081ef73e33SBram Moolenaar      call rename(name, 'Xpatch')
6091ef73e33SBram Moolenaar    endif
6101ef73e33SBram Moolenaar    bwipe!
6111ef73e33SBram Moolenaar  endfor
6121ef73e33SBram Moolenaar
613aeb661e1SBram Moolenaar  call delete('Xpatch')
614aeb661e1SBram Moolenaar  bwipe!
615aeb661e1SBram Moolenaarendfunc
616aeb661e1SBram Moolenaar
617aeb661e1SBram Moolenaarfunc Test_diff_too_many_buffers()
618aeb661e1SBram Moolenaar  for i in range(1, 8)
619aeb661e1SBram Moolenaar    exe "new Xtest" . i
620aeb661e1SBram Moolenaar    diffthis
621aeb661e1SBram Moolenaar  endfor
622aeb661e1SBram Moolenaar  new Xtest9
623aeb661e1SBram Moolenaar  call assert_fails('diffthis', 'E96:')
624aeb661e1SBram Moolenaar  %bwipe!
625aeb661e1SBram Moolenaarendfunc
626aeb661e1SBram Moolenaar
627aeb661e1SBram Moolenaarfunc Test_diff_nomodifiable()
628aeb661e1SBram Moolenaar  new
629aeb661e1SBram Moolenaar  call setline(1, [1, 2, 3, 4])
630aeb661e1SBram Moolenaar  setl nomodifiable
631aeb661e1SBram Moolenaar  diffthis
632aeb661e1SBram Moolenaar  vnew
633aeb661e1SBram Moolenaar  call setline(1, ['1x', 2, 3, 3, 4])
634aeb661e1SBram Moolenaar  diffthis
635aeb661e1SBram Moolenaar  call assert_fails('norm dp', 'E793:')
636aeb661e1SBram Moolenaar  setl nomodifiable
637aeb661e1SBram Moolenaar  call assert_fails('norm do', 'E21:')
638aeb661e1SBram Moolenaar  %bwipe!
639aeb661e1SBram Moolenaarendfunc
640f58a8475SBram Moolenaar
64197fbc404SBram Moolenaarfunc Test_diff_hlID()
64297fbc404SBram Moolenaar  new
64397fbc404SBram Moolenaar  call setline(1, [1, 2, 3])
64497fbc404SBram Moolenaar  diffthis
64597fbc404SBram Moolenaar  vnew
64697fbc404SBram Moolenaar  call setline(1, ['1x', 2, 'x', 3])
64797fbc404SBram Moolenaar  diffthis
64897fbc404SBram Moolenaar  redraw
64997fbc404SBram Moolenaar
65097fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(-1, 1), "name"), "")
65197fbc404SBram Moolenaar
65297fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(1, 1), "name"), "DiffChange")
65397fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(1, 2), "name"), "DiffText")
65497fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(2, 1), "name"), "")
65597fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(3, 1), "name"), "DiffAdd")
65697fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(4, 1), "name"), "")
65797fbc404SBram Moolenaar
65897fbc404SBram Moolenaar  wincmd w
65997fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(1, 1), "name"), "DiffChange")
66097fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(2, 1), "name"), "")
66197fbc404SBram Moolenaar  call assert_equal(synIDattr(diff_hlID(3, 1), "name"), "")
66297fbc404SBram Moolenaar
66397fbc404SBram Moolenaar  %bwipe!
66497fbc404SBram Moolenaarendfunc
66597fbc404SBram Moolenaar
66697fbc404SBram Moolenaarfunc Test_diff_filler()
66797fbc404SBram Moolenaar  new
66897fbc404SBram Moolenaar  call setline(1, [1, 2, 3, 'x', 4])
66997fbc404SBram Moolenaar  diffthis
67097fbc404SBram Moolenaar  vnew
67197fbc404SBram Moolenaar  call setline(1, [1, 2, 'y', 'y', 3, 4])
67297fbc404SBram Moolenaar  diffthis
67397fbc404SBram Moolenaar  redraw
67497fbc404SBram Moolenaar
67597fbc404SBram Moolenaar  call assert_equal([0, 0, 0, 0, 0, 0, 0, 1, 0], map(range(-1, 7), 'diff_filler(v:val)'))
67697fbc404SBram Moolenaar  wincmd w
67797fbc404SBram Moolenaar  call assert_equal([0, 0, 0, 0, 2, 0, 0, 0], map(range(-1, 6), 'diff_filler(v:val)'))
67897fbc404SBram Moolenaar
67997fbc404SBram Moolenaar  %bwipe!
68097fbc404SBram Moolenaarendfunc
68197fbc404SBram Moolenaar
682f58a8475SBram Moolenaarfunc Test_diff_lastline()
683f58a8475SBram Moolenaar  enew!
684f58a8475SBram Moolenaar  only!
685f58a8475SBram Moolenaar  call setline(1, ['This is a ', 'line with five ', 'rows'])
686f58a8475SBram Moolenaar  diffthis
687f58a8475SBram Moolenaar  botright vert new
688f58a8475SBram Moolenaar  call setline(1, ['This is', 'a line with ', 'four rows'])
689f58a8475SBram Moolenaar  diffthis
690f58a8475SBram Moolenaar  1
691f58a8475SBram Moolenaar  call feedkeys("Je a\<CR>", 'tx')
692f58a8475SBram Moolenaar  call feedkeys("Je a\<CR>", 'tx')
693f58a8475SBram Moolenaar  let w1lines = winline()
694f58a8475SBram Moolenaar  wincmd w
695f58a8475SBram Moolenaar  $
696f58a8475SBram Moolenaar  let w2lines = winline()
697f58a8475SBram Moolenaar  call assert_equal(w2lines, w1lines)
698f58a8475SBram Moolenaar  bwipe!
699f58a8475SBram Moolenaar  bwipe!
700f58a8475SBram Moolenaarendfunc
701e828b762SBram Moolenaar
702785fc656SBram Moolenaarfunc WriteDiffFiles(buf, list1, list2)
703e828b762SBram Moolenaar  call writefile(a:list1, 'Xfile1')
704e828b762SBram Moolenaar  call writefile(a:list2, 'Xfile2')
705785fc656SBram Moolenaar  if a:buf
706785fc656SBram Moolenaar    call term_sendkeys(a:buf, ":checktime\<CR>")
707785fc656SBram Moolenaar  endif
708e828b762SBram Moolenaarendfunc
709e828b762SBram Moolenaar
710785fc656SBram Moolenaar" Verify a screendump with both the internal and external diff.
711e828b762SBram Moolenaarfunc VerifyBoth(buf, dumpfile, extra)
712e828b762SBram Moolenaar  " trailing : for leaving the cursor on the command line
713785fc656SBram Moolenaar  for cmd in [":set diffopt=filler" . a:extra . "\<CR>:", ":set diffopt+=internal\<CR>:"]
714e828b762SBram Moolenaar    call term_sendkeys(a:buf, cmd)
715e828b762SBram Moolenaar    if VerifyScreenDump(a:buf, a:dumpfile, {}, cmd =~ 'internal' ? 'internal' : 'external')
716e828b762SBram Moolenaar      break " don't let the next iteration overwrite the "failed" file.
717e828b762SBram Moolenaar    endif
718e828b762SBram Moolenaar  endfor
719e828b762SBram Moolenaarendfunc
720e828b762SBram Moolenaar
721785fc656SBram Moolenaar" Verify a screendump with the internal diff only.
722785fc656SBram Moolenaarfunc VerifyInternal(buf, dumpfile, extra)
723785fc656SBram Moolenaar  call term_sendkeys(a:buf, ":diffupdate!\<CR>")
724785fc656SBram Moolenaar  " trailing : for leaving the cursor on the command line
725785fc656SBram Moolenaar  call term_sendkeys(a:buf, ":set diffopt=internal,filler" . a:extra . "\<CR>:")
726785fc656SBram Moolenaar  call VerifyScreenDump(a:buf, a:dumpfile, {})
727785fc656SBram Moolenaarendfunc
728785fc656SBram Moolenaar
729e828b762SBram Moolenaarfunc Test_diff_screen()
730e828b762SBram Moolenaar  if !CanRunVimInTerminal() || !has('menu')
731e828b762SBram Moolenaar    return
732e828b762SBram Moolenaar  endif
733e828b762SBram Moolenaar  " clean up already existing swap files, just in case
734e828b762SBram Moolenaar  call delete('.Xfile1.swp')
735e828b762SBram Moolenaar  call delete('.Xfile2.swp')
736e828b762SBram Moolenaar
737e828b762SBram Moolenaar  " Test 1: Add a line in beginning of file 2
738785fc656SBram 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])
739e828b762SBram Moolenaar  let buf = RunVimInTerminal('-d Xfile1 Xfile2', {})
740e828b762SBram Moolenaar  " Set autoread mode, ,so that Vim won't complain once we re-write the test
741e828b762SBram Moolenaar  " files
742785fc656SBram Moolenaar  call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
743e828b762SBram Moolenaar
744e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_01', '')
745e828b762SBram Moolenaar
746e828b762SBram Moolenaar  " Test 2: Add a line in beginning of file 1
747785fc656SBram 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])
748e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_02', '')
749e828b762SBram Moolenaar
750e828b762SBram Moolenaar  " Test 3: Add a line at the end of file 2
751785fc656SBram 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])
752e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_03', '')
753e828b762SBram Moolenaar
754e828b762SBram Moolenaar  " Test 4: Add a line at the end of file 1
755785fc656SBram 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])
756e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_04', '')
757e828b762SBram Moolenaar
758e828b762SBram Moolenaar  " Test 5: Add a line in the middle of file 2, remove on at the end of file 1
759785fc656SBram 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])
760e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_05', '')
761e828b762SBram Moolenaar
762e828b762SBram Moolenaar  " Test 6: Add a line in the middle of file 1, remove on at the end of file 2
763785fc656SBram 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])
764e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_06', '')
765e828b762SBram Moolenaar
766e828b762SBram Moolenaar  " Test 7 - 9: Test normal/patience/histogram diff algorithm
767785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['#include <stdio.h>', '', '// Frobs foo heartily', 'int frobnitz(int foo)', '{',
768e828b762SBram Moolenaar      \ '    int i;', '    for(i = 0; i < 10; i++)', '    {', '        printf("Your answer is: ");',
769e828b762SBram Moolenaar      \ '        printf("%d\n", foo);', '    }', '}', '', 'int fact(int n)', '{', '    if(n > 1)', '    {',
770e828b762SBram Moolenaar      \ '        return fact(n-1) * n;', '    }', '    return 1;', '}', '', 'int main(int argc, char **argv)',
771e828b762SBram Moolenaar      \ '{', '    frobnitz(fact(10));', '}'],
772e828b762SBram Moolenaar      \ ['#include <stdio.h>', '', 'int fib(int n)', '{', '    if(n > 2)', '    {',
773e828b762SBram Moolenaar      \ '        return fib(n-1) + fib(n-2);', '    }', '    return 1;', '}', '', '// Frobs foo heartily',
774e828b762SBram Moolenaar      \ 'int frobnitz(int foo)', '{', '    int i;', '    for(i = 0; i < 10; i++)', '    {',
775e828b762SBram Moolenaar      \ '        printf("%d\n", foo);', '    }', '}', '',
776e828b762SBram Moolenaar      \ 'int main(int argc, char **argv)', '{', '    frobnitz(fib(10));', '}'])
777e828b762SBram Moolenaar  call term_sendkeys(buf, ":diffupdate!\<cr>")
778e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=internal\<cr>")
779e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_07', {})
780e828b762SBram Moolenaar
781e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=algorithm:patience\<cr>")
782e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_08', {})
783e828b762SBram Moolenaar
784e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=algorithm:histogram\<cr>")
785e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_09', {})
786e828b762SBram Moolenaar
787e828b762SBram Moolenaar  " Test 10-11: normal/indent-heuristic
788e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt&vim\<cr>")
789785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['', '  def finalize(values)', '', '    values.each do |v|', '      v.finalize', '    end'],
790e828b762SBram Moolenaar      \ ['', '  def finalize(values)', '', '    values.each do |v|', '      v.prepare', '    end', '',
791e828b762SBram Moolenaar      \ '    values.each do |v|', '      v.finalize', '    end'])
792e828b762SBram Moolenaar  call term_sendkeys(buf, ":diffupdate!\<cr>")
793e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=internal\<cr>")
794e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_10', {})
795e828b762SBram Moolenaar
796e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=indent-heuristic\<cr>")
797e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_11', {})
798e828b762SBram Moolenaar
799e828b762SBram Moolenaar  " Test 12: diff the same file
800785fc656SBram Moolenaar  call WriteDiffFiles(buf, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
801e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_12', '')
802e828b762SBram Moolenaar
803e828b762SBram Moolenaar  " Test 13: diff an empty file
804785fc656SBram Moolenaar  call WriteDiffFiles(buf, [], [])
805e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_13', '')
806e828b762SBram Moolenaar
807e828b762SBram Moolenaar  " Test 14: test diffopt+=icase
808785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['a', 'b', 'cd'], ['A', 'b', 'cDe'])
809e828b762SBram Moolenaar  call VerifyBoth(buf, 'Test_diff_14', " diffopt+=filler diffopt+=icase")
810e828b762SBram Moolenaar
811e828b762SBram Moolenaar  " Test 15-16: test diffopt+=iwhite
812785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['int main()', '{', '   printf("Hello, World!");', '   return 0;', '}'],
813e828b762SBram Moolenaar      \ ['int main()', '{', '   if (0)', '   {', '      printf("Hello, World!");', '      return 0;', '   }', '}'])
814e828b762SBram Moolenaar  call term_sendkeys(buf, ":diffupdate!\<cr>")
815e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt&vim diffopt+=filler diffopt+=iwhite\<cr>")
816e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_15', {})
817e828b762SBram Moolenaar  call term_sendkeys(buf, ":set diffopt+=internal\<cr>")
818e828b762SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_16', {})
819e828b762SBram Moolenaar
820785fc656SBram Moolenaar  " Test 17: test diffopt+=iblank
821785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['a', ' ', 'cd', 'ef', 'xxx'], ['a', 'cd', '', 'ef', 'yyy'])
822785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_17', " diffopt+=iblank")
823785fc656SBram Moolenaar
824785fc656SBram Moolenaar  " Test 18: test diffopt+=iblank,iwhite / iwhiteall / iwhiteeol
825785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_18', " diffopt+=iblank,iwhite")
826785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_18', " diffopt+=iblank,iwhiteall")
827785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_18', " diffopt+=iblank,iwhiteeol")
828785fc656SBram Moolenaar
829785fc656SBram Moolenaar  " Test 19: test diffopt+=iwhiteeol
830785fc656SBram Moolenaar  call WriteDiffFiles(buf, ['a ', 'x', 'cd', 'ef', 'xx  xx', 'foo', 'bar'], ['a', 'x', 'c d', ' ef', 'xx xx', 'foo', '', 'bar'])
831785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_19', " diffopt+=iwhiteeol")
832785fc656SBram Moolenaar
833785fc656SBram Moolenaar  " Test 19: test diffopt+=iwhiteall
834785fc656SBram Moolenaar  call VerifyInternal(buf, 'Test_diff_20', " diffopt+=iwhiteall")
835785fc656SBram Moolenaar
836e828b762SBram Moolenaar  " clean up
837e828b762SBram Moolenaar  call StopVimInTerminal(buf)
838e828b762SBram Moolenaar  call delete('Xfile1')
839e828b762SBram Moolenaar  call delete('Xfile2')
840e828b762SBram Moolenaarendfunc
841e828b762SBram Moolenaar
8424a5abbd6SBram Moolenaarfunc Test_diff_with_cursorline()
8434a5abbd6SBram Moolenaar  if !CanRunVimInTerminal()
8444a5abbd6SBram Moolenaar    return
8454a5abbd6SBram Moolenaar  endif
8464a5abbd6SBram Moolenaar
8474a5abbd6SBram Moolenaar  call writefile([
8484a5abbd6SBram Moolenaar	\ 'hi CursorLine ctermbg=red ctermfg=white',
8494a5abbd6SBram Moolenaar	\ 'set cursorline',
8504a5abbd6SBram Moolenaar	\ 'call setline(1, ["foo","foo","foo","bar"])',
8514a5abbd6SBram Moolenaar	\ 'vnew',
8524a5abbd6SBram Moolenaar	\ 'call setline(1, ["bee","foo","foo","baz"])',
8534a5abbd6SBram Moolenaar	\ 'windo diffthis',
8544a5abbd6SBram Moolenaar	\ '2wincmd w',
8554a5abbd6SBram Moolenaar	\ ], 'Xtest_diff_cursorline')
8564a5abbd6SBram Moolenaar  let buf = RunVimInTerminal('-S Xtest_diff_cursorline', {})
8574a5abbd6SBram Moolenaar
8584a5abbd6SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_with_cursorline_01', {})
8594a5abbd6SBram Moolenaar  call term_sendkeys(buf, "j")
8604a5abbd6SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_with_cursorline_02', {})
8614a5abbd6SBram Moolenaar  call term_sendkeys(buf, "j")
8624a5abbd6SBram Moolenaar  call VerifyScreenDump(buf, 'Test_diff_with_cursorline_03', {})
8634a5abbd6SBram Moolenaar
8644a5abbd6SBram Moolenaar  " clean up
8654a5abbd6SBram Moolenaar  call StopVimInTerminal(buf)
8664a5abbd6SBram Moolenaar  call delete('Xtest_diff_cursorline')
8674a5abbd6SBram Moolenaarendfunc
868