aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/nvim/highlight_group.c2
-rw-r--r--test/functional/api/window_spec.lua24
-rw-r--r--test/functional/ex_cmds/drop_spec.lua32
-rw-r--r--test/functional/legacy/display_spec.lua32
-rw-r--r--test/functional/legacy/listchars_spec.lua128
-rw-r--r--test/functional/options/cursorbind_spec.lua60
-rw-r--r--test/functional/ui/diff_spec.lua1364
-rw-r--r--test/functional/ui/float_spec.lua1
-rw-r--r--test/functional/ui/fold_spec.lua2
-rw-r--r--test/functional/ui/global_statusline_spec.lua142
-rw-r--r--test/functional/ui/highlight_spec.lua160
-rw-r--r--test/functional/ui/hlstate_spec.lua3
-rw-r--r--test/functional/ui/inccommand_spec.lua68
-rw-r--r--test/functional/ui/messages_spec.lua6
-rw-r--r--test/functional/ui/mouse_spec.lua120
-rw-r--r--test/functional/ui/multigrid_spec.lua362
-rw-r--r--test/functional/ui/popupmenu_spec.lua108
-rw-r--r--test/functional/ui/screen_basic_spec.lua192
18 files changed, 1405 insertions, 1401 deletions
diff --git a/src/nvim/highlight_group.c b/src/nvim/highlight_group.c
index c4b826c3fd..5e35b9bd91 100644
--- a/src/nvim/highlight_group.c
+++ b/src/nvim/highlight_group.c
@@ -103,8 +103,8 @@ static const char *highlight_init_both[] = {
"TabLineFill cterm=reverse gui=reverse",
"TabLineSel cterm=bold gui=bold",
"TermCursor cterm=reverse gui=reverse",
- "VertSplit cterm=reverse gui=reverse",
"WildMenu ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black",
+ "default link VertSplit Normal",
"default link WinSeparator VertSplit",
"default link EndOfBuffer NonText",
"default link LineNrAbove LineNr",
diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua
index c31ab2060a..9aacac37bf 100644
--- a/test/functional/api/window_spec.lua
+++ b/test/functional/api/window_spec.lua
@@ -166,23 +166,23 @@ describe('API/win', function()
local oldwin = curwin()
command('vsplit')
screen:expect([[
- aaa {4:│}aaa |
- bbb {4:│}bbb |
- ccc {4:│}ccc |
- {2:dd^d }{4:│}{2:ddd }|
- {1:~ }{4:│}{1:~ }|
- {1:~ }{4:│}{1:~ }|
+ aaa │aaa |
+ bbb │bbb |
+ ccc │ccc |
+ {2:dd^d }│{2:ddd }|
+ {1:~ }│{1:~ }|
+ {1:~ }│{1:~ }|
{3:[No Name] [+] 4,3 All }{4:[No Name] [+] 4,3 All}|
|
]])
window('set_cursor', oldwin, {1, 0})
screen:expect([[
- aaa {4:│}{2:aaa }|
- bbb {4:│}bbb |
- ccc {4:│}ccc |
- {2:dd^d }{4:│}ddd |
- {1:~ }{4:│}{1:~ }|
- {1:~ }{4:│}{1:~ }|
+ aaa │{2:aaa }|
+ bbb │bbb |
+ ccc │ccc |
+ {2:dd^d }│ddd |
+ {1:~ }│{1:~ }|
+ {1:~ }│{1:~ }|
{3:[No Name] [+] 4,3 All }{4:[No Name] [+] 1,1 All}|
|
]])
diff --git a/test/functional/ex_cmds/drop_spec.lua b/test/functional/ex_cmds/drop_spec.lua
index 9d84a2d4f6..2537ab9cdc 100644
--- a/test/functional/ex_cmds/drop_spec.lua
+++ b/test/functional/ex_cmds/drop_spec.lua
@@ -41,14 +41,14 @@ describe(":drop", function()
feed_command("edit tmp2")
feed_command("drop tmp1")
screen:expect([[
- {2:│}^ |
- {0:~ }{2:│}{0:~ }|
- {0:~ }{2:│}{0:~ }|
- {0:~ }{2:│}{0:~ }|
- {0:~ }{2:│}{0:~ }|
- {0:~ }{2:│}{0:~ }|
- {0:~ }{2:│}{0:~ }|
- {0:~ }{2:│}{0:~ }|
+ │^ |
+ {0:~ }│{0:~ }|
+ {0:~ }│{0:~ }|
+ {0:~ }│{0:~ }|
+ {0:~ }│{0:~ }|
+ {0:~ }│{0:~ }|
+ {0:~ }│{0:~ }|
+ {0:~ }│{0:~ }|
{2:tmp2 }{1:tmp1 }|
:drop tmp1 |
]])
@@ -62,14 +62,14 @@ describe(":drop", function()
feed("iABC<esc>")
feed_command("drop tmp3")
screen:expect([[
- ^ {2:│} |
- {0:~ }{2:│}{0:~ }|
- {0:~ }{2:│}{0:~ }|
- {0:~ }{2:│}{0:~ }|
- {1:tmp3 }{2:│}{0:~ }|
- ABC {2:│}{0:~ }|
- {0:~ }{2:│}{0:~ }|
- {0:~ }{2:│}{0:~ }|
+ ^ │ |
+ {0:~ }│{0:~ }|
+ {0:~ }│{0:~ }|
+ {0:~ }│{0:~ }|
+ {1:tmp3 }│{0:~ }|
+ ABC │{0:~ }|
+ {0:~ }│{0:~ }|
+ {0:~ }│{0:~ }|
{2:tmp2 [+] tmp1 }|
"tmp3" [New] |
]])
diff --git a/test/functional/legacy/display_spec.lua b/test/functional/legacy/display_spec.lua
index 4c7915403c..ccc709cbf6 100644
--- a/test/functional/legacy/display_spec.lua
+++ b/test/functional/legacy/display_spec.lua
@@ -71,14 +71,14 @@ describe('display', function()
100wincmd <
]])
screen:expect([[
- ^a{3:│}aaa |
- a{3:│}bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
- a{3:│}bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
- b{3:│}{1:~ }|
- b{3:│}{1:~ }|
- b{3:│}{1:~ }|
- b{3:│}{1:~ }|
- {1:@}{3:│}{1:~ }|
+ ^a│aaa |
+ a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
+ a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
+ b│{1:~ }|
+ b│{1:~ }|
+ b│{1:~ }|
+ b│{1:~ }|
+ {1:@}│{1:~ }|
{2:< }{3:[No Name] [+] }|
|
]])
@@ -86,14 +86,14 @@ describe('display', function()
screen:expect_unchanged()
command('100wincmd >')
screen:expect([[
- ^aaa {3:│}a|
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb{3:│}a|
- bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb {3:│}a|
- {1:~ }{3:│}b|
- {1:~ }{3:│}b|
- {1:~ }{3:│}b|
- {1:~ }{3:│}b|
- {1:~ }{3:│}{1:@}|
+ ^aaa │a|
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb│a|
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb │a|
+ {1:~ }│b|
+ {1:~ }│b|
+ {1:~ }│b|
+ {1:~ }│b|
+ {1:~ }│{1:@}|
{2:[No Name] [+] }{3:<}|
|
]])
diff --git a/test/functional/legacy/listchars_spec.lua b/test/functional/legacy/listchars_spec.lua
index 206e226767..a94ec431d4 100644
--- a/test/functional/legacy/listchars_spec.lua
+++ b/test/functional/legacy/listchars_spec.lua
@@ -117,106 +117,106 @@ describe("'listchars'", function()
]])
feed('13<C-W>>')
screen:expect([[
- {4: }aaa {3:│}{4: }a{1:>}{3:│}{4: }^aaa |
- {4: } {3:│}{4: } {3:│}{4: } |
- {4: }a {3:│}{4: }a {3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }a{1:>}{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }a{1:>}│{4: }^aaa |
+ {4: } │{4: } │{4: } |
+ {4: }a │{4: }a │{4: }a |
+ {4: }aaaaaa │{4: }a{1:>}│{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] <[+] }{2:[No Name] [+] }|
|
]])
feed('<C-W>>')
screen:expect([[
- {4: }aaa {3:│}{4: }{1:>}{3:│}{4: }^aaa |
- {4: } {3:│}{4: } {3:│}{4: } |
- {4: }a {3:│}{4: }a{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }{1:>}{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }{1:>}│{4: }^aaa |
+ {4: } │{4: } │{4: } |
+ {4: }a │{4: }a│{4: }a |
+ {4: }aaaaaa │{4: }{1:>}│{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] <+] }{2:[No Name] [+] }|
|
]])
feed('<C-W>>')
screen:expect([[
- {4: }aaa {3:│}{4: }{3:│}{4: }^aaa |
- {4: } {3:│}{4: }{3:│}{4: } |
- {4: }a {3:│}{4: }{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }│{4: }^aaa |
+ {4: } │{4: }│{4: } |
+ {4: }a │{4: }│{4: }a |
+ {4: }aaaaaa │{4: }│{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] <] }{2:[No Name] [+] }|
|
]])
feed('<C-W>>')
screen:expect([[
- {4: }aaa {3:│}{4: }{3:│}{4: }^aaa |
- {4: } {3:│}{4: }{3:│}{4: } |
- {4: }a {3:│}{4: }{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }│{4: }^aaa |
+ {4: } │{4: }│{4: } |
+ {4: }a │{4: }│{4: }a |
+ {4: }aaaaaa │{4: }│{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] < }{2:[No Name] [+] }|
|
]])
feed('<C-W>>')
screen:expect([[
- {4: }aaa {3:│}{4: }{3:│}{4: }^aaa |
- {4: } {3:│}{4: }{3:│}{4: } |
- {4: }a {3:│}{4: }{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
+ {4: }aaa │{4: }│{4: }^aaa |
+ {4: } │{4: }│{4: } |
+ {4: }a │{4: }│{4: }a |
+ {4: }aaaaaa │{4: }│{4: }aaaaaa |
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
{3:[No Name] [+] < }{2:[No Name] [+] }|
|
]])
feed('<C-W>h')
feed_command('set nowrap foldcolumn=4')
screen:expect([[
- {4: }aaa {3:│}{4: }^aaa {3:│}{4: }aaa |
- {4: } {3:│}{4: } {3:│}{4: } |
- {4: }a {3:│}{4: }a {3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: }aaaaaa {3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }^aaa │{4: }aaa |
+ {4: } │{4: } │{4: } |
+ {4: }a │{4: }a │{4: }a |
+ {4: }aaaaaa │{4: }aaaaaa │{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }{3:[No Name] [+] }|
:set nowrap foldcolumn=4 |
]])
feed('15<C-W><lt>')
screen:expect([[
- {4: }aaa {3:│}{4: }{3:│}{4: }aaa |
- {4: } {3:│}{4: }{3:│}{4: } |
- {4: }a {3:│}{4: }{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4: ^ }{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
- {1:~ }{3:│}{1:~ }{3:│}{1:~ }|
+ {4: }aaa │{4: }│{4: }aaa |
+ {4: } │{4: }│{4: } |
+ {4: }a │{4: }│{4: }a |
+ {4: }aaaaaa │{4: ^ }│{4: }aaaaaa |
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
+ {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] }{2:<[+] }{3:[No Name] [+] }|
:set nowrap foldcolumn=4 |
]])
feed('4<C-W><lt>')
screen:expect([[
- {4: }aaa {3:│}{4: }{3:│}{4: }aaa |
- {4: } {3:│}{4: }{3:│}{4: } |
- {4: }a {3:│}{4: }{3:│}{4: }a |
- {4: }aaaaaa {3:│}{4:^ }{3:│}{4: }aaaaaa |
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
- {1:~ }{3:│}{1:~}{3:│}{1:~ }|
+ {4: }aaa │{4: }│{4: }aaa |
+ {4: } │{4: }│{4: } |
+ {4: }a │{4: }│{4: }a |
+ {4: }aaaaaa │{4:^ }│{4: }aaaaaa |
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
+ {1:~ }│{1:~}│{1:~ }|
{3:[No Name] [+] }{2:< }{3:[No Name] [+] }|
:set nowrap foldcolumn=4 |
]])
diff --git a/test/functional/options/cursorbind_spec.lua b/test/functional/options/cursorbind_spec.lua
index f762808dd6..fcb753451c 100644
--- a/test/functional/options/cursorbind_spec.lua
+++ b/test/functional/options/cursorbind_spec.lua
@@ -30,23 +30,23 @@ describe("'cursorbind'", function()
]])
feed('20l')
screen:expect([[
- a bb cc dd ee ff gg {3:│}aa bb cc dd ee ff gg^ hh ii jj kk ll mm |
- {4: }{3:│} {4: } |
- {4: }{3:│} {4: } |
- {4: }{3:│} {4: } |
- {4: }{3:│} {4: } |
- {1:~ }{3:│}{1:~ }|
+ a bb cc dd ee ff gg │aa bb cc dd ee ff gg^ hh ii jj kk ll mm |
+ {4: }│ {4: } |
+ {4: }│ {4: } |
+ {4: }│ {4: } |
+ {4: }│ {4: } |
+ {1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }|
|
]])
feed('10l')
screen:expect([[
- hh ii jj kk ll mm n{3:│}aa bb cc dd ee ff gg hh ii jj ^kk ll mm |
- {4: } {3:│} {4: } |
- {4: } {3:│} {4: } |
- {4: } {3:│} {4: } |
- {4: } {3:│} {4: } |
- {1:~ }{3:│}{1:~ }|
+ hh ii jj kk ll mm n│aa bb cc dd ee ff gg hh ii jj ^kk ll mm |
+ {4: } │ {4: } |
+ {4: } │ {4: } |
+ {4: } │ {4: } |
+ {4: } │ {4: } |
+ {1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }|
|
]])
@@ -54,23 +54,23 @@ describe("'cursorbind'", function()
feed('0')
feed('20l')
screen:expect([[
- {4:a bb cc dd ee ff gg }{3:│}{4:aa bb cc dd ee ff gg^ hh ii jj kk ll mm }|
- {4: }{3:│} {4: } |
- {4: }{3:│} {4: } |
- {4: }{3:│} {4: } |
- {4: }{3:│} {4: } |
- {1:~ }{3:│}{1:~ }|
+ {4:a bb cc dd ee ff gg }│{4:aa bb cc dd ee ff gg^ hh ii jj kk ll mm }|
+ {4: }│ {4: } |
+ {4: }│ {4: } |
+ {4: }│ {4: } |
+ {4: }│ {4: } |
+ {1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }|
|
]])
feed('10l')
screen:expect([[
- {4: hh ii jj kk ll mm n}{3:│}{4:aa bb cc dd ee ff gg hh ii jj ^kk ll mm }|
- {4: } {3:│} {4: } |
- {4: } {3:│} {4: } |
- {4: } {3:│} {4: } |
- {4: } {3:│} {4: } |
- {1:~ }{3:│}{1:~ }|
+ {4: hh ii jj kk ll mm n}│{4:aa bb cc dd ee ff gg hh ii jj ^kk ll mm }|
+ {4: } │ {4: } |
+ {4: } │ {4: } |
+ {4: } │ {4: } |
+ {4: } │ {4: } |
+ {1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }|
|
]])
@@ -78,12 +78,12 @@ describe("'cursorbind'", function()
feed('0')
feed('40l')
screen:expect([[
- kk ll mm nn oo pp qq{3:│} bb cc dd ee ff gg hh ii jj kk ll mm n^n|
- {3:│} |
- {3:│} |
- {3:│} |
- {3:│} |
- {1:~ }{3:│}{1:~ }|
+ kk ll mm nn oo pp qq│ bb cc dd ee ff gg hh ii jj kk ll mm n^n|
+ │ |
+ │ |
+ │ |
+ │ |
+ {1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }|
|
]])
diff --git a/test/functional/ui/diff_spec.lua b/test/functional/ui/diff_spec.lua
index 6f67dea2be..5d056cd6c3 100644
--- a/test/functional/ui/diff_spec.lua
+++ b/test/functional/ui/diff_spec.lua
@@ -57,40 +57,40 @@ describe('Diff mode screen', function()
feed(':set diffopt=filler<cr>')
screen:expect([[
- {1: }{2:------------------}{3:│}{1: }{4:0 }|
- {1: }^1 {3:│}{1: }1 |
- {1: }2 {3:│}{1: }2 |
- {1: }3 {3:│}{1: }3 |
- {1: }4 {3:│}{1: }4 |
- {1: }5 {3:│}{1: }5 |
- {1: }6 {3:│}{1: }6 |
- {1:+ }{5:+-- 4 lines: 7···}{3:│}{1:+ }{5:+-- 4 lines: 7··}|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
+ {1: }{2:------------------}│{1: }{4:0 }|
+ {1: }^1 │{1: }1 |
+ {1: }2 │{1: }2 |
+ {1: }3 │{1: }3 |
+ {1: }4 │{1: }4 |
+ {1: }5 │{1: }5 |
+ {1: }6 │{1: }6 |
+ {1:+ }{5:+-- 4 lines: 7···}│{1:+ }{5:+-- 4 lines: 7··}|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler |
]])
feed(':set diffopt+=internal<cr>')
screen:expect([[
- {1: }{2:------------------}{3:│}{1: }{4:0 }|
- {1: }^1 {3:│}{1: }1 |
- {1: }2 {3:│}{1: }2 |
- {1: }3 {3:│}{1: }3 |
- {1: }4 {3:│}{1: }4 |
- {1: }5 {3:│}{1: }5 |
- {1: }6 {3:│}{1: }6 |
- {1:+ }{5:+-- 4 lines: 7···}{3:│}{1:+ }{5:+-- 4 lines: 7··}|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
+ {1: }{2:------------------}│{1: }{4:0 }|
+ {1: }^1 │{1: }1 |
+ {1: }2 │{1: }2 |
+ {1: }3 │{1: }3 |
+ {1: }4 │{1: }4 |
+ {1: }5 │{1: }5 |
+ {1: }6 │{1: }6 |
+ {1:+ }{5:+-- 4 lines: 7···}│{1:+ }{5:+-- 4 lines: 7··}|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=internal |
]])
@@ -103,40 +103,40 @@ describe('Diff mode screen', function()
feed(":set diffopt=filler<cr>")
screen:expect([[
- {1: }{4:^0 }{3:│}{1: }{2:-----------------}|
- {1: }1 {3:│}{1: }1 |
- {1: }2 {3:│}{1: }2 |
- {1: }3 {3:│}{1: }3 |
- {1: }4 {3:│}{1: }4 |
- {1: }5 {3:│}{1: }5 |
- {1: }6 {3:│}{1: }6 |
- {1:+ }{5:+-- 4 lines: 7···}{3:│}{1:+ }{5:+-- 4 lines: 7··}|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
+ {1: }{4:^0 }│{1: }{2:-----------------}|
+ {1: }1 │{1: }1 |
+ {1: }2 │{1: }2 |
+ {1: }3 │{1: }3 |
+ {1: }4 │{1: }4 |
+ {1: }5 │{1: }5 |
+ {1: }6 │{1: }6 |
+ {1:+ }{5:+-- 4 lines: 7···}│{1:+ }{5:+-- 4 lines: 7··}|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt=filler |
]])
feed(":set diffopt+=internal<cr>")
screen:expect([[
- {1: }{4:^0 }{3:│}{1: }{2:-----------------}|
- {1: }1 {3:│}{1: }1 |
- {1: }2 {3:│}{1: }2 |
- {1: }3 {3:│}{1: }3 |
- {1: }4 {3:│}{1: }4 |
- {1: }5 {3:│}{1: }5 |
- {1: }6 {3:│}{1: }6 |
- {1:+ }{5:+-- 4 lines: 7···}{3:│}{1:+ }{5:+-- 4 lines: 7··}|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
+ {1: }{4:^0 }│{1: }{2:-----------------}|
+ {1: }1 │{1: }1 |
+ {1: }2 │{1: }2 |
+ {1: }3 │{1: }3 |
+ {1: }4 │{1: }4 |
+ {1: }5 │{1: }5 |
+ {1: }6 │{1: }6 |
+ {1:+ }{5:+-- 4 lines: 7···}│{1:+ }{5:+-- 4 lines: 7··}|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~ }|
{7:<onal-diff-screen-1 }{3:<l-diff-screen-1.2 }|
:set diffopt+=internal |
]])
@@ -149,53 +149,53 @@ describe('Diff mode screen', function()
feed(":set diffopt=filler<cr>")
screen:expect([[
- {1:+ }{5:^+-- 4 lines: 1···}{3:│}{1:+ }{5:+-- 4 lines: 1··}|
- {1: }5 {3:│}{1: }5 |
- {1: }6 {3:│}{1: }6 |
- {1: }7 {3:│}{1: }7 |
- {1: }8 {3:│}{1: }8 |
- {1: }9 {3:│}{1: }9 |
- {1: }10 {3:│}{1: }10 |
- {1: }{2:------------------}{3:│}{1: }{4:11 }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
- {6:~ }{3:│}{6:~ }|
+ {1:+ }{5:^+-- 4 lines: 1···}│{1:+ }{5:+-- 4 lines: 1··}|
+ {1: }5 │{1: }5 |
+ {1: }6 │{1: }6 |
+ {1: }7 │{1: }7 |
+ {1: }8 │{1: }8 |
+ {1: }9 │{1: }9 |
+ {1: }10 │{1: }10 |
+ {1: }{2:------------------}│{1: }{4:11 }|
+ {6:~ }│{6:~ }|
+ {6:~ }│{6:~