diff options
Diffstat (limited to 'test/functional/ui/linematch_spec.lua')
| -rw-r--r-- | test/functional/ui/linematch_spec.lua | 1139 |
1 files changed, 558 insertions, 581 deletions
diff --git a/test/functional/ui/linematch_spec.lua b/test/functional/ui/linematch_spec.lua index 40df5cadf1..03eed5a49c 100644 --- a/test/functional/ui/linematch_spec.lua +++ b/test/functional/ui/linematch_spec.lua @@ -1,9 +1,10 @@ -local helpers = require('test.functional.helpers')(after_each) +local t = require('test.testutil') +local n = require('test.functional.testnvim')() local Screen = require('test.functional.ui.screen') -local feed = helpers.feed -local clear = helpers.clear -local write_file = helpers.write_file +local feed = n.feed +local clear = n.clear +local write_file = t.write_file describe('Diff mode screen with 3 diffs open', function() local fname = 'Xtest-functional-diff-screen-1' @@ -38,18 +39,6 @@ describe('Diff mode screen with 3 diffs open', function() screen = Screen.new(100, 16) screen:attach() - screen:set_default_attr_ids({ - [1] = { foreground = Screen.colors.DarkBlue, background = Screen.colors.Gray }, - [2] = { foreground = Screen.colors.Blue1, bold = true, background = Screen.colors.LightCyan1 }, - [3] = { reverse = true }, - [4] = { background = Screen.colors.LightBlue }, - [5] = { foreground = Screen.colors.DarkBlue, background = Screen.colors.LightGray }, - [6] = { foreground = Screen.colors.Blue1, bold = true }, - [7] = { reverse = true, bold = true }, - [8] = { background = Screen.colors.Red1, bold = true }, - [10] = { foreground = Screen.colors.Brown }, - [9] = { background = Screen.colors.Plum1 }, - }) feed('<c-w>=') feed(':windo set nu!<cr>') end) @@ -96,20 +85,20 @@ describe('Diff mode screen with 3 diffs open', function() feed('1<c-w>w') feed(':2,6diffget screen-1.2<cr>') screen:expect([[ - {1: }{10: 1 }^ │{1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }{9:<<<<<<< HEAD }│{1: }{10: 3 }{9:<<<<<<< HEAD }│{1: }{10: }{2:---------------------------}| - {1: }{10: 4 } AAA │{1: }{10: 4 } AAA │{1: }{10: 3 } AAA | - {1: }{10: 5 } AAA │{1: }{10: 5 } AAA │{1: }{10: 4 } AAA | - {1: }{10: 6 } AAA │{1: }{10: 6 } AAA │{1: }{10: 5 } AAA | - {1: }{10: 7 }{9:======= }│{1: }{10: 7 }{9:======= }│{1: }{10: }{2:---------------------------}| - {1: }{10: 8 }{9: BBB }│{1: }{10: 8 }{9: BBB }│{1: }{10: }{2:---------------------------}| - {1: }{10: 9 }{9: BBB }│{1: }{10: 9 }{9: BBB }│{1: }{10: }{2:---------------------------}| - {1: }{10: 10 }{9: BBB }│{1: }{10: 10 }{9: BBB }│{1: }{10: }{2:---------------------------}| - {1: }{10: 11 }{9:>>>>>>> branch1 }│{1: }{10: 11 }{9:>>>>>>> branch1 }│{1: }{10: }{2:---------------------------}| - {1: }{10: 12 } │{1: }{10: 12 } │{1: }{10: 6 } | - {6:~ }│{6:~ }│{6:~ }|*2 - {7:<-functional-diff-screen-1.3 [+] }{3:<est-functional-diff-screen-1.2 Xtest-functional-diff-screen-1 }| + {7: }{8: 1 }^ │{7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }{4:<<<<<<< HEAD }│{7: }{8: 3 }{4:<<<<<<< HEAD }│{7: }{8: }{23:---------------------------}| + {7: }{8: 4 } AAA │{7: }{8: 4 } AAA │{7: }{8: 3 } AAA | + {7: }{8: 5 } AAA │{7: }{8: 5 } AAA │{7: }{8: 4 } AAA | + {7: }{8: 6 } AAA │{7: }{8: 6 } AAA │{7: }{8: 5 } AAA | + {7: }{8: 7 }{4:======= }│{7: }{8: 7 }{4:======= }│{7: }{8: }{23:---------------------------}| + {7: }{8: 8 }{4: BBB }│{7: }{8: 8 }{4: BBB }│{7: }{8: }{23:---------------------------}| + {7: }{8: 9 }{4: BBB }│{7: }{8: 9 }{4: BBB }│{7: }{8: }{23:---------------------------}| + {7: }{8: 10 }{4: BBB }│{7: }{8: 10 }{4: BBB }│{7: }{8: }{23:---------------------------}| + {7: }{8: 11 }{4:>>>>>>> branch1 }│{7: }{8: 11 }{4:>>>>>>> branch1 }│{7: }{8: }{23:---------------------------}| + {7: }{8: 12 } │{7: }{8: 12 } │{7: }{8: 6 } | + {1:~ }│{1:~ }│{1:~ }|*2 + {3:<-functional-diff-screen-1.3 [+] }{2:<est-functional-diff-screen-1.2 Xtest-functional-diff-screen-1 }| :2,6diffget screen-1.2 | ]]) end) @@ -118,17 +107,17 @@ describe('Diff mode screen with 3 diffs open', function() feed('2<c-w>w') feed(':5,7diffget screen-1.3<cr>') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 }^ │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: }{2:---------------------------}│{1: }{10: 3 }{4:<<<<<<< HEAD }│{1: }{10: }{2:---------------------------}| - {1: }{10: }{2:---------------------------}│{1: }{10: 4 }{9: AAA }│{1: }{10: 3 }{9: AAA }| - {1: }{10: 3 }{9: BBB }│{1: }{10: 5 }{9: BBB }│{1: }{10: }{2:---------------------------}| - {1: }{10: 4 }{9: }{8:BBB}{9: }│{1: }{10: 6 }{9: }{8:BBB}{9: }│{1: }{10: 4 }{9: }{8:AAA}{9: }| - {1: }{10: 5 }{9: }{8:BBB}{9: }│{1: }{10: 7 }{9: }{8:BBB}{9: }│{1: }{10: 5 }{9: }{8:AAA}{9: }| - {1: }{10: }{2:---------------------------}│{1: }{10: 8 }{4:>>>>>>> branch1 }│{1: }{10: }{2:---------------------------}| - {1: }{10: 6 } │{1: }{10: 9 } │{1: }{10: 6 } | - {6:~ }│{6:~ }│{6:~ }|*5 - {3:<test-functional-diff-screen-1.3 }{7:<functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 } │{7: }{8: 1 }^ │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: }{23:---------------------------}│{7: }{8: 3 }{22:<<<<<<< HEAD }│{7: }{8: }{23:---------------------------}| + {7: }{8: }{23:---------------------------}│{7: }{8: 4 }{4: AAA }│{7: }{8: 3 }{4: AAA }| + {7: }{8: 3 }{4: BBB }│{7: }{8: 5 }{4: BBB }│{7: }{8: }{23:---------------------------}| + {7: }{8: 4 }{4: }{27:BBB}{4: }│{7: }{8: 6 }{4: }{27:BBB}{4: }│{7: }{8: 4 }{4: }{27:AAA}{4: }| + {7: }{8: 5 }{4: }{27:BBB}{4: }│{7: }{8: 7 }{4: }{27:BBB}{4: }│{7: }{8: 5 }{4: }{27:AAA}{4: }| + {7: }{8: }{23:---------------------------}│{7: }{8: 8 }{22:>>>>>>> branch1 }│{7: }{8: }{23:---------------------------}| + {7: }{8: 6 } │{7: }{8: 9 } │{7: }{8: 6 } | + {1:~ }│{1:~ }│{1:~ }|*5 + {2:<test-functional-diff-screen-1.3 }{3:<functional-diff-screen-1.2 [+] }{2:Xtest-functional-diff-screen-1 }| :5,7diffget screen-1.3 | ]]) end) @@ -137,20 +126,20 @@ describe('Diff mode screen with 3 diffs open', function() feed('3<c-w>w') feed(':5,6diffget screen-1.2<cr>') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } │{1: }{10: 1 }^ | - {1: }{10: 2 }common line │{1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: }{2:---------------------------}│{1: }{10: 3 }{4:<<<<<<< HEAD }│{1: }{10: }{2:---------------------------}| - {1: }{10: }{2:---------------------------}│{1: }{10: 4 }{9: AAA }│{1: }{10: 3 }{9: AAA }| - {1: }{10: }{2:---------------------------}│{1: }{10: 5 }{9: AAA }│{1: }{10: 4 }{9: AAA }| - {1: }{10: }{2:---------------------------}│{1: }{10: 6 }{9: AAA }│{1: }{10: 5 }{9: AAA }| - {1: }{10: }{2:---------------------------}│{1: }{10: 7 }{9:======= }│{1: }{10: 6 }{9:======= }| - {1: }{10: 3 } BBB │{1: }{10: 8 } BBB │{1: }{10: 7 } BBB | - {1: }{10: 4 } BBB │{1: }{10: 9 } BBB │{1: }{10: 8 } BBB | - {1: }{10: 5 } BBB │{1: }{10: 10 } BBB │{1: }{10: 9 } BBB | - {1: }{10: }{2:---------------------------}│{1: }{10: 11 }{9:>>>>>>> branch1 }│{1: }{10: 10 }{9:>>>>>>> branch1 }| - {1: }{10: 6 } │{1: }{10: 12 } │{1: }{10: 11 } | - {6:~ }│{6:~ }│{6:~ }|*2 - {3:<test-functional-diff-screen-1.3 <est-functional-diff-screen-1.2 }{7:<st-functional-diff-screen-1 [+] }| + {7: }{8: 1 } │{7: }{8: 1 } │{7: }{8: 1 }^ | + {7: }{8: 2 }common line │{7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: }{23:---------------------------}│{7: }{8: 3 }{22:<<<<<<< HEAD }│{7: }{8: }{23:---------------------------}| + {7: }{8: }{23:---------------------------}│{7: }{8: 4 }{4: AAA }│{7: }{8: 3 }{4: AAA }| + {7: }{8: }{23:---------------------------}│{7: }{8: 5 }{4: AAA }│{7: }{8: 4 }{4: AAA }| + {7: }{8: }{23:---------------------------}│{7: }{8: 6 }{4: AAA }│{7: }{8: 5 }{4: AAA }| + {7: }{8: }{23:---------------------------}│{7: }{8: 7 }{4:======= }│{7: }{8: 6 }{4:======= }| + {7: }{8: 3 } BBB │{7: }{8: 8 } BBB │{7: }{8: 7 } BBB | + {7: }{8: 4 } BBB │{7: }{8: 9 } BBB │{7: }{8: 8 } BBB | + {7: }{8: 5 } BBB │{7: }{8: 10 } BBB │{7: }{8: 9 } BBB | + {7: }{8: }{23:---------------------------}│{7: }{8: 11 }{4:>>>>>>> branch1 }│{7: }{8: 10 }{4:>>>>>>> branch1 }| + {7: }{8: 6 } │{7: }{8: 12 } │{7: }{8: 11 } | + {1:~ }│{1:~ }│{1:~ }|*2 + {2:<test-functional-diff-screen-1.3 <est-functional-diff-screen-1.2 }{3:<st-functional-diff-screen-1 [+] }| :5,6diffget screen-1.2 | ]]) end) @@ -159,20 +148,20 @@ describe('Diff mode screen with 3 diffs open', function() feed('2<c-w>w') feed(':6,8diffput screen-1<cr>') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 }^ │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: }{2:---------------------------}│{1: }{10: 3 }{4:<<<<<<< HEAD }│{1: }{10: }{2:---------------------------}| - {1: }{10: }{2:---------------------------}│{1: }{10: 4 }{9: AAA }│{1: }{10: 3 }{9: AAA }| - {1: }{10: }{2:---------------------------}│{1: }{10: 5 }{9: AAA }│{1: }{10: 4 }{9: AAA }| - {1: }{10: }{2:---------------------------}│{1: }{10: 6 }{9: AAA }│{1: }{10: 5 }{9: AAA }| - {1: }{10: }{2:---------------------------}│{1: }{10: 7 }{9:======= }│{1: }{10: 6 }{9:======= }| - {1: }{10: 3 }{9: BBB }│{1: }{10: 8 }{9: BBB }│{1: }{10: }{2:---------------------------}| - {1: }{10: 4 }{9: BBB }│{1: }{10: 9 }{9: BBB }│{1: }{10: }{2:---------------------------}| - {1: }{10: 5 } BBB │{1: }{10: 10 } BBB │{1: }{10: 7 } BBB | - {1: }{10: }{2:---------------------------}│{1: }{10: 11 }{4:>>>>>>> branch1 }│{1: }{10: }{2:---------------------------}| - {1: }{10: 6 } │{1: }{10: 12 } │{1: }{10: 8 } | - {6:~ }│{6:~ }│{6:~ }|*2 - {3:<test-functional-diff-screen-1.3 }{7:<est-functional-diff-screen-1.2 }{3:<st-functional-diff-screen-1 [+] }| + {7: }{8: 1 } │{7: }{8: 1 }^ │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: }{23:---------------------------}│{7: }{8: 3 }{22:<<<<<<< HEAD }│{7: }{8: }{23:---------------------------}| + {7: }{8: }{23:---------------------------}│{7: }{8: 4 }{4: AAA }│{7: }{8: 3 }{4: AAA }| + {7: }{8: }{23:---------------------------}│{7: }{8: 5 }{4: AAA }│{7: }{8: 4 }{4: AAA }| + {7: }{8: }{23:---------------------------}│{7: }{8: 6 }{4: AAA }│{7: }{8: 5 }{4: AAA }| + {7: }{8: }{23:---------------------------}│{7: }{8: 7 }{4:======= }│{7: }{8: 6 }{4:======= }| + {7: }{8: 3 }{4: BBB }│{7: }{8: 8 }{4: BBB }│{7: }{8: }{23:---------------------------}| + {7: }{8: 4 }{4: BBB }│{7: }{8: 9 }{4: BBB }│{7: }{8: }{23:---------------------------}| + {7: }{8: 5 } BBB │{7: }{8: 10 } BBB │{7: }{8: 7 } BBB | + {7: }{8: }{23:---------------------------}│{7: }{8: 11 }{22:>>>>>>> branch1 }│{7: }{8: }{23:---------------------------}| + {7: }{8: 6 } │{7: }{8: 12 } │{7: }{8: 8 } | + {1:~ }│{1:~ }│{1:~ }|*2 + {2:<test-functional-diff-screen-1.3 }{3:<est-functional-diff-screen-1.2 }{2:<st-functional-diff-screen-1 [+] }| :6,8diffput screen-1 | ]]) end) @@ -180,20 +169,20 @@ describe('Diff mode screen with 3 diffs open', function() feed('2<c-w>w') feed(':6,11diffput screen-1<cr>') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 }^ │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: }{2:---------------------------}│{1: }{10: 3 }{4:<<<<<<< HEAD }│{1: }{10: }{2:---------------------------}| - {1: }{10: }{2:---------------------------}│{1: }{10: 4 }{9: AAA }│{1: }{10: 3 }{9: AAA }| - {1: }{10: }{2:---------------------------}│{1: }{10: 5 }{9: AAA }│{1: }{10: 4 }{9: AAA }| - {1: }{10: }{2:---------------------------}│{1: }{10: 6 }{9: AAA }│{1: }{10: 5 }{9: AAA }| - {1: }{10: }{2:---------------------------}│{1: }{10: 7 }{9:======= }│{1: }{10: 6 }{9:======= }| - {1: }{10: 3 } BBB │{1: }{10: 8 } BBB │{1: }{10: 7 } BBB | - {1: }{10: 4 } BBB │{1: }{10: 9 } BBB │{1: }{10: 8 } BBB | - {1: }{10: 5 } BBB │{1: }{10: 10 } BBB │{1: }{10: 9 } BBB | - {1: }{10: }{2:---------------------------}│{1: }{10: 11 }{9:>>>>>>> branch1 }│{1: }{10: 10 }{9:>>>>>>> branch1 }| - {1: }{10: 6 } │{1: }{10: 12 } │{1: }{10: 11 } | - {6:~ }│{6:~ }│{6:~ }|*2 - {3:<test-functional-diff-screen-1.3 }{7:<est-functional-diff-screen-1.2 }{3:<st-functional-diff-screen-1 [+] }| + {7: }{8: 1 } │{7: }{8: 1 }^ │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: }{23:---------------------------}│{7: }{8: 3 }{22:<<<<<<< HEAD }│{7: }{8: }{23:---------------------------}| + {7: }{8: }{23:---------------------------}│{7: }{8: 4 }{4: AAA }│{7: }{8: 3 }{4: AAA }| + {7: }{8: }{23:---------------------------}│{7: }{8: 5 }{4: AAA }│{7: }{8: 4 }{4: AAA }| + {7: }{8: }{23:---------------------------}│{7: }{8: 6 }{4: AAA }│{7: }{8: 5 }{4: AAA }| + {7: }{8: }{23:---------------------------}│{7: }{8: 7 }{4:======= }│{7: }{8: 6 }{4:======= }| + {7: }{8: 3 } BBB │{7: }{8: 8 } BBB │{7: }{8: 7 } BBB | + {7: }{8: 4 } BBB │{7: }{8: 9 } BBB │{7: }{8: 8 } BBB | + {7: }{8: 5 } BBB │{7: }{8: 10 } BBB │{7: }{8: 9 } BBB | + {7: }{8: }{23:---------------------------}│{7: }{8: 11 }{4:>>>>>>> branch1 }│{7: }{8: 10 }{4:>>>>>>> branch1 }| + {7: }{8: 6 } │{7: }{8: 12 } │{7: }{8: 11 } | + {1:~ }│{1:~ }│{1:~ }|*2 + {2:<test-functional-diff-screen-1.3 }{3:<est-functional-diff-screen-1.2 }{2:<st-functional-diff-screen-1 [+] }| :6,11diffput screen-1 | ]]) end) @@ -229,18 +218,6 @@ describe('Diff mode screen with 2 diffs open', function() screen = Screen.new(100, 20) screen:attach() - screen:set_default_attr_ids({ - [1] = { foreground = Screen.colors.DarkBlue, background = Screen.colors.Gray }, - [2] = { foreground = Screen.colors.Blue1, bold = true, background = Screen.colors.LightCyan1 }, - [3] = { reverse = true }, - [4] = { background = Screen.colors.LightBlue }, - [5] = { foreground = Screen.colors.DarkBlue, background = Screen.colors.LightGray }, - [6] = { foreground = Screen.colors.Blue1, bold = true }, - [7] = { reverse = true, bold = true }, - [8] = { background = Screen.colors.Red1, bold = true }, - [10] = { foreground = Screen.colors.Brown }, - [9] = { background = Screen.colors.Plum1 }, - }) feed('<c-w>=') feed(':windo set nu!<cr>') end) @@ -290,20 +267,20 @@ something feed('1<c-w>w') feed(':5,9diffget<cr>') screen:expect([[ - {1:+ }{10: 1 }{5:^+-- 7 lines: common line··················}│{1:+ }{10: 1 }{5:+-- 7 lines: common line···················}| - {1: }{10: 8 }xyz │{1: }{10: 8 }xyz | - {1: }{10: 9 }DEFabc │{1: }{10: 9 }DEFabc | - {1: }{10: 10 }DEFabc │{1: }{10: 10 }DEFabc | - {1: }{10: 11 }DEFabc │{1: }{10: 11 }DEFabc | - {1: }{10: 12 }common line │{1: }{10: 12 }common line | - {1: }{10: 13 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 14 }common line │{1: }{10: 15 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 16 }{4:DEF }| - {1: }{10: 15 }something │{1: }{10: 17 }something | - {1: }{10: 16 } │{1: }{10: 18 } | - {6:~ }│{6:~ }|*6 - {7:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| + {7:+ }{8: 1 }{13:^+-- 7 lines: common line··················}│{7:+ }{8: 1 }{13:+-- 7 lines: common line···················}| + {7: }{8: 8 }xyz │{7: }{8: 8 }xyz | + {7: }{8: 9 }DEFabc │{7: }{8: 9 }DEFabc | + {7: }{8: 10 }DEFabc │{7: }{8: 10 }DEFabc | + {7: }{8: 11 }DEFabc │{7: }{8: 11 }DEFabc | + {7: }{8: 12 }common line │{7: }{8: 12 }common line | + {7: }{8: 13 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 14 }common line │{7: }{8: 15 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 16 }{22:DEF }| + {7: }{8: 15 }something │{7: }{8: 17 }something | + {7: }{8: 16 } │{7: }{8: 18 } | + {1:~ }│{1:~ }|*6 + {3:Xtest-functional-diff-screen-1.2 [+] }{2:Xtest-functional-diff-screen-1 }| :5,9diffget | ]]) end) @@ -311,23 +288,23 @@ something feed('2<c-w>w') feed(':5,10diffget<cr>') screen:expect([[ - {1:- }{10: 1 } │{1:- }{10: 1 }^ | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }ABCabc │{1: }{10: 5 }ABCabc | - {1: }{10: 6 }ABCabc │{1: }{10: 6 }ABCabc | - {1: }{10: 7 }ABCabc │{1: }{10: 7 }ABCabc | - {1: }{10: 8 }{8:ABC}{9:abc }│{1: }{10: 8 }{8:DEF}{9:abc }| - {1: }{10: 9 }common line │{1: }{10: 9 }common line | - {1: }{10: 10 }common line │{1: }{10: 10 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 11 }{4:DEF }| - {1: }{10: 11 }common line │{1: }{10: 12 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 13 }{4:DEF }| - {1: }{10: 12 }something │{1: }{10: 14 }something | - {1: }{10: 13 } │{1: }{10: 15 } | - {6:~ }│{6:~ }|*3 - {3:Xtest-functional-diff-screen-1.2 }{7:Xtest-functional-diff-screen-1 [+] }| + {7:- }{8: 1 } │{7:- }{8: 1 }^ | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }ABCabc │{7: }{8: 5 }ABCabc | + {7: }{8: 6 }ABCabc │{7: }{8: 6 }ABCabc | + {7: }{8: 7 }ABCabc │{7: }{8: 7 }ABCabc | + {7: }{8: 8 }{27:ABC}{4:abc }│{7: }{8: 8 }{27:DEF}{4:abc }| + {7: }{8: 9 }common line │{7: }{8: 9 }common line | + {7: }{8: 10 }common line │{7: }{8: 10 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 11 }{22:DEF }| + {7: }{8: 11 }common line │{7: }{8: 12 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 13 }{22:DEF }| + {7: }{8: 12 }something │{7: }{8: 14 }something | + {7: }{8: 13 } │{7: }{8: 15 } | + {1:~ }│{1:~ }|*3 + {2:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 [+] }| :5,10diffget | ]]) end) @@ -335,21 +312,21 @@ something feed('2<c-w>w') feed(':4,17diffget<cr>') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 }^ | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }ABCabc │{1: }{10: 5 }ABCabc | - {1: }{10: 6 }ABCabc │{1: }{10: 6 }ABCabc | - {1: }{10: 7 }ABCabc │{1: }{10: 7 }ABCabc | - {1: }{10: 8 }ABCabc │{1: }{10: 8 }ABCabc | - {1: }{10: 9 }common line │{1: }{10: 9 }common line | - {1: }{10: 10 }common line │{1: }{10: 10 }common line | - {1: }{10: 11 }common line │{1: }{10: 11 }common line | - {1: }{10: 12 }something │{1: }{10: 12 }something | - {1: }{10: 13 } │{1: }{10: 13 } | - {6:~ }│{6:~ }|*5 - {3:Xtest-functional-diff-screen-1.2 }{7:Xtest-functional-diff-screen-1 [+] }| + {7: }{8: 1 } │{7: }{8: 1 }^ | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }ABCabc │{7: }{8: 5 }ABCabc | + {7: }{8: 6 }ABCabc │{7: }{8: 6 }ABCabc | + {7: }{8: 7 }ABCabc │{7: }{8: 7 }ABCabc | + {7: }{8: 8 }ABCabc │{7: }{8: 8 }ABCabc | + {7: }{8: 9 }common line │{7: }{8: 9 }common line | + {7: }{8: 10 }common line │{7: }{8: 10 }common line | + {7: }{8: 11 }common line │{7: }{8: 11 }common line | + {7: }{8: 12 }something │{7: }{8: 12 }something | + {7: }{8: 13 } │{7: }{8: 13 } | + {1:~ }│{1:~ }|*5 + {2:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 [+] }| :4,17diffget | ]]) end) @@ -357,25 +334,25 @@ something feed('1<c-w>w') feed(':4,12diffget<cr>') screen:expect([[ - {1: }{10: 1 }^ │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }DEFabc │{1: }{10: 5 }DEFabc | - {1: }{10: 6 }xyz │{1: }{10: 6 }xyz | - {1: }{10: 7 }xyz │{1: }{10: 7 }xyz | - {1: }{10: 8 }xyz │{1: }{10: 8 }xyz | - {1: }{10: 9 }DEFabc │{1: }{10: 9 }DEFabc | - {1: }{10: 10 }DEFabc │{1: }{10: 10 }DEFabc | - {1: }{10: 11 }DEFabc │{1: }{10: 11 }DEFabc | - {1: }{10: 12 }common line │{1: }{10: 12 }common line | - {1: }{10: 13 }common line │{1: }{10: 13 }common line | - {1: }{10: 14 }DEF │{1: }{10: 14 }DEF | - {1: }{10: 15 }common line │{1: }{10: 15 }common line | - {1: }{10: 16 }DEF │{1: }{10: 16 }DEF | - {1: }{10: 17 }something │{1: }{10: 17 }something | - {1: }{10: 18 } │{1: }{10: 18 } | - {7:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 }^ │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }DEFabc │{7: }{8: 5 }DEFabc | + {7: }{8: 6 }xyz │{7: }{8: 6 }xyz | + {7: }{8: 7 }xyz │{7: }{8: 7 }xyz | + {7: }{8: 8 }xyz │{7: }{8: 8 }xyz | + {7: }{8: 9 }DEFabc │{7: }{8: 9 }DEFabc | + {7: }{8: 10 }DEFabc │{7: }{8: 10 }DEFabc | + {7: }{8: 11 }DEFabc │{7: }{8: 11 }DEFabc | + {7: }{8: 12 }common line │{7: }{8: 12 }common line | + {7: }{8: 13 }common line │{7: }{8: 13 }common line | + {7: }{8: 14 }DEF │{7: }{8: 14 }DEF | + {7: }{8: 15 }common line │{7: }{8: 15 }common line | + {7: }{8: 16 }DEF │{7: }{8: 16 }DEF | + {7: }{8: 17 }something │{7: }{8: 17 }something | + {7: }{8: 18 } │{7: }{8: 18 } | + {3:Xtest-functional-diff-screen-1.2 [+] }{2:Xtest-functional-diff-screen-1 }| :4,12diffget | ]]) end) @@ -384,25 +361,25 @@ something feed('5gg') feed('do') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }^DEFabc │{1: }{10: 5 }DEFabc | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }{8:ABC}{9:abc }│{1: }{10: 9 }{8:DEF}{9:abc }| - {1: }{10: 7 }{8:ABC}{9:abc }│{1: }{10: 10 }{8:DEF}{9:abc }| - {1: }{10: 8 }{8:ABC}{9:abc }│{1: }{10: 11 }{8:DEF}{9:abc }| - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 11 }common line │{1: }{10: 15 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 16 }{4:DEF }| - {1: }{10: 12 }something │{1: }{10: 17 }something | - {1: }{10: 13 } │{1: }{10: 18 } | - {7:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }^DEFabc │{7: }{8: 5 }DEFabc | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }{27:ABC}{4:abc }│{7: }{8: 9 }{27:DEF}{4:abc }| + {7: }{8: 7 }{27:ABC}{4:abc }│{7: }{8: 10 }{27:DEF}{4:abc }| + {7: }{8: 8 }{27:ABC}{4:abc }│{7: }{8: 11 }{27:DEF}{4:abc }| + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 11 }common line │{7: }{8: 15 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 16 }{22:DEF }| + {7: }{8: 12 }something │{7: }{8: 17 }something | + {7: }{8: 13 } │{7: }{8: 18 } | + {3:Xtest-functional-diff-screen-1.2 [+] }{2:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -411,25 +388,25 @@ something feed('6gg') feed('do') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }^DEFabc │{1: }{10: 9 }DEFabc | - {1: }{10: 7 }DEFabc │{1: }{10: 10 }DEFabc | - {1: }{10: 8 }DEFabc │{1: }{10: 11 }DEFabc | - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 11 }common line │{1: }{10: 15 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 16 }{4:DEF }| - {1: }{10: 12 }something │{1: }{10: 17 }something | - {1: }{10: 13 } │{1: }{10: 18 } | - {7:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }^DEFabc │{7: }{8: 9 }DEFabc | + {7: }{8: 7 }DEFabc │{7: }{8: 10 }DEFabc | + {7: }{8: 8 }DEFabc │{7: }{8: 11 }DEFabc | + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 11 }common line │{7: }{8: 15 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 16 }{22:DEF }| + {7: }{8: 12 }something │{7: }{8: 17 }something | + {7: }{8: 13 } │{7: }{8: 18 } | + {3:Xtest-functional-diff-screen-1.2 [+] }{2:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -438,25 +415,25 @@ something feed('7gg') feed('do') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }DEFabc │{1: }{10: 9 }DEFabc | - {1: }{10: 7 }^DEFabc │{1: }{10: 10 }DEFabc | - {1: }{10: 8 }DEFabc │{1: }{10: 11 }DEFabc | - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 11 }common line │{1: }{10: 15 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 16 }{4:DEF }| - {1: }{10: 12 }something │{1: }{10: 17 }something | - {1: }{10: 13 } │{1: }{10: 18 } | - {7:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }DEFabc │{7: }{8: 9 }DEFabc | + {7: }{8: 7 }^DEFabc │{7: }{8: 10 }DEFabc | + {7: }{8: 8 }DEFabc │{7: }{8: 11 }DEFabc | + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 11 }common line │{7: }{8: 15 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 16 }{22:DEF }| + {7: }{8: 12 }something │{7: }{8: 17 }something | + {7: }{8: 13 } │{7: }{8: 18 } | + {3:Xtest-functional-diff-screen-1.2 [+] }{2:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -465,25 +442,25 @@ something feed('11gg') feed('do') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }{8:ABC}{9:abc }│{1: }{10: 9 }{8:DEF}{9:abc }| - {1: }{10: 7 }{8:ABC}{9:abc }│{1: }{10: 10 }{8:DEF}{9:abc }| - {1: }{10: 8 }{8:ABC}{9:abc }│{1: }{10: 11 }{8:DEF}{9:abc }| - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: 11 }DEF │{1: }{10: 14 }DEF | - {1: }{10: 12 }^common line │{1: }{10: 15 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 16 }{4:DEF }| - {1: }{10: 13 }something │{1: }{10: 17 }something | - {1: }{10: 14 } │{1: }{10: 18 } | - {7:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }{27:ABC}{4:abc }│{7: }{8: 9 }{27:DEF}{4:abc }| + {7: }{8: 7 }{27:ABC}{4:abc }│{7: }{8: 10 }{27:DEF}{4:abc }| + {7: }{8: 8 }{27:ABC}{4:abc }│{7: }{8: 11 }{27:DEF}{4:abc }| + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: 11 }DEF │{7: }{8: 14 }DEF | + {7: }{8: 12 }^common line │{7: }{8: 15 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 16 }{22:DEF }| + {7: }{8: 13 }something │{7: }{8: 17 }something | + {7: }{8: 14 } │{7: }{8: 18 } | + {3:Xtest-functional-diff-screen-1.2 [+] }{2:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -492,25 +469,25 @@ something feed('12gg') feed('do') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }{8:ABC}{9:abc }│{1: }{10: 9 }{8:DEF}{9:abc }| - {1: }{10: 7 }{8:ABC}{9:abc }│{1: }{10: 10 }{8:DEF}{9:abc }| - {1: }{10: 8 }{8:ABC}{9:abc }│{1: }{10: 11 }{8:DEF}{9:abc }| - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 11 }common line │{1: }{10: 15 }common line | - {1: }{10: 12 }DEF │{1: }{10: 16 }DEF | - {1: }{10: 13 }^something │{1: }{10: 17 }something | - {1: }{10: 14 } │{1: }{10: 18 } | - {7:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }{27:ABC}{4:abc }│{7: }{8: 9 }{27:DEF}{4:abc }| + {7: }{8: 7 }{27:ABC}{4:abc }│{7: }{8: 10 }{27:DEF}{4:abc }| + {7: }{8: 8 }{27:ABC}{4:abc }│{7: }{8: 11 }{27:DEF}{4:abc }| + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 11 }common line │{7: }{8: 15 }common line | + {7: }{8: 12 }DEF │{7: }{8: 16 }DEF | + {7: }{8: 13 }^something │{7: }{8: 17 }something | + {7: }{8: 14 } │{7: }{8: 18 } | + {3:Xtest-functional-diff-screen-1.2 [+] }{2:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -519,25 +496,25 @@ something feed('5gg') feed('dp') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }^ABCabc │{1: }{10: 5 }ABCabc | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }{8:ABC}{9:abc }│{1: }{10: 9 }{8:DEF}{9:abc }| - {1: }{10: 7 }{8:ABC}{9:abc }│{1: }{10: 10 }{8:DEF}{9:abc }| - {1: }{10: 8 }{8:ABC}{9:abc }│{1: }{10: 11 }{8:DEF}{9:abc }| - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 11 }common line │{1: }{10: 15 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 16 }{4:DEF }| - {1: }{10: 12 }something │{1: }{10: 17 }something | - {1: }{10: 13 } │{1: }{10: 18 } | - {7:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 [+] }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }^ABCabc │{7: }{8: 5 }ABCabc | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }{27:ABC}{4:abc }│{7: }{8: 9 }{27:DEF}{4:abc }| + {7: }{8: 7 }{27:ABC}{4:abc }│{7: }{8: 10 }{27:DEF}{4:abc }| + {7: }{8: 8 }{27:ABC}{4:abc }│{7: }{8: 11 }{27:DEF}{4:abc }| + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 11 }common line │{7: }{8: 15 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 16 }{22:DEF }| + {7: }{8: 12 }something │{7: }{8: 17 }something | + {7: }{8: 13 } │{7: }{8: 18 } | + {3:Xtest-functional-diff-screen-1.2 }{2:Xtest-functional-diff-screen-1 [+] }| :e | ]]) end) @@ -546,25 +523,25 @@ something feed('6gg') feed('dp') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }^ABCabc │{1: }{10: 9 }ABCabc | - {1: }{10: 7 }ABCabc │{1: }{10: 10 }ABCabc | - {1: }{10: 8 }ABCabc │{1: }{10: 11 }ABCabc | - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 11 }common line │{1: }{10: 15 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 16 }{4:DEF }| - {1: }{10: 12 }something │{1: }{10: 17 }something | - {1: }{10: 13 } │{1: }{10: 18 } | - {7:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 [+] }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }^ABCabc │{7: }{8: 9 }ABCabc | + {7: }{8: 7 }ABCabc │{7: }{8: 10 }ABCabc | + {7: }{8: 8 }ABCabc │{7: }{8: 11 }ABCabc | + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 11 }common line │{7: }{8: 15 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 16 }{22:DEF }| + {7: }{8: 12 }something │{7: }{8: 17 }something | + {7: }{8: 13 } │{7: }{8: 18 } | + {3:Xtest-functional-diff-screen-1.2 }{2:Xtest-functional-diff-screen-1 [+] }| :e | ]]) end) @@ -573,25 +550,25 @@ something feed('7gg') feed('dp') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }ABCabc │{1: }{10: 9 }ABCabc | - {1: }{10: 7 }^ABCabc │{1: }{10: 10 }ABCabc | - {1: }{10: 8 }ABCabc │{1: }{10: 11 }ABCabc | - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 11 }common line │{1: }{10: 15 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 16 }{4:DEF }| - {1: }{10: 12 }something │{1: }{10: 17 }something | - {1: }{10: 13 } │{1: }{10: 18 } | - {7:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 [+] }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }ABCabc │{7: }{8: 9 }ABCabc | + {7: }{8: 7 }^ABCabc │{7: }{8: 10 }ABCabc | + {7: }{8: 8 }ABCabc │{7: }{8: 11 }ABCabc | + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 11 }common line │{7: }{8: 15 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 16 }{22:DEF }| + {7: }{8: 12 }something │{7: }{8: 17 }something | + {7: }{8: 13 } │{7: }{8: 18 } | + {3:Xtest-functional-diff-screen-1.2 }{2:Xtest-functional-diff-screen-1 [+] }| :e | ]]) end) @@ -600,25 +577,25 @@ something feed('11gg') feed('dp') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }{8:ABC}{9:abc }│{1: }{10: 9 }{8:DEF}{9:abc }| - {1: }{10: 7 }{8:ABC}{9:abc }│{1: }{10: 10 }{8:DEF}{9:abc }| - {1: }{10: 8 }{8:ABC}{9:abc }│{1: }{10: 11 }{8:DEF}{9:abc }| - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: 11 }^common line │{1: }{10: 14 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 15 }{4:DEF }| - {1: }{10: 12 }something │{1: }{10: 16 }something | - {1: }{10: 13 } │{1: }{10: 17 } | - {6:~ }│{6:~ }| - {7:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 [+] }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }{27:ABC}{4:abc }│{7: }{8: 9 }{27:DEF}{4:abc }| + {7: }{8: 7 }{27:ABC}{4:abc }│{7: }{8: 10 }{27:DEF}{4:abc }| + {7: }{8: 8 }{27:ABC}{4:abc }│{7: }{8: 11 }{27:DEF}{4:abc }| + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: 11 }^common line │{7: }{8: 14 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 15 }{22:DEF }| + {7: }{8: 12 }something │{7: }{8: 16 }something | + {7: }{8: 13 } │{7: }{8: 17 } | + {1:~ }│{1:~ }| + {3:Xtest-functional-diff-screen-1.2 }{2:Xtest-functional-diff-screen-1 [+] }| :e | ]]) end) @@ -627,25 +604,25 @@ something feed('12gg') feed('dp') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }{8:ABC}{9:abc }│{1: }{10: 9 }{8:DEF}{9:abc }| - {1: }{10: 7 }{8:ABC}{9:abc }│{1: }{10: 10 }{8:DEF}{9:abc }| - {1: }{10: 8 }{8:ABC}{9:abc }│{1: }{10: 11 }{8:DEF}{9:abc }| - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 11 }common line │{1: }{10: 15 }common line | - {1: }{10: 12 }^something │{1: }{10: 16 }something | - {1: }{10: 13 } │{1: }{10: 17 } | - {6:~ }│{6:~ }| - {7:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 [+] }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }{27:ABC}{4:abc }│{7: }{8: 9 }{27:DEF}{4:abc }| + {7: }{8: 7 }{27:ABC}{4:abc }│{7: }{8: 10 }{27:DEF}{4:abc }| + {7: }{8: 8 }{27:ABC}{4:abc }│{7: }{8: 11 }{27:DEF}{4:abc }| + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 11 }common line │{7: }{8: 15 }common line | + {7: }{8: 12 }^something │{7: }{8: 16 }something | + {7: }{8: 13 } │{7: }{8: 17 } | + {1:~ }│{1:~ }| + {3:Xtest-functional-diff-screen-1.2 }{2:Xtest-functional-diff-screen-1 [+] }| :e | ]]) end) @@ -654,25 +631,25 @@ something feed('6gg') feed('dp') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: 6 }xyz │{1: }{10: 6 }^xyz | - {1: }{10: 7 }xyz │{1: }{10: 7 }xyz | - {1: }{10: 8 }xyz │{1: }{10: 8 }xyz | - {1: }{10: 9 }{8:ABC}{9:abc }│{1: }{10: 9 }{8:DEF}{9:abc }| - {1: }{10: 10 }{8:ABC}{9:abc }│{1: }{10: 10 }{8:DEF}{9:abc }| - {1: }{10: 11 }{8:ABC}{9:abc }│{1: }{10: 11 }{8:DEF}{9:abc }| - {1: }{10: 12 }common line │{1: }{10: 12 }common line | - {1: }{10: 13 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 14 }common line │{1: }{10: 15 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 16 }{4:DEF }| - {1: }{10: 15 }something │{1: }{10: 17 }something | - {1: }{10: 16 } │{1: }{10: 18 } | - {3:Xtest-functional-diff-screen-1.2 [+] }{7:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: 6 }xyz │{7: }{8: 6 }^xyz | + {7: }{8: 7 }xyz │{7: }{8: 7 }xyz | + {7: }{8: 8 }xyz │{7: }{8: 8 }xyz | + {7: }{8: 9 }{27:ABC}{4:abc }│{7: }{8: 9 }{27:DEF}{4:abc }| + {7: }{8: 10 }{27:ABC}{4:abc }│{7: }{8: 10 }{27:DEF}{4:abc }| + {7: }{8: 11 }{27:ABC}{4:abc }│{7: }{8: 11 }{27:DEF}{4:abc }| + {7: }{8: 12 }common line │{7: }{8: 12 }common line | + {7: }{8: 13 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 14 }common line │{7: }{8: 15 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 16 }{22:DEF }| + {7: }{8: 15 }something │{7: }{8: 17 }something | + {7: }{8: 16 } │{7: }{8: 18 } | + {2:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -681,25 +658,25 @@ something feed('8gg') feed('dp') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: 6 }xyz │{1: }{10: 6 }xyz | - {1: }{10: 7 }xyz │{1: }{10: 7 }xyz | - {1: }{10: 8 }xyz │{1: }{10: 8 }^xyz | - {1: }{10: 9 }{8:ABC}{9:abc }│{1: }{10: 9 }{8:DEF}{9:abc }| - {1: }{10: 10 }{8:ABC}{9:abc }│{1: }{10: 10 }{8:DEF}{9:abc }| - {1: }{10: 11 }{8:ABC}{9:abc }│{1: }{10: 11 }{8:DEF}{9:abc }| - {1: }{10: 12 }common line │{1: }{10: 12 }common line | - {1: }{10: 13 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 14 }common line │{1: }{10: 15 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 16 }{4:DEF }| - {1: }{10: 15 }something │{1: }{10: 17 }something | - {1: }{10: 16 } │{1: }{10: 18 } | - {3:Xtest-functional-diff-screen-1.2 [+] }{7:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: 6 }xyz │{7: }{8: 6 }xyz | + {7: }{8: 7 }xyz │{7: }{8: 7 }xyz | + {7: }{8: 8 }xyz │{7: }{8: 8 }^xyz | + {7: }{8: 9 }{27:ABC}{4:abc }│{7: }{8: 9 }{27:DEF}{4:abc }| + {7: }{8: 10 }{27:ABC}{4:abc }│{7: }{8: 10 }{27:DEF}{4:abc }| + {7: }{8: 11 }{27:ABC}{4:abc }│{7: }{8: 11 }{27:DEF}{4:abc }| + {7: }{8: 12 }common line │{7: }{8: 12 }common line | + {7: }{8: 13 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 14 }common line │{7: }{8: 15 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 16 }{22:DEF }| + {7: }{8: 15 }something │{7: }{8: 17 }something | + {7: }{8: 16 } │{7: }{8: 18 } | + {2:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -708,25 +685,25 @@ something feed('9gg') feed('dp') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }DEFabc │{1: }{10: 9 }^DEFabc | - {1: }{10: 7 }DEFabc │{1: }{10: 10 }DEFabc | - {1: }{10: 8 }DEFabc │{1: }{10: 11 }DEFabc | - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 11 }common line │{1: }{10: 15 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 16 }{4:DEF }| - {1: }{10: 12 }something │{1: }{10: 17 }something | - {1: }{10: 13 } │{1: }{10: 18 } | - {3:Xtest-functional-diff-screen-1.2 [+] }{7:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }DEFabc │{7: }{8: 9 }^DEFabc | + {7: }{8: 7 }DEFabc │{7: }{8: 10 }DEFabc | + {7: }{8: 8 }DEFabc │{7: }{8: 11 }DEFabc | + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 11 }common line │{7: }{8: 15 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 16 }{22:DEF }| + {7: }{8: 12 }something │{7: }{8: 17 }something | + {7: }{8: 13 } │{7: }{8: 18 } | + {2:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -735,25 +712,25 @@ something feed('17gg') feed('dp') screen:expect([[ - {1: }{10: 1 } │{1: }{10: 1 } | - {1: }{10: 2 }common line │{1: }{10: 2 }common line | - {1: }{10: 3 }common line │{1: }{10: 3 }common line | - {1: }{10: 4 } │{1: }{10: 4 } | - {1: }{10: 5 }{8:ABC}{9:abc }│{1: }{10: 5 }{8:DEF}{9:abc }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 6 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 7 }{4:xyz }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 8 }{4:xyz }| - {1: }{10: 6 }{8:ABC}{9:abc }│{1: }{10: 9 }{8:DEF}{9:abc }| - {1: }{10: 7 }{8:ABC}{9:abc }│{1: }{10: 10 }{8:DEF}{9:abc }| - {1: }{10: 8 }{8:ABC}{9:abc }│{1: }{10: 11 }{8:DEF}{9:abc }| - {1: }{10: 9 }common line │{1: }{10: 12 }common line | - {1: }{10: 10 }common line │{1: }{10: 13 }common line | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 14 }{4:DEF }| - {1: }{10: 11 }common line │{1: }{10: 15 }common line | - {1: }{10: 12 }DEF │{1: }{10: 16 }DEF | - {1: }{10: 13 }something │{1: }{10: 17 }^something | - {1: }{10: 14 } │{1: }{10: 18 } | - {3:Xtest-functional-diff-screen-1.2 [+] }{7:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 } │{7: }{8: 1 } | + {7: }{8: 2 }common line │{7: }{8: 2 }common line | + {7: }{8: 3 }common line │{7: }{8: 3 }common line | + {7: }{8: 4 } │{7: }{8: 4 } | + {7: }{8: 5 }{27:ABC}{4:abc }│{7: }{8: 5 }{27:DEF}{4:abc }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 6 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 7 }{22:xyz }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 8 }{22:xyz }| + {7: }{8: 6 }{27:ABC}{4:abc }│{7: }{8: 9 }{27:DEF}{4:abc }| + {7: }{8: 7 }{27:ABC}{4:abc }│{7: }{8: 10 }{27:DEF}{4:abc }| + {7: }{8: 8 }{27:ABC}{4:abc }│{7: }{8: 11 }{27:DEF}{4:abc }| + {7: }{8: 9 }common line │{7: }{8: 12 }common line | + {7: }{8: 10 }common line │{7: }{8: 13 }common line | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 14 }{22:DEF }| + {7: }{8: 11 }common line │{7: }{8: 15 }common line | + {7: }{8: 12 }DEF │{7: }{8: 16 }DEF | + {7: }{8: 13 }something │{7: }{8: 17 }^something | + {7: }{8: 14 } │{7: }{8: 18 } | + {2:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -778,13 +755,13 @@ d it('display results', function() screen:expect([[ - {1: }{10: 1 }{4:^ }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 2 }{9:abc d }│{1: }{10: 1 }{8:// }{9:abc d }| - {1: }{10: 3 }{9:d }│{1: }{10: 2 }{8:// }{9:d }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 3 }{4:// d }| - {1: }{10: 4 } │{1: }{10: 4 } | - {6:~ }│{6:~ }|*13 - {7:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 }{22:^ }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 2 }{4:abc d }│{7: }{8: 1 }{27:// }{4:abc d }| + {7: }{8: 3 }{4:d }│{7: }{8: 2 }{27:// }{4:d }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 3 }{22:// d }| + {7: }{8: 4 } │{7: }{8: 4 } | + {1:~ }│{1:~ }|*13 + {3:Xtest-functional-diff-screen-1.2 }{2:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -813,15 +790,15 @@ void testFunction () { it('display results', function() screen:expect([[ - {1: }{10: 1 }^void testFunction () { │{1: }{10: 1 }void testFunction () { | - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 2 }{4: for (int i = 0; i < 10; i++) { }| - {1: }{10: 2 }{9: }{8:// for (int j = 0; j < 10; i}{9:++) { }│{1: }{10: 3 }{9: }{8:for (int j = 0; j < 10; j}{9:++) { }| - {1: }{10: 3 }{9: }{8:// }{9:} }│{1: }{10: 4 }{9: } }| - {1: }{10: }{2:-------------------------------------------}│{1: }{10: 5 }{4: } }| - {1: }{10: 4 }} │{1: }{10: 6 }} | - {1: }{10: 5 } │{1: }{10: 7 } | - {6:~ }│{6:~ }|*11 - {7:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 }^void testFunction () { │{7: }{8: 1 }void testFunction () { | + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 2 }{22: for (int i = 0; i < 10; i++) { }| + {7: }{8: 2 }{4: }{27:// for (int j = 0; j < 10; i}{4:++) { }│{7: }{8: 3 }{4: }{27:for (int j = 0; j < 10; j}{4:++) { }| + {7: }{8: 3 }{4: }{27:// }{4:} }│{7: }{8: 4 }{4: } }| + {7: }{8: }{23:-------------------------------------------}│{7: }{8: 5 }{22: } }| + {7: }{8: 4 }} │{7: }{8: 6 }} | + {7: }{8: 5 } │{7: }{8: 7 } | + {1:~ }│{1:~ }|*11 + {3:Xtest-functional-diff-screen-1.2 }{2:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -851,17 +828,17 @@ void testFunction () { it('display results', function() screen:expect([[ - {1: }{10: 1 }{4:^?Z }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 2 }{8:?}{9:A }│{1: }{10: 1 }{8:!}{9:A }| - {1: }{10: 3 }{8:?}{9:B }│{1: }{10: 2 }{8:!}{9:B }| - {1: }{10: 4 }{8:?}{9:C }│{1: }{10: 3 }{8:!}{9:C }| - {1: }{10: 5 }{4:?A }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 6 }{4:?B }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 7 }{4:?B }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 8 }{4:?C }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 9 } │{1: }{10: 4 } | - {6:~ }│{6:~ }|*9 - {7:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 }{22:^?Z }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 2 }{27:?}{4:A }│{7: }{8: 1 }{27:!}{4:A }| + {7: }{8: 3 }{27:?}{4:B }│{7: }{8: 2 }{27:!}{4:B }| + {7: }{8: 4 }{27:?}{4:C }│{7: }{8: 3 }{27:!}{4:C }| + {7: }{8: 5 }{22:?A }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 6 }{22:?B }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 7 }{22:?B }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 8 }{22:?C }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 9 } │{7: }{8: 4 } | + {1:~ }│{1:~ }|*9 + {3:Xtest-functional-diff-screen-1.2 }{2:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -891,17 +868,17 @@ void testFunction () { it('display results', function() screen:expect([[ - {1: }{10: 1 }{4:^?A }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 2 }{4:?Z }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 3 }{4:?B }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 4 }{4:?C }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 5 }{8:?}{9:A }│{1: }{10: 1 }{8:!}{9:A }| - {1: }{10: 6 }{8:?}{9:B }│{1: }{10: 2 }{8:!}{9:B }| - {1: }{10: 7 }{8:?}{9:C }│{1: }{10: 3 }{8:!}{9:C }| - {1: }{10: 8 }{4:?C }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 9 } │{1: }{10: 4 } | - {6:~ }│{6:~ }|*9 - {7:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 }{22:^?A }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 2 }{22:?Z }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 3 }{22:?B }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 4 }{22:?C }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 5 }{27:?}{4:A }│{7: }{8: 1 }{27:!}{4:A }| + {7: }{8: 6 }{27:?}{4:B }│{7: }{8: 2 }{27:!}{4:B }| + {7: }{8: 7 }{27:?}{4:C }│{7: }{8: 3 }{27:!}{4:C }| + {7: }{8: 8 }{22:?C }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 9 } │{7: }{8: 4 } | + {1:~ }│{1:~ }|*9 + {3:Xtest-functional-diff-screen-1.2 }{2:Xtest-functional-diff-screen-1 }| :e | ]]) end) @@ -953,50 +930,50 @@ something feed('1<c-w>w') -- linematch is disabled for the longest diff because it's combined line length is over 10 screen:expect([[ - {1: }{10: 1 }^common line │{1: }{10: 1 }common line | - {1: }{10: 2 }{4:DEF }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 3 }{8:GHI}{9: }│{1: }{10: 2 }{8:HIL}{9: }| - {1: }{10: 4 }{4:something }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 5 } │{1: }{10: 3 } | - {1: }{10: 6 }{9:a}{8:DEF}{9:abc }│{1: }{10: 4 }{9:a}{8:ABC}{9:abc }| - {1: }{10: 7 }{8:xyz}{9: }│{1: }{10: 5 }{8:aABCabc}{9: }| - {1: }{10: 8 }{8:xyz}{9: }│{1: }{10: 6 }{8:aABCabc}{9: }| - {1: }{10: 9 }{8:xyz}{9: }│{1: }{10: 7 }{8:aABCabc}{9: }| - {1: }{10: 10 }{4:aDEFabc }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 11 }{4:aDEFabc }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 12 }{4:aDEFabc }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 13 }common line │{1: }{10: 8 }common line | - {1: }{10: 14 }{4:DEF }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 15 }{8:GHI}{9: }│{1: }{10: 9 }{8:HIL}{9: }| - {1: }{10: 16 }{4:something else }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 17 }common line │{1: }{10: 10 }common line | - {1: }{10: 18 }something │{1: }{10: 11 }something | - {7:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 }^common line │{7: }{8: 1 }common line | + {7: }{8: 2 }{22:DEF }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 3 }{27:GHI}{4: }│{7: }{8: 2 }{27:HIL}{4: }| + {7: }{8: 4 }{22:something }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 5 } │{7: }{8: 3 } | + {7: }{8: 6 }{4:a}{27:DEF}{4:abc }│{7: }{8: 4 }{4:a}{27:ABC}{4:abc }| + {7: }{8: 7 }{27:xyz}{4: }│{7: }{8: 5 }{27:aABCabc}{4: }| + {7: }{8: 8 }{27:xyz}{4: }│{7: }{8: 6 }{27:aABCabc}{4: }| + {7: }{8: 9 }{27:xyz}{4: }│{7: }{8: 7 }{27:aABCabc}{4: }| + {7: }{8: 10 }{22:aDEFabc }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 11 }{22:aDEFabc }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 12 }{22:aDEFabc }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 13 }common line │{7: }{8: 8 }common line | + {7: }{8: 14 }{22:DEF }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 15 }{27:GHI}{4: }│{7: }{8: 9 }{27:HIL}{4: }| + {7: }{8: 16 }{22:something else }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 17 }common line │{7: }{8: 10 }common line | + {7: }{8: 18 }something │{7: }{8: 11 }something | + {3:Xtest-functional-diff-screen-1.2 }{2:Xtest-functional-diff-screen-1 }| :e | ]]) -- enable it by increasing the number feed(':set diffopt-=linematch:10<cr>') feed(':set diffopt+=linematch:30<cr>') screen:expect([[ - {1: }{10: 1 }^common line │{1: }{10: 1 }common line | - {1: }{10: 2 }{4:DEF }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 3 }{8:GHI}{9: }│{1: }{10: 2 }{8:HIL}{9: }| - {1: }{10: 4 }{4:something }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 5 } │{1: }{10: 3 } | - {1: }{10: 6 }{9:a}{8:DEF}{9:abc }│{1: }{10: 4 }{9:a}{8:ABC}{9:abc }| - {1: }{10: 7 }{4:xyz }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 8 }{4:xyz }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 9 }{4:xyz }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 10 }{9:a}{8:DEF}{9:abc }│{1: }{10: 5 }{9:a}{8:ABC}{9:abc }| - {1: }{10: 11 }{9:a}{8:DEF}{9:abc }│{1: }{10: 6 }{9:a}{8:ABC}{9:abc }| - {1: }{10: 12 }{9:a}{8:DEF}{9:abc }│{1: }{10: 7 }{9:a}{8:ABC}{9:abc }| - {1: }{10: 13 }common line │{1: }{10: 8 }common line | - {1: }{10: 14 }{4:DEF }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 15 }{8:GHI}{9: }│{1: }{10: 9 }{8:HIL}{9: }| - {1: }{10: 16 }{4:something else }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 17 }common line │{1: }{10: 10 }common line | - {1: }{10: 18 }something │{1: }{10: 11 }something | - {7:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 }^common line │{7: }{8: 1 }common line | + {7: }{8: 2 }{22:DEF }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 3 }{27:GHI}{4: }│{7: }{8: 2 }{27:HIL}{4: }| + {7: }{8: 4 }{22:something }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 5 } │{7: }{8: 3 } | + {7: }{8: 6 }{4:a}{27:DEF}{4:abc }│{7: }{8: 4 }{4:a}{27:ABC}{4:abc }| + {7: }{8: 7 }{22:xyz }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 8 }{22:xyz }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 9 }{22:xyz }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 10 }{4:a}{27:DEF}{4:abc }│{7: }{8: 5 }{4:a}{27:ABC}{4:abc }| + {7: }{8: 11 }{4:a}{27:DEF}{4:abc }│{7: }{8: 6 }{4:a}{27:ABC}{4:abc }| + {7: }{8: 12 }{4:a}{27:DEF}{4:abc }│{7: }{8: 7 }{4:a}{27:ABC}{4:abc }| + {7: }{8: 13 }common line │{7: }{8: 8 }common line | + {7: }{8: 14 }{22:DEF }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 15 }{27:GHI}{4: }│{7: }{8: 9 }{27:HIL}{4: }| + {7: }{8: 16 }{22:something else }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 17 }common line │{7: }{8: 10 }common line | + {7: }{8: 18 }something │{7: }{8: 11 }something | + {3:Xtest-functional-diff-screen-1.2 }{2:Xtest-functional-diff-screen-1 }| :set diffopt+=linematch:30 | ]]) end @@ -1005,25 +982,25 @@ something feed('2<c-w>w') feed(':1,12diffget<cr>') screen:expect([[ - {1: }{10: 1 }common line │{1: }{10: 1 }^common line | - {1: }{10: 2 }DEF │{1: }{10: 2 }DEF | - {1: }{10: 3 }GHI │{1: }{10: 3 }GHI | - {1: }{10: 4 }something │{1: }{10: 4 }something | - {1: }{10: 5 } │{1: }{10: 5 } | - {1: }{10: 6 }aDEFabc │{1: }{10: 6 }aDEFabc | - {1: }{10: 7 }xyz │{1: }{10: 7 }xyz | - {1: }{10: 8 }xyz │{1: }{10: 8 }xyz | - {1: }{10: 9 }xyz │{1: }{10: 9 }xyz | - {1: }{10: 10 }aDEFabc │{1: }{10: 10 }aDEFabc | - {1: }{10: 11 }aDEFabc │{1: }{10: 11 }aDEFabc | - {1: }{10: 12 }aDEFabc │{1: }{10: 12 }aDEFabc | - {1: }{10: 13 }common line │{1: }{10: 13 }common line | - {1: }{10: 14 }DEF │{1: }{10: 14 }DEF | - {1: }{10: 15 }GHI │{1: }{10: 15 }GHI | - {1: }{10: 16 }something else │{1: }{10: 16 }something else | - {1: }{10: 17 }common line │{1: }{10: 17 }common line | - {1: }{10: 18 }something │{1: }{10: 18 }something | - {3:Xtest-functional-diff-screen-1.2 }{7:Xtest-functional-diff-screen-1 [+] }| + {7: }{8: 1 }common line │{7: }{8: 1 }^common line | + {7: }{8: 2 }DEF │{7: }{8: 2 }DEF | + {7: }{8: 3 }GHI │{7: }{8: 3 }GHI | + {7: }{8: 4 }something │{7: }{8: 4 }something | + {7: }{8: 5 } │{7: }{8: 5 } | + {7: }{8: 6 }aDEFabc │{7: }{8: 6 }aDEFabc | + {7: }{8: 7 }xyz │{7: }{8: 7 }xyz | + {7: }{8: 8 }xyz │{7: }{8: 8 }xyz | + {7: }{8: 9 }xyz │{7: }{8: 9 }xyz | + {7: }{8: 10 }aDEFabc │{7: }{8: 10 }aDEFabc | + {7: }{8: 11 }aDEFabc │{7: }{8: 11 }aDEFabc | + {7: }{8: 12 }aDEFabc │{7: }{8: 12 }aDEFabc | + {7: }{8: 13 }common line │{7: }{8: 13 }common line | + {7: }{8: 14 }DEF │{7: }{8: 14 }DEF | + {7: }{8: 15 }GHI │{7: }{8: 15 }GHI | + {7: }{8: 16 }something else │{7: }{8: 16 }something else | + {7: }{8: 17 }common line │{7: }{8: 17 }common line | + {7: }{8: 18 }something │{7: }{8: 18 }something | + {2:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 [+] }| :1,12diffget | ]]) end) @@ -1031,20 +1008,20 @@ something feed('1<c-w>w') feed(':1,19diffget<cr>') screen:expect([[ - {1: }{10: 1 }^common line │{1: }{10: 1 }common line | - {1: }{10: 2 }HIL │{1: }{10: 2 }HIL | - {1: }{10: 3 } │{1: }{10: 3 } | - {1: }{10: 4 }aABCabc │{1: }{10: 4 }aABCabc | - {1: }{10: 5 }aABCabc │{1: }{10: 5 }aABCabc | - {1: }{10: 6 }aABCabc │{1: }{10: 6 }aABCabc | - {1: }{10: 7 }aABCabc │{1: }{10: 7 }aABCabc | - {1: }{10: 8 }common line │{1: }{10: 8 }common line | - {1: }{10: 9 }HIL │{1: }{10: 9 }HIL | - {1: }{10: 10 }common line │{1: }{10: 10 }common line | - {1: }{10: 11 }something │{1: }{10: 11 }something | - {1: }{10: 12 } │{1: }{10: 12 } | - {6:~ }│{6:~ }|*6 - {7:Xtest-functional-diff-screen-1.2 [+] }{3:Xtest-functional-diff-screen-1 }| + {7: }{8: 1 }^common line │{7: }{8: 1 }common line | + {7: }{8: 2 }HIL │{7: }{8: 2 }HIL | + {7: }{8: 3 } │{7: }{8: 3 } | + {7: }{8: 4 }aABCabc │{7: }{8: 4 }aABCabc | + {7: }{8: 5 }aABCabc │{7: }{8: 5 }aABCabc | + {7: }{8: 6 }aABCabc │{7: }{8: 6 }aABCabc | + {7: }{8: 7 }aABCabc │{7: }{8: 7 }aABCabc | + {7: }{8: 8 }common line │{7: }{8: 8 }common line | + {7: }{8: 9 }HIL │{7: }{8: 9 }HIL | + {7: }{8: 10 }common line │{7: }{8: 10 }common line | + {7: }{8: 11 }something │{7: }{8: 11 }something | + {7: }{8: 12 } │{7: }{8: 12 } | + {1:~ }│{1:~ }|*6 + {3:Xtest-functional-diff-screen-1.2 [+] }{2:Xtest-functional-diff-screen-1 }| :1,19diffget | ]]) end) @@ -1054,25 +1031,25 @@ something feed('2<c-w>w') feed(':7,8diffget<cr>') screen:expect([[ - {1: }{10: 1 }common line │{1: }{10: 1 }^common line | - {1: }{10: 2 }{4:DEF }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 3 }{8:GHI}{9: }│{1: }{10: 2 }{8:HIL}{9: }| - {1: }{10: 4 }{4:something }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 5 } │{1: }{10: 3 } | - {1: }{10: 6 }{9:a}{8:DEF}{9:abc }│{1: }{10: 4 }{9:a}{8:ABC}{9:abc }| - {1: }{10: 7 }{8:xyz}{9: }│{1: }{10: 5 }{8:aABCabc}{9: }| - {1: }{10: 8 }{8:xyz}{9: }│{1: }{10: 6 }{8:aABCabc}{9: }| - {1: }{10: 9 }xyz │{1: }{10: 7 }xyz | - {1: }{10: 10 }aDEFabc │{1: }{10: 8 }aDEFabc | - {1: }{10: 11 }aDEFabc │{1: }{10: 9 }aDEFabc | - {1: }{10: 12 }aDEFabc │{1: }{10: 10 }aDEFabc | - {1: }{10: 13 }common line │{1: }{10: 11 }common line | - {1: }{10: 14 }{4:DEF }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 15 }{8:GHI}{9: }│{1: }{10: 12 }{8:HIL}{9: }| - {1: }{10: 16 }{4:something else }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 17 }common line │{1: }{10: 13 }common line | - {1: }{10: 18 }something │{1: }{10: 14 }something | - {3:Xtest-functional-diff-screen-1.2 }{7:Xtest-functional-diff-screen-1 [+] }| + {7: }{8: 1 }common line │{7: }{8: 1 }^common line | + {7: }{8: 2 }{22:DEF }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 3 }{27:GHI}{4: }│{7: }{8: 2 }{27:HIL}{4: }| + {7: }{8: 4 }{22:something }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 5 } │{7: }{8: 3 } | + {7: }{8: 6 }{4:a}{27:DEF}{4:abc }│{7: }{8: 4 }{4:a}{27:ABC}{4:abc }| + {7: }{8: 7 }{27:xyz}{4: }│{7: }{8: 5 }{27:aABCabc}{4: }| + {7: }{8: 8 }{27:xyz}{4: }│{7: }{8: 6 }{27:aABCabc}{4: }| + {7: }{8: 9 }xyz │{7: }{8: 7 }xyz | + {7: }{8: 10 }aDEFabc │{7: }{8: 8 }aDEFabc | + {7: }{8: 11 }aDEFabc │{7: }{8: 9 }aDEFabc | + {7: }{8: 12 }aDEFabc │{7: }{8: 10 }aDEFabc | + {7: }{8: 13 }common line │{7: }{8: 11 }common line | + {7: }{8: 14 }{22:DEF }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 15 }{27:GHI}{4: }│{7: }{8: 12 }{27:HIL}{4: }| + {7: }{8: 16 }{22:something else }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 17 }common line │{7: }{8: 13 }common line | + {7: }{8: 18 }something │{7: }{8: 14 }something | + {2:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 [+] }| :7,8diffget | ]]) end @@ -1083,25 +1060,25 @@ something feed('2<c-w>w') feed(':8,10diffget<cr>') screen:expect([[ - {1: }{10: 1 }common line │{1: }{10: 1 }^common line | - {1: }{10: 2 }{4:DEF }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 3 }{8:GHI}{9: }│{1: }{10: 2 }{8:HIL}{9: }| - {1: }{10: 4 }{4:something }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 5 } │{1: }{10: 3 } | - {1: }{10: 6 }{9:a}{8:DEF}{9:abc }│{1: }{10: 4 }{9:a}{8:ABC}{9:abc }| - {1: }{10: 7 }{8:xyz}{9: }│{1: }{10: 5 }{8:aABCabc}{9: }| - {1: }{10: 8 }{8:xyz}{9: }│{1: }{10: 6 }{8:aABCabc}{9: }| - {1: }{10: 9 }{8:xyz}{9: }│{1: }{10: 7 }{8:aABCabc}{9: }| - {1: }{10: 10 }{4:aDEFabc }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 11 }{4:aDEFabc }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 12 }{4:aDEFabc }│{1: }{10: }{2:--------------------------------------------}| - {1: }{10: 13 }common line │{1: }{10: 8 }common line | - {1: }{10: 14 }DEF │{1: }{10: 9 }DEF | - {1: }{10: 15 }GHI │{1: }{10: 10 }GHI | - {1: }{10: 16 }something else │{1: }{10: 11 }something else | - {1: }{10: 17 }common line │{1: }{10: 12 }common line | - {1: }{10: 18 }something │{1: }{10: 13 }something | - {3:Xtest-functional-diff-screen-1.2 }{7:Xtest-functional-diff-screen-1 [+] }| + {7: }{8: 1 }common line │{7: }{8: 1 }^common line | + {7: }{8: 2 }{22:DEF }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 3 }{27:GHI}{4: }│{7: }{8: 2 }{27:HIL}{4: }| + {7: }{8: 4 }{22:something }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 5 } │{7: }{8: 3 } | + {7: }{8: 6 }{4:a}{27:DEF}{4:abc }│{7: }{8: 4 }{4:a}{27:ABC}{4:abc }| + {7: }{8: 7 }{27:xyz}{4: }│{7: }{8: 5 }{27:aABCabc}{4: }| + {7: }{8: 8 }{27:xyz}{4: }│{7: }{8: 6 }{27:aABCabc}{4: }| + {7: }{8: 9 }{27:xyz}{4: }│{7: }{8: 7 }{27:aABCabc}{4: }| + {7: }{8: 10 }{22:aDEFabc }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 11 }{22:aDEFabc }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 12 }{22:aDEFabc }│{7: }{8: }{23:--------------------------------------------}| + {7: }{8: 13 }common line │{7: }{8: 8 }common line | + {7: }{8: 14 }DEF │{7: }{8: 9 }DEF | + {7: }{8: 15 }GHI │{7: }{8: 10 }GHI | + {7: }{8: 16 }something else │{7: }{8: 11 }something else | + {7: }{8: 17 }common line │{7: }{8: 12 }common line | + {7: }{8: 18 }something │{7: }{8: 13 }something | + {2:Xtest-functional-diff-screen-1.2 }{3:Xtest-functional-diff-screen-1 [+] }| :8,10diffget | ]]) end @@ -1118,10 +1095,10 @@ describe('regressions', function() screen = Screen.new(100, 20) screen:attach() -- line must be greater than MATCH_CHAR_MAX_LEN - helpers.api.nvim_buf_set_lines(0, 0, -1, false, { string.rep('a', 1000) .. 'hello' }) - helpers.exec 'vnew' - helpers.api.nvim_buf_set_lines(0, 0, -1, false, { string.rep('a', 1010) .. 'world' }) - helpers.exec 'windo diffthis' + n.api.nvim_buf_set_lines(0, 0, -1, false, { string.rep('a', 1000) .. 'hello' }) + n.exec 'vnew' + n.api.nvim_buf_set_lines(0, 0, -1, false, { string.rep('a', 1010) .. 'world' }) + n.exec 'windo diffthis' end) it('properly computes filler lines for hunks bigger than linematch limit', function() @@ -1133,10 +1110,10 @@ describe('regressions', function() for i = 0, 29 do lines[#lines + 1] = tostring(i) end - helpers.api.nvim_buf_set_lines(0, 0, -1, false, lines) - helpers.exec 'vnew' - helpers.api.nvim_buf_set_lines(0, 0, -1, false, { '00', '29' }) - helpers.exec 'windo diffthis' + n.api.nvim_buf_set_lines(0, 0, -1, false, lines) + n.exec 'vnew' + n.api.nvim_buf_set_lines(0, 0, -1, false, { '00', '29' }) + n.exec 'windo diffthis' feed('<C-e>') screen:expect { grid = [[ |