mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 04:18:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18581 from famiu/refactor/ui/vertsplit

Browse Source 
refactor(ui)!: link `VertSplit` to `Normal` by default
This commit is contained in:
bfredl
2022-05-15 20:01:17 +02:00
committed by GitHub
parent a098e304b0 bbf58e6bbc
commit 717560d221
18 changed files with 1405 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/highlight_group.c
View File

@@ -103,8 +103,8 @@ static const char *highlight_init_both[] = {
"TabLineFill cterm=reverse gui=reverse", "TabLineFill cterm=reverse gui=reverse",
"TabLineSel cterm=bold gui=bold", "TabLineSel cterm=bold gui=bold",
"TermCursor cterm=reverse gui=reverse", "TermCursor cterm=reverse gui=reverse",
"VertSplit cterm=reverse gui=reverse",
"WildMenu ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black", "WildMenu ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black",
"default link VertSplit Normal",
"default link WinSeparator VertSplit", "default link WinSeparator VertSplit",
"default link EndOfBuffer NonText", "default link EndOfBuffer NonText",
"default link LineNrAbove LineNr", "default link LineNrAbove LineNr",

24
test/functional/api/window_spec.lua
View File

@@ -166,23 +166,23 @@ describe('API/win', function()
local oldwin = curwin() local oldwin = curwin()
command('vsplit') command('vsplit')
screen:expect([[ screen:expect([[
aaa {4:│}aaa | aaa │aaa |
bbb {4:│}bbb | bbb │bbb |
ccc {4:│}ccc | ccc │ccc |
{2:dd^d }{4:│}{2:ddd }| {2:dd^d }│{2:ddd }|
{1:~ }{4:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{4:│}{1:~ }| {1:~ }│{1:~ }|
{3:[No Name] [+] 4,3 All }{4:[No Name] [+] 4,3 All}| {3:[No Name] [+] 4,3 All }{4:[No Name] [+] 4,3 All}|
| |
]]) ]])
window('set_cursor', oldwin, {1, 0}) window('set_cursor', oldwin, {1, 0})
screen:expect([[ screen:expect([[
aaa {4:│}{2:aaa }| aaa │{2:aaa }|
bbb {4:│}bbb | bbb │bbb |
ccc {4:│}ccc | ccc │ccc |
{2:dd^d }{4:│}ddd | {2:dd^d }│ddd |
{1:~ }{4:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{4:│}{1:~ }| {1:~ }│{1:~ }|
{3:[No Name] [+] 4,3 All }{4:[No Name] [+] 1,1 All}| {3:[No Name] [+] 4,3 All }{4:[No Name] [+] 1,1 All}|
| |
]]) ]])

32
test/functional/ex_cmds/drop_spec.lua
View File

@@ -41,14 +41,14 @@ describe(":drop", function()
feed_command("edit tmp2") feed_command("edit tmp2")
feed_command("drop tmp1") feed_command("drop tmp1")
screen:expect([[ screen:expect([[
{2:│}^ | │^ |
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{2:tmp2 }{1:tmp1 }| {2:tmp2 }{1:tmp1 }|
:drop tmp1 | :drop tmp1 |
]]) ]])
@@ -62,14 +62,14 @@ describe(":drop", function()
feed("iABC<esc>") feed("iABC<esc>")
feed_command("drop tmp3") feed_command("drop tmp3")
screen:expect([[ screen:expect([[
^ {2:│} | ^ │ |
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{1:tmp3 }{2:│}{0:~ }| {1:tmp3 }│{0:~ }|
ABC {2:│}{0:~ }| ABC │{0:~ }|
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }|
{2:tmp2 [+] tmp1 }| {2:tmp2 [+] tmp1 }|
"tmp3" [New] | "tmp3" [New] |
]]) ]])

32
test/functional/legacy/display_spec.lua
View File

@@ -71,14 +71,14 @@ describe('display', function()
100wincmd < 100wincmd <
]]) ]])
screen:expect([[ screen:expect([[
^a{3:│}aaa | ^a│aaa |
a{3:│}bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb| a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
a{3:│}bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | a│bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
b{3:│}{1:~ }| b│{1:~ }|
b{3:│}{1:~ }| b│{1:~ }|
b{3:│}{1:~ }| b│{1:~ }|
b{3:│}{1:~ }| b│{1:~ }|
{1:@}{3:│}{1:~ }| {1:@}│{1:~ }|
{2:< }{3:[No Name] [+] }| {2:< }{3:[No Name] [+] }|
| |
]]) ]])
@@ -86,14 +86,14 @@ describe('display', function()
screen:expect_unchanged() screen:expect_unchanged()
command('100wincmd >') command('100wincmd >')
screen:expect([[ screen:expect([[
^aaa {3:│}a| ^aaa │a|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb{3:│}a| bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb│a|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb {3:│}a| bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb │a|
{1:~ }{3:│}b| {1:~ }│b|
{1:~ }{3:│}b| {1:~ }│b|
{1:~ }{3:│}b| {1:~ }│b|
{1:~ }{3:│}b| {1:~ }│b|
{1:~ }{3:│}{1:@}| {1:~ }│{1:@}|
{2:[No Name] [+] }{3:<}| {2:[No Name] [+] }{3:<}|
| |
]]) ]])

128
test/functional/legacy/listchars_spec.lua
View File

@@ -117,106 +117,106 @@ describe("'listchars'", function()
]]) ]])
feed('13<C-W>>') feed('13<C-W>>')
screen:expect([[ screen:expect([[
{4: }aaa {3:│}{4: }a{1:>}{3:│}{4: }^aaa | {4: }aaa │{4: }a{1:>}│{4: }^aaa |
{4: } {3:│}{4: } {3:│}{4: } | {4: } │{4: } │{4: } |
{4: }a {3:│}{4: }a {3:│}{4: }a | {4: }a │{4: }a │{4: }a |
{4: }aaaaaa {3:│}{4: }a{1:>}{3:│}{4: }aaaaaa | {4: }aaaaaa │{4: }a{1:>}│{4: }aaaaaa |
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] <[+] }{2:[No Name] [+] }| {3:[No Name] [+] <[+] }{2:[No Name] [+] }|
| |
]]) ]])
feed('<C-W>>') feed('<C-W>>')
screen:expect([[ screen:expect([[
{4: }aaa {3:│}{4: }{1:>}{3:│}{4: }^aaa | {4: }aaa │{4: }{1:>}│{4: }^aaa |
{4: } {3:│}{4: } {3:│}{4: } | {4: } │{4: } │{4: } |
{4: }a {3:│}{4: }a{3:│}{4: }a | {4: }a │{4: }a│{4: }a |
{4: }aaaaaa {3:│}{4: }{1:>}{3:│}{4: }aaaaaa | {4: }aaaaaa │{4: }{1:>}│{4: }aaaaaa |
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] <+] }{2:[No Name] [+] }| {3:[No Name] [+] <+] }{2:[No Name] [+] }|
| |
]]) ]])
feed('<C-W>>') feed('<C-W>>')
screen:expect([[ screen:expect([[
{4: }aaa {3:│}{4: }{3:│}{4: }^aaa | {4: }aaa │{4: }│{4: }^aaa |
{4: } {3:│}{4: }{3:│}{4: } | {4: } │{4: }│{4: } |
{4: }a {3:│}{4: }{3:│}{4: }a | {4: }a │{4: }│{4: }a |
{4: }aaaaaa {3:│}{4: }{3:│}{4: }aaaaaa | {4: }aaaaaa │{4: }│{4: }aaaaaa |
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] <] }{2:[No Name] [+] }| {3:[No Name] [+] <] }{2:[No Name] [+] }|
| |
]]) ]])
feed('<C-W>>') feed('<C-W>>')
screen:expect([[ screen:expect([[
{4: }aaa {3:│}{4: }{3:│}{4: }^aaa | {4: }aaa │{4: }│{4: }^aaa |
{4: } {3:│}{4: }{3:│}{4: } | {4: } │{4: }│{4: } |
{4: }a {3:│}{4: }{3:│}{4: }a | {4: }a │{4: }│{4: }a |
{4: }aaaaaa {3:│}{4: }{3:│}{4: }aaaaaa | {4: }aaaaaa │{4: }│{4: }aaaaaa |
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] < }{2:[No Name] [+] }| {3:[No Name] [+] < }{2:[No Name] [+] }|
| |
]]) ]])
feed('<C-W>>') feed('<C-W>>')
screen:expect([[ screen:expect([[
{4: }aaa {3:│}{4: }{3:│}{4: }^aaa | {4: }aaa │{4: }│{4: }^aaa |
{4: } {3:│}{4: }{3:│}{4: } | {4: } │{4: }│{4: } |
{4: }a {3:│}{4: }{3:│}{4: }a | {4: }a │{4: }│{4: }a |
{4: }aaaaaa {3:│}{4: }{3:│}{4: }aaaaaa | {4: }aaaaaa │{4: }│{4: }aaaaaa |
{1:~ }{3:│}{1:~}{3:│}{1:~ }| {1:~ }│{1:~}│{1:~ }|
{1:~ }{3:│}{1:~}{3:│}{1:~ }| {1:~ }│{1:~}│{1:~ }|
{1:~ }{3:│}{1:~}{3:│}{1:~ }| {1:~ }│{1:~}│{1:~ }|
{1:~ }{3:│}{1:~}{3:│}{1:~ }| {1:~ }│{1:~}│{1:~ }|
{3:[No Name] [+] < }{2:[No Name] [+] }| {3:[No Name] [+] < }{2:[No Name] [+] }|
| |
]]) ]])
feed('<C-W>h') feed('<C-W>h')
feed_command('set nowrap foldcolumn=4') feed_command('set nowrap foldcolumn=4')
screen:expect([[ screen:expect([[
{4: }aaa {3:│}{4: }^aaa {3:│}{4: }aaa | {4: }aaa │{4: }^aaa │{4: }aaa |
{4: } {3:│}{4: } {3:│}{4: } | {4: } │{4: } │{4: } |
{4: }a {3:│}{4: }a {3:│}{4: }a | {4: }a │{4: }a │{4: }a |
{4: }aaaaaa {3:│}{4: }aaaaaa {3:│}{4: }aaaaaa | {4: }aaaaaa │{4: }aaaaaa │{4: }aaaaaa |
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }{3:[No Name] [+] }| {3:[No Name] [+] }{2:[No Name] [+] }{3:[No Name] [+] }|
:set nowrap foldcolumn=4 | :set nowrap foldcolumn=4 |
]]) ]])
feed('15<C-W><lt>') feed('15<C-W><lt>')
screen:expect([[ screen:expect([[
{4: }aaa {3:│}{4: }{3:│}{4: }aaa | {4: }aaa │{4: }│{4: }aaa |
{4: } {3:│}{4: }{3:│}{4: } | {4: } │{4: }│{4: } |
{4: }a {3:│}{4: }{3:│}{4: }a | {4: }a │{4: }│{4: }a |
{4: }aaaaaa {3:│}{4: ^ }{3:│}{4: }aaaaaa | {4: }aaaaaa │{4: ^ }│{4: }aaaaaa |
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }│{1:~ }|
{3:[No Name] [+] }{2:<[+] }{3:[No Name] [+] }| {3:[No Name] [+] }{2:<[+] }{3:[No Name] [+] }|
:set nowrap foldcolumn=4 | :set nowrap foldcolumn=4 |
]]) ]])
feed('4<C-W><lt>') feed('4<C-W><lt>')
screen:expect([[ screen:expect([[
{4: }aaa {3:│}{4: }{3:│}{4: }aaa | {4: }aaa │{4: }│{4: }aaa |
{4: } {3:│}{4: }{3:│}{4: } | {4: } │{4: }│{4: } |
{4: }a {3:│}{4: }{3:│}{4: }a | {4: }a │{4: }│{4: }a |
{4: }aaaaaa {3:│}{4:^ }{3:│}{4: }aaaaaa | {4: }aaaaaa │{4:^ }│{4: }aaaaaa |
{1:~ }{3:│}{1:~}{3:│}{1:~ }| {1:~ }│{1:~}│{1:~ }|
{1:~ }{3:│}{1:~}{3:│}{1:~ }| {1:~ }│{1:~}│{1:~ }|
{1:~ }{3:│}{1:~}{3:│}{1:~ }| {1:~ }│{1:~}│{1:~ }|
{1:~ }{3:│}{1:~}{3:│}{1:~ }| {1:~ }│{1:~}│{1:~ }|
{3:[No Name] [+] }{2:< }{3:[No Name] [+] }| {3:[No Name] [+] }{2:< }{3:[No Name] [+] }|
:set nowrap foldcolumn=4 | :set nowrap foldcolumn=4 |
]]) ]])

60
test/functional/options/cursorbind_spec.lua
View File

@@ -30,23 +30,23 @@ describe("'cursorbind'", function()
]]) ]])
feed('20l') feed('20l')
screen:expect([[ screen:expect([[
a bb cc dd ee ff gg {3:│}aa bb cc dd ee ff gg^ hh ii jj kk ll mm | a bb cc dd ee ff gg │aa bb cc dd ee ff gg^ hh ii jj kk ll mm |
{4: }{3:│} {4: } | {4: }│ {4: } |
{4: }{3:│} {4: } | {4: }│ {4: } |
{4: }{3:│} {4: } | {4: }│ {4: } |
{4: }{3:│} {4: } | {4: }│ {4: } |
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }| {3:[No Name] [+] }{2:[No Name] [+] }|
| |
]]) ]])
feed('10l') feed('10l')
screen:expect([[ screen:expect([[
hh ii jj kk ll mm n{3:│}aa bb cc dd ee ff gg hh ii jj ^kk ll mm | hh ii jj kk ll mm n│aa bb cc dd ee ff gg hh ii jj ^kk ll mm |
{4: } {3:│} {4: } | {4: } │ {4: } |
{4: } {3:│} {4: } | {4: } │ {4: } |
{4: } {3:│} {4: } | {4: } │ {4: } |
{4: } {3:│} {4: } | {4: } │ {4: } |
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }| {3:[No Name] [+] }{2:[No Name] [+] }|
| |
]]) ]])
@@ -54,23 +54,23 @@ describe("'cursorbind'", function()
feed('0') feed('0')
feed('20l') feed('20l')
screen:expect([[ 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:a bb cc dd ee ff gg }│{4:aa bb cc dd ee ff gg^ hh ii jj kk ll mm }|
{4: }{3:│} {4: } | {4: }│ {4: } |
{4: }{3:│} {4: } | {4: }│ {4: } |
{4: }{3:│} {4: } | {4: }│ {4: } |
{4: }{3:│} {4: } | {4: }│ {4: } |
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }| {3:[No Name] [+] }{2:[No Name] [+] }|
| |
]]) ]])
feed('10l') feed('10l')
screen:expect([[ 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: hh ii jj kk ll mm n}│{4:aa bb cc dd ee ff gg hh ii jj ^kk ll mm }|
{4: } {3:│} {4: } | {4: } │ {4: } |
{4: } {3:│} {4: } | {4: } │ {4: } |
{4: } {3:│} {4: } | {4: } │ {4: } |
{4: } {3:│} {4: } | {4: } │ {4: } |
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }| {3:[No Name] [+] }{2:[No Name] [+] }|
| |
]]) ]])
@@ -78,12 +78,12 @@ describe("'cursorbind'", function()
feed('0') feed('0')
feed('40l') feed('40l')
screen:expect([[ screen:expect([[
kk ll mm nn oo pp qq{3:│} bb cc dd ee ff gg hh ii jj kk ll mm n^n| kk ll mm nn oo pp qq│ bb cc dd ee ff gg hh ii jj kk ll mm n^n|
{3:│} | │ |
{3:│} | │ |
{3:│} | │ |
{3:│} | │ |
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }| {3:[No Name] [+] }{2:[No Name] [+] }|
| |
]]) ]])

1364
test/functional/ui/diff_spec.lua
View File

File diff suppressed because it is too large Load Diff

1
test/functional/ui/float_spec.lua
View File

@@ -22,6 +22,7 @@ local curbuf, curwin, curtab = helpers.curbuf, helpers.curwin, helpers.curtab
describe('float window', function() describe('float window', function()
before_each(function() before_each(function()
clear() clear()
command('hi VertSplit gui=reverse')
end) end)
local attrs = { local attrs = {
[0] = {bold=true, foreground=Screen.colors.Blue}, [0] = {bold=true, foreground=Screen.colors.Blue},

2
test/functional/ui/fold_spec.lua
View File

@@ -21,12 +21,14 @@ local content1 = [[
describe("folded lines", function() describe("folded lines", function()
before_each(function() before_each(function()
clear() clear()
command('hi VertSplit gui=reverse')
end) end)
local function with_ext_multigrid(multigrid) local function with_ext_multigrid(multigrid)
local screen local screen
before_each(function() before_each(function()
clear() clear()
command('hi VertSplit gui=reverse')
screen = Screen.new(45, 8) screen = Screen.new(45, 8)
screen:attach({rgb=true, ext_multigrid=multigrid}) screen:attach({rgb=true, ext_multigrid=multigrid})
screen:set_default_attr_ids({ screen:set_default_attr_ids({

142
test/functional/ui/global_statusline_spec.lua
View File

@@ -65,20 +65,20 @@ describe('global statusline', function()
it('works with splits', function() it('works with splits', function()
command('vsplit | split | vsplit | vsplit | wincmd l | split | 2wincmd l | split') command('vsplit | split | vsplit | vsplit | wincmd l | split | 2wincmd l | split')
screen:expect{grid=[[ screen:expect{grid=[[
{1:│} {1:│} {1:│}^ | │ │ │^ |
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:├────────────────┤}{2:~}{1:│}{2:~ }| {2:~ }├────────────────┤{2:~}│{2:~ }|
{2:~ }{1:│} {1:│}{2:~}{1:│}{2:~ }| {2:~ }│ │{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:├────────────────────}| {2:~ }│{2:~ }│{2:~}├────────────────────|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│} | {2:~ }│{2:~ }│{2:~}│ |
{1:────────────────────┴────────────────┴─┤}{2:~ }| ────────────────────┴────────────────┴─┤{2:~ }|
{1:│}{2:~ }| │{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{3:[No Name] 0,0-1 All}| {3:[No Name] 0,0-1 All}|
| |
]], attr_ids={ ]], attr_ids={
@@ -137,20 +137,20 @@ describe('global statusline', function()
command('vsplit | split | vsplit | vsplit | wincmd l | split | 2wincmd l | split') command('vsplit | split | vsplit | vsplit | wincmd l | split | 2wincmd l | split')
command('set laststatus=2') command('set laststatus=2')
screen:expect{grid=[[ screen:expect{grid=[[
{1:│} {1:│} {1:│}^ | │ │ │^ |
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│< Name] 0,0-1 │}{2:~}{1:│}{2:~ }| {2:~ }│{1:< Name] 0,0-1 }│{2:~}│{2:~ }|
{2:~ }{1:│} {1:│}{2:~}{1:│}{2:~ }| {2:~ }│ │{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{3:<No Name] 0,0-1 All}| {2:~ }│{2:~ }│{2:~}│{3:<No Name] 0,0-1 All}|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│} | {2:~ }│{2:~ }│{2:~}│ |
{1:<No Name] 0,0-1 All < Name] 0,0-1 <│}{2:~ }| {1:<No Name] 0,0-1 All < Name] 0,0-1 <}│{2:~ }|
{1:│}{2:~ }| │{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{1:[No Name] 0,0-1 All <No Name] 0,0-1 All}| {1:[No Name] 0,0-1 All <No Name] 0,0-1 All}|
| |
]], attr_ids={ ]], attr_ids={
@@ -161,20 +161,20 @@ describe('global statusline', function()
command('set laststatus=3') command('set laststatus=3')
screen:expect{grid=[[ screen:expect{grid=[[
{1:│} {1:│} {1:│}^ | │ │ │^ |
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:├────────────────┤}{2:~}{1:│}{2:~ }| {2:~ }├────────────────┤{2:~}│{2:~ }|
{2:~ }{1:│} {1:│}{2:~}{1:│}{2:~ }| {2:~ }│ │{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:├────────────────────}| {2:~ }│{2:~ }│{2:~}├────────────────────|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│} | {2:~ }│{2:~ }│{2:~}│ |
{1:────────────────────┴────────────────┴─┤}{2:~ }| ────────────────────┴────────────────┴─┤{2:~ }|
{1:│}{2:~ }| │{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{3:[No Name] 0,0-1 All}| {3:[No Name] 0,0-1 All}|
| |
]], attr_ids={ ]], attr_ids={
@@ -185,21 +185,21 @@ describe('global statusline', function()
command('set laststatus=0') command('set laststatus=0')
screen:expect{grid=[[ screen:expect{grid=[[
{1:│} {1:│} {1:│}^ | │ │ │^ |
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│< Name] 0,0-1 │}{2:~}{1:│}{2:~ }| {2:~ }│{1:< Name] 0,0-1 }│{2:~}│{2:~ }|
{2:~ }{1:│} {1:│}{2:~}{1:│}{2:~ }| {2:~ }│ │{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{3:<No Name] 0,0-1 All}| {2:~ }│{2:~ }│{2:~}│{3:<No Name] 0,0-1 All}|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│} | {2:~ }│{2:~ }│{2:~}│ |
{1:<No Name] 0,0-1 All < Name] 0,0-1 <│}{2:~ }| {1:<No Name] 0,0-1 All < Name] 0,0-1 <}│{2:~ }|
{1:│}{2:~ }| │{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
0,0-1 All | 0,0-1 All |
]], attr_ids={ ]], attr_ids={
[1] = {reverse = true}; [1] = {reverse = true};
@@ -209,20 +209,20 @@ describe('global statusline', function()
command('set laststatus=3') command('set laststatus=3')
screen:expect{grid=[[ screen:expect{grid=[[
{1:│} {1:│} {1:│}^ | │ │ │^ |
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:├────────────────┤}{2:~}{1:│}{2:~ }| {2:~ }├────────────────┤{2:~}│{2:~ }|
{2:~ }{1:│} {1:│}{2:~}{1:│}{2:~ }| {2:~ }│ │{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│}{2:~ }| {2:~ }│{2:~ }│{2:~}│{2:~ }|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:├────────────────────}| {2:~ }│{2:~ }│{2:~}├────────────────────|
{2:~ }{1:│}{2:~ }{1:│}{2:~}{1:│} | {2:~ }│{2:~ }│{2:~}│ |
{1:────────────────────┴────────────────┴─┤}{2:~ }| ────────────────────┴────────────────┴─┤{2:~ }|
{1:│}{2:~ }| │{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{2:~ }{1:│}{2:~ }| {2:~ }│{2:~ }|
{3:[No Name] 0,0-1 All}| {3:[No Name] 0,0-1 All}|
| |
]], attr_ids={ ]], attr_ids={

160
test/functional/ui/highlight_spec.lua
View File

@@ -104,12 +104,12 @@ describe('highlight defaults', function()
}) })
feed_command('sp', 'vsp', 'vsp') feed_command('sp', 'vsp', 'vsp')
screen:expect([[ screen:expect([[
^ {2:│} {2:│} | ^ │ │ |
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{1:[No Name] }{2:[No Name] [No Name] }| {1:[No Name] }{2:[No Name] [No Name] }|
| |
{0:~ }| {0:~ }|
@@ -122,12 +122,12 @@ describe('highlight defaults', function()
-- navigate to verify that the attributes are properly moved -- navigate to verify that the attributes are properly moved
feed('<c-w>j') feed('<c-w>j')
screen:expect([[ screen:expect([[
{2:│} {2:│} | │ │ |
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{2:[No Name] [No Name] [No Name] }| {2:[No Name] [No Name] [No Name] }|
^ | ^ |
{0:~ }| {0:~ }|
@@ -142,12 +142,12 @@ describe('highlight defaults', function()
-- (upstream vim has the same behavior) -- (upstream vim has the same behavior)
feed('<c-w>k<c-w>l') feed('<c-w>k<c-w>l')
screen:expect([[ screen:expect([[
{2:│}^ {2:│} | │^ │ |
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{2:[No Name] }{1:[No Name] }{2:[No Name] }| {2:[No Name] }{1:[No Name] }{2:[No Name] }|
| |
{0:~ }| {0:~ }|
@@ -159,12 +159,12 @@ describe('highlight defaults', function()
]]) ]])
feed('<c-w>l') feed('<c-w>l')
screen:expect([[ screen:expect([[
{2:│} {2:│}^ | │ │^ |
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{2:[No Name] [No Name] }{1:[No Name] }| {2:[No Name] [No Name] }{1:[No Name] }|
| |
{0:~ }| {0:~ }|
@@ -176,12 +176,12 @@ describe('highlight defaults', function()
]]) ]])
feed('<c-w>h<c-w>h') feed('<c-w>h<c-w>h')
screen:expect([[ screen:expect([[
^ {2:│} {2:│} | ^ │ │ |
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{2:│}{0:~ }{2:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{1:[No Name] }{2:[No Name] [No Name] }| {1:[No Name] }{2:[No Name] [No Name] }|
| |
{0:~ }| {0:~ }|
@@ -1185,31 +1185,31 @@ describe('CursorLine and CursorLineNr highlights', function()
feed('<esc>gg') feed('<esc>gg')
command('windo diffthis') command('windo diffthis')
screen:expect([[ screen:expect([[
{1: }{7:line 1 some text }{4:│}{1: }{7:^line 1 some text }| {1: }{7:line 1 some text }│{1: }{7:^line 1 some text }|
{1: }{3:line 2 mo}{2:Re text!}{3: }{4:│}{1: }{3:line 2 mo}{2:re text}{3: }| {1: }{3:line 2 mo}{2:Re text!}{3: }│{1: }{3:line 2 mo}{2:re text}{3: }|
{1: }{5:extra line! }{4:│}{1: }{6:----------------------}| {1: }{5:extra line! }│{1: }{6:----------------------}|
{1: }extra line! {4:│}{1: }extra line! | {1: }extra line! │{1: }extra line! |
{1: }extra line! {4:│}{1: }extra line! | {1: }extra line! │{1: }extra line! |
{1: }last line ... {4:│}{1: }last line ... | {1: }last line ... │{1: }last line ... |
{1: } {4:│}{1: } | {1: } │{1: } |
{8:~ }{4:│}{8:~ }| {8:~ }│{8:~ }|
{8:~ }{4:│}{8:~ }| {8:~ }│{8:~ }|
{8:~ }{4:│}{8:~ }| {8:~ }│{8:~ }|
{4:[No Name] [+] }{9:[No Name] [+] }| {4:[No Name] [+] }{9:[No Name] [+] }|
| |
]]) ]])
feed('jjjjj') feed('jjjjj')
screen:expect([[ screen:expect([[
{1: }line 1 some text {4:│}{1: }line 1 some text | {1: }line 1 some text │{1: }line 1 some text |
{1: }{3:line 2 mo}{2:Re text!}{3: }{4:│}{1: }{3:line 2 mo}{2:re text}{3: }| {1: }{3:line 2 mo}{2:Re text!}{3: }│{1: }{3:line 2 mo}{2:re text}{3: }|
{1: }{5:extra line! }{4:│}{1: }{6:----------------------}| {1: }{5:extra line! }│{1: }{6:----------------------}|
{1: }extra line! {4:│}{1: }extra line! | {1: }extra line! │{1: }extra line! |
{1: }extra line! {4:│}{1: }extra line! | {1: }extra line! │{1: }extra line! |
{1: }last line ... {4:│}{1: }last line ... | {1: }last line ... │{1: }last line ... |
{1: }{7: }{4:│}{1: }{7:^ }| {1: }{7: }│{1: }{7:^ }|
{8:~ }{4:│}{8:~ }| {8:~ }│{8:~ }|
{8:~ }{4:│}{8:~ }| {8:~ }│{8:~ }|
{8:~ }{4:│}{8:~ }| {8:~ }│{8:~ }|
{4:[No Name] [+] }{9:[No Name] [+] }| {4:[No Name] [+] }{9:[No Name] [+] }|
| |
]]) ]])
@@ -1219,16 +1219,16 @@ describe('CursorLine and CursorLineNr highlights', function()
command('hi CursorLine ctermbg=red ctermfg=NONE guibg=red guifg=NONE') command('hi CursorLine ctermbg=red ctermfg=NONE guibg=red guifg=NONE')
feed('kkkk') feed('kkkk')
screen:expect([[ screen:expect([[
{1: }line 1 some text {4:│}{1: }line 1 some text | {1: }line 1 some text │{1: }line 1 some text |
{1: }{11:line 2 mo}{12:Re text!}{11: }{4:│}{1: }{11:^line 2 mo}{12:re text}{11: }| {1: }{11:line 2 mo}{12:Re text!}{11: }│{1: }{11:^line 2 mo}{12:re text}{11: }|
{1: }{5:extra line! }{4:│}{1: }{6:----------------------}| {1: }{5:extra line! }│{1: }{6:----------------------}|
{1: }extra line! {4:│}{1: }extra line! | {1: }extra line! │{1: }extra line! |
{1: }extra line! {4:│}{1: }extra line! | {1: }extra line! │{1: }extra line! |
{1: }last line ... {4:│}{1: }last line ... | {1: }last line ... │{1: }last line ... |
{1: } {4:│}{1: } | {1: } │{1: } |
{8:~ }{4:│}{8:~ }| {8:~ }│{8:~ }|
{8:~ }{4:│}{8:~ }| {8:~ }│{8:~ }|
{8:~ }{4:│}{8:~ }| {8:~ }│{8:~ }|
{4:[No Name] [+] }{9:[No Name] [+] }| {4:[No Name] [+] }{9:[No Name] [+] }|
| |
]], { ]], {
@@ -1274,31 +1274,31 @@ describe('CursorLine and CursorLineNr highlights', function()
command('windo diffthis') command('windo diffthis')
command('1wincmd w') command('1wincmd w')
screen:expect([[ screen:expect([[
{1: }{9: }{2:-------------------}{3:│}{1: }{9: 1 }{4:baz }| {1: }{9: }{2:-------------------}│{1: }{9: 1 }{4:baz }|
{1: }{6: 1 }{5:^foo }{3:│}{1: }{6: 2 }{5:foo }| {1: }{6: 1 }{5:^foo }│{1: }{6: 2 }{5:foo }|
{1: }{9: 2 }foo {3:│}{1: }{9: 3 }foo | {1: }{9: 2 }foo │{1: }{9: 3 }foo |
{1: }{9: 3 }bar {3:│}{1: }{9: 4 }bar | {1: }{9: 3 }bar │{1: }{9: 4 }bar |
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{8:[No Name] [+] }{3:[No Name] [+] }| {8:[No Name] [+] }{3:[No Name] [+] }|
| |
]]) ]])
command('set cursorlineopt=number') command('set cursorlineopt=number')
screen:expect([[ screen:expect([[
{1: }{9: }{2:-------------------}{3:│}{1: }{9: 1 }{4:baz }| {1: }{9: }{2:-------------------}│{1: }{9: 1 }{4:baz }|
{1: }{6: 1 }^foo {3:│}{1: }{6: 2 }{5:foo }| {1: }{6: 1 }^foo │{1: }{6: 2 }{5:foo }|
{1: }{9: 2 }foo {3:│}{1: }{9: 3 }foo | {1: }{9: 2 }foo │{1: }{9: 3 }foo |
{1: }{9: 3 }bar {3:│}{1: }{9: 4 }bar | {1: }{9: 3 }bar │{1: }{9: 4 }bar |
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{7:~ }{3:│}{7:~ }| {7:~ }│{7:~ }|
{8:[No Name] [+] }{3:[No Name] [+] }| {8:[No Name] [+] }{3:[No Name] [+] }|
| |
]]) ]])

3
test/functional/ui/hlstate_spec.lua
View File

@@ -14,6 +14,7 @@ describe('ext_hlstate detailed highlights', function()
before_each(function() before_each(function()
clear() clear()
command('syntax on') command('syntax on')
command('hi VertSplit gui=reverse')
screen = Screen.new(40, 8) screen = Screen.new(40, 8)
screen:attach({ext_hlstate=true}) screen:attach({ext_hlstate=true})
end) end)
@@ -59,7 +60,7 @@ describe('ext_hlstate detailed highlights', function()
it('work with cleared UI highlights', function() it('work with cleared UI highlights', function()
screen:set_default_attr_ids({ screen:set_default_attr_ids({
[1] = {{}, {{hi_name = "VertSplit", ui_name = "WinSeparator", kind = "ui"}}}, [1] = {{}, {{hi_name = "Normal", ui_name = "WinSeparator", kind = "ui"}}},
[2] = {{bold = true, foreground = Screen.colors.Blue1}, [2] = {{bold = true, foreground = Screen.colors.Blue1},
{{hi_name = "NonText", ui_name = "EndOfBuffer", kind = "ui"}}}, {{hi_name = "NonText", ui_name = "EndOfBuffer", kind = "ui"}}},
[3] = {{bold = true, reverse = true}, [3] = {{bold = true, reverse = true},

68
test/functional/ui/inccommand_spec.lua
View File

@@ -1858,26 +1858,26 @@ describe("'inccommand' split windows", function()
feed_command("split") feed_command("split")
feed(":%s/tw") feed(":%s/tw")
screen:expect([[ screen:expect([[
Inc substitution on {10:│}Inc substitution on| Inc substitution on │Inc substitution on|
{12:tw}o lines {10:│}{12:tw}o lines | {12:tw}o lines │{12:tw}o lines |
{10:│} | │ |
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{11:[No Name] [+] }{10:│}{15:~ }| {11:[No Name] [+] }│{15:~ }|
Inc substitution on {10:│}{15:~ }| Inc substitution on │{15:~ }|
{12:tw}o lines {10:│}{15:~ }| {12:tw}o lines │{15:~ }|
{10:│}{15:~ }| │{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{10:[No Name] [+] [No Name] [+] }| {10:[No Name] [+] [No Name] [+] }|
|2| {12:tw}o lines | |2| {12:tw}o lines |
{15:~ }| {15:~ }|
@@ -1897,20 +1897,20 @@ describe("'inccommand' split windows", function()
feed(":%s/tw") feed(":%s/tw")
screen:expect([[ screen:expect([[
Inc substitution on {10:│}Inc substitution on| Inc substitution on │Inc substitution on|
{12:tw}o lines {10:│}{12:tw}o lines | {12:tw}o lines │{12:tw}o lines |
{10:│} | │ |
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{15:~ }{10:│}{15:~ }| {15:~ }│{15:~ }|
{11:[No Name] [+] }{10:[No Name] [+] }| {11:[No Name] [+] }{10:[No Name] [+] }|
Inc substitution on | Inc substitution on |
{12:tw}o lines | {12:tw}o lines |

6
test/functional/ui/messages_spec.lua
View File

@@ -1223,7 +1223,7 @@ describe('ui/ext_messages', function()
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
{6:────────────────────────────────────────────────────────────────────────────────}| ────────────────────────────────────────────────────────────────────────────────|
| |
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
@@ -1256,7 +1256,7 @@ describe('ui/ext_messages', function()
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
{6:────────────────────────────────────────────────────────────────────────────────}| ────────────────────────────────────────────────────────────────────────────────|
| |
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
@@ -1291,7 +1291,7 @@ describe('ui/ext_messages', function()
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
{6:────────────────────────────────────────────────────────────────────────────────}| ────────────────────────────────────────────────────────────────────────────────|
| |
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|

120
test/functional/ui/mouse_spec.lua
View File

@@ -595,54 +595,54 @@ describe('ui/mouse/input', function()
feed('ifoo\nbar<esc>') feed('ifoo\nbar<esc>')
screen:expect{grid=[[ screen:expect{grid=[[
testing {4:│}testing | testing │testing |
mouse {4:│}mouse | mouse │mouse |
support and selection {4:│}support and selection | support and selection │support and selection |
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│[No Name] [+] }| {0:~ }│{4:[No Name] [+] }|
{0:~ }{4:│}foo{0:$} | {0:~ }│foo{0:$} |
{0:~ }{4:│}ba^r{0:$} | {0:~ }│ba^r{0:$} |
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{4:[No Name] [+] }{5:[No Name] [+] }| {4:[No Name] [+] }{5:[No Name] [+] }|
| |
]]} ]]}
meths.input_mouse('left', 'press', '', 0, 6, 27) meths.input_mouse('left', 'press', '', 0, 6, 27)
screen:expect{grid=[[ screen:expect{grid=[[
testing {4:│}testing | testing │testing |
mouse {4:│}mouse | mouse │mouse |
support and selection {4:│}support and selection | support and selection │support and selection |
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│[No Name] [+] }| {0:~ }│{4:[No Name] [+] }|
{0:~ }{4:│}^foo{0:$} | {0:~ }│^foo{0:$} |
{0:~ }{4:│}bar{0:$} | {0:~ }│bar{0:$} |
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{4:[No Name] [+] }{5:[No Name] [+] }| {4:[No Name] [+] }{5:[No Name] [+] }|
| |
]]} ]]}
meths.input_mouse('left', 'drag', '', 0, 7, 30) meths.input_mouse('left', 'drag', '', 0, 7, 30)
screen:expect{grid=[[ screen:expect{grid=[[
testing {4:│}testing | testing │testing |
mouse {4:│}mouse | mouse │mouse |
support and selection {4:│}support and selection | support and selection │support and selection |
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│[No Name] [+] }| {0:~ }│{4:[No Name] [+] }|
{0:~ }{4:│}{1:foo}{3:$} | {0:~ }│{1:foo}{3:$} |
{0:~ }{4:│}{1:bar}{0:^$} | {0:~ }│{1:bar}{0:^$} |
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{4:[No Name] [+] }{5:[No Name] [+] }| {4:[No Name] [+] }{5:[No Name] [+] }|
{2:-- VISUAL --} | {2:-- VISUAL --} |
]]} ]]}
@@ -729,12 +729,12 @@ describe('ui/mouse/input', function()
feed('k') feed('k')
feed_command('sp', 'vsp') feed_command('sp', 'vsp')
screen:expect([[ screen:expect([[
lines {4:│}lines | lines │lines |
to {4:│}to | to │to |
test {4:│}test | test │test |
^mouse scrolling {4:│}mouse scrolling | ^mouse scrolling │mouse scrolling |
{4:│} | │ |
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{5:[No Name] [+] }{4:[No Name] [+] }| {5:[No Name] [+] }{4:[No Name] [+] }|
to | to |
test | test |
@@ -750,12 +750,12 @@ describe('ui/mouse/input', function()
feed('<ScrollWheelDown><0,0>') feed('<ScrollWheelDown><0,0>')
end end
screen:expect([[ screen:expect([[
^mouse scrolling {4:│}lines | ^mouse scrolling │lines |
{4:│}to | │to |
{0:~ }{4:│}test | {0:~ }│test |
{0:~ }{4:│}mouse scrolling | {0:~ }│mouse scrolling |
{0:~ }{4:│} | {0:~ }│ |
{0:~ }{4:│}{0:~ }| {0:~ }│{0:~ }|
{5:[No Name] [+] }{4:[No Name] [+] }| {5:[No Name] [+] }{4:[No Name] [+] }|
to | to |
test | test |
@@ -771,12 +771,12 @@ describe('ui/mouse/input', function()
feed('<ScrollWheelUp><27,0>') feed('<ScrollWheelUp><27,0>')
end end
screen:expect([[ screen:expect([[
^mouse scrolling {4:│}text | ^mouse scrolling │text |
{4:│}with | │with |
{0:~ }{4:│}many | {0:~ }│many |
{0:~ }{4:│}lines | {0:~ }│lines |
{0:~ }{4:│}to | {0:~ }│to |
{0:~ }{4:│}test | {0:~ }│test |
{5:[No Name] [+] }{4:[No Name] [+] }| {5:[No Name] [+] }{4:[No Name] [+] }|
to | to |
test | test |
@@ -793,12 +793,12 @@ describe('ui/mouse/input', function()
feed('<ScrollWheelUp><27,7><ScrollWheelUp>') feed('<ScrollWheelUp><27,7><ScrollWheelUp>')
end end
screen:expect([[ screen:expect([[
^mouse scrolling {4:│}text | ^mouse scrolling │text |
{4:│}with | │with |
{0:~ }{4:│}many | {0:~ }│many |
{0:~ }{4:│}lines | {0:~ }│lines |
{0:~ }{4:│}to | {0:~ }│to |
{0:~ }{4:│}test | {0:~ }│test |
{5:[No Name] [+] }{4:[No Name] [+] }| {5:[No Name] [+] }{4:[No Name] [+] }|
Inserting | Inserting |
text | text |

362
test/functional/ui/multigrid_spec.lua
View File

@@ -77,18 +77,18 @@ describe('ext_multigrid', function()
command('vsplit') command('vsplit')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
{11:[No Name] }{12:[No Name] }| {11:[No Name] }{12:[No Name] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -129,18 +129,18 @@ describe('ext_multigrid', function()
command('split') command('split')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}{11:[No Name] }| [4:--------------------------]│{11:[No Name] }|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
{12:[No Name] [No Name] }| {12:[No Name] [No Name] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -300,12 +300,12 @@ describe('ext_multigrid', function()
command('vsp') command('vsp')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
{11:[No Name] }{12:[No Name] [No Name] }| {11:[No Name] }{12:[No Name] [No Name] }|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
@@ -347,12 +347,12 @@ describe('ext_multigrid', function()
insert('hello') insert('hello')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
[6:--------------------]{12:│}[5:----------------]{12:│}[4:---------------]| [6:--------------------]│[5:----------------]│[4:---------------]|
{11:[No Name] [+] }{12:[No Name] [+] [No Name] [+] }| {11:[No Name] [+] }{12:[No Name] [+] [No Name] [+] }|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
@@ -467,18 +467,18 @@ describe('ext_multigrid', function()
command('vsp') command('vsp')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
{11:[No Name] }{12:[No Name] }| {11:[No Name] }{12:[No Name] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -516,18 +516,18 @@ describe('ext_multigrid', function()
command('vertical resize 10') command('vertical resize 10')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
[4:----------]{12:│}[2:------------------------------------------]| [4:----------]│[2:------------------------------------------]|
{11:<No Name] }{12:[No Name] }| {11:<No Name] }{12:[No Name] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -565,18 +565,18 @@ describe('ext_multigrid', function()
command('sp') command('sp')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
{11:[No Name] }{12:│}[2:--------------------------]| {11:[No Name] }│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
{12:[No Name] [No Name] }| {12:[No Name] [No Name] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -611,18 +611,18 @@ describe('ext_multigrid', function()
insert('hello') insert('hello')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
{11:[No Name] [+] }{12:│}[2:--------------------------]| {11:[No Name] [+] }│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
{12:[No Name] [+] [No Name] [+] }| {12:[No Name] [+] [No Name] [+] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -659,18 +659,18 @@ describe('ext_multigrid', function()
command('vsp') command('vsp')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
{11:[No Name] }{12:[No Name] }| {11:[No Name] }{12:[No Name] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -1056,12 +1056,12 @@ describe('ext_multigrid', function()
command('vsp') command('vsp')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
{11:[No Name] }{12:[No Name] }| {11:[No Name] }{12:[No Name] }|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
@@ -1097,12 +1097,12 @@ describe('ext_multigrid', function()
feed(":echoerr 'very' | echoerr 'much' | echoerr 'fail'<cr>") feed(":echoerr 'very' | echoerr 'much' | echoerr 'fail'<cr>")
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
{11:[No Name] }{12:[No Name] }| {11:[No Name] }{12:[No Name] }|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
@@ -1141,12 +1141,12 @@ describe('ext_multigrid', function()
feed('<cr>') feed('<cr>')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
{11:[No Name] }{12:[No Name] }| {11:[No Name] }{12:[No Name] }|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
@@ -1242,12 +1242,12 @@ describe('ext_multigrid', function()
feed("<c-c>") feed("<c-c>")
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
[5:--------------------------]{12:│}[4:--------------------------]| [5:--------------------------]│[4:--------------------------]|
{11:[No Name] }{12:[No Name] }| {11:[No Name] }{12:[No Name] }|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
[2:-----------------------------------------------------]| [2:-----------------------------------------------------]|
@@ -1285,18 +1285,18 @@ describe('ext_multigrid', function()
command('vsp') command('vsp')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
{11:[No Name] }{12:[No Name] }| {11:[No Name] }{12:[No Name] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -1453,17 +1453,17 @@ describe('ext_multigrid', function()
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
{7: }{18:2}{7: [No Name] }{16: }{17:2}{16: [No Name] }{12: }{16:X}| {7: }{18:2}{7: [No Name] }{16: }{17:2}{16: [No Name] }{12: }{16:X}|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
{11:[No Name] }{12:[No Name] }| {11:[No Name] }{12:[No Name] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -1637,18 +1637,18 @@ describe('ext_multigrid', function()
command('tabclose') command('tabclose')
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
{11:[No Name] }{12:[No Name] }| {11:[No Name] }{12:[No Name] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -1960,13 +1960,13 @@ describe('ext_multigrid', function()
[4:-----------------------------------------------------]| [4:-----------------------------------------------------]|
[4:-----------------------------------------------------]| [4:-----------------------------------------------------]|
{12:[No Name] [+] }| {12:[No Name] [+] }|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
[5:--------------------------]{12:│}[2:--------------------------]| [5:--------------------------]│[2:--------------------------]|
{11:[No Name] [+] }{12:[No Name] [+] }| {11:[No Name] [+] }{12:[No Name] [+] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -2002,13 +2002,13 @@ describe('ext_multigrid', function()
[4:-----------------------------------------------------]| [4:-----------------------------------------------------]|
[4:-----------------------------------------------------]| [4:-----------------------------------------------------]|
{12:[No Name] [+] }| {12:[No Name] [+] }|
[5:------------------------------]{12:│}[2:----------------------]| [5:------------------------------]│[2:----------------------]|
[5:------------------------------]{12:│}[2:----------------------]| [5:------------------------------]│[2:----------------------]|
[5:------------------------------]{12:│}[2:----------------------]| [5:------------------------------]│[2:----------------------]|
[5:------------------------------]{12:│}[2:----------------------]| [5:------------------------------]│[2:----------------------]|
[5:------------------------------]{12:│}[2:----------------------]| [5:------------------------------]│[2:----------------------]|
[5:------------------------------]{12:│}[2:----------------------]| [5:------------------------------]│[2:----------------------]|
[5:------------------------------]{12:│}[2:----------------------]| [5:------------------------------]│[2:----------------------]|
{11:[No Name] [+] }{12:[No Name] [+] }| {11:[No Name] [+] }{12:[No Name] [+] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2
@@ -2049,18 +2049,18 @@ describe('ext_multigrid', function()
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}[5:--------------------------]| [4:--------------------------]│[5:--------------------------]|
[4:--------------------------]{12:│}{11:[No Name] [+] }| [4:--------------------------]│{11:[No Name] [+] }|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
[4:--------------------------]{12:│}[2:--------------------------]| [4:--------------------------]│[2:--------------------------]|
{12:[No Name] [No Name] }| {12:[No Name] [No Name] }|
[3:-----------------------------------------------------]| [3:-----------------------------------------------------]|
## grid 2 ## grid 2

108
test/functional/ui/popupmenu_spec.lua
View File

@@ -953,72 +953,72 @@ describe('builtin popupmenu', function()
insert('aaa aab aac\n') insert('aaa aab aac\n')
feed(':vsplit<cr>') feed(':vsplit<cr>')
screen:expect([[ screen:expect([[
aaa aab aac {3:│}aaa aab aac| aaa aab aac │aaa aab aac|
^ {3:│} | ^ │ |
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{4:[No Name] [+] }{3:<Name] [+] }| {4:[No Name] [+] }{3:<Name] [+] }|
:vsplit | :vsplit |
]]) ]])
feed('ibbb a<c-x><c-n>') feed('ibbb a<c-x><c-n>')
screen:expect([[ screen:expect([[
aaa aab aac {3:│}aaa aab aac| aaa aab aac │aaa aab aac|
bbb aaa^ {3:│}bbb aaa | bbb aaa^ │bbb aaa |
{1:~ }{s: aaa }{1: }{3:│}{1:~ }| {1:~ }{s: aaa }{1: }│{1:~ }|
{1:~ }{n: aab }{1: }{3:│}{1:~ }| {1:~ }{n: aab }{1: }│{1:~ }|
{1:~ }{n: aac }{1: }{3:│}{1:~ }| {1:~ }{n: aac }{1: }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{4:[No Name] [+] }{3:<Name] [+] }| {4:[No Name] [+] }{3:<Name] [+] }|
{2:-- }{5:match 1 of 3} | {2:-- }{5:match 1 of 3} |
]]) ]])
feed('<esc><c-w><c-w>oc a<c-x><c-n>') feed('<esc><c-w><c-w>oc a<c-x><c-n>')
screen:expect([[ screen:expect([[
aaa aab aac{3:│}aaa aab aac | aaa aab aac│aaa aab aac |
bbb aaa {3:│}bbb aaa | bbb aaa │bbb aaa |
c aaa {3:│}c aaa^ | c aaa │c aaa^ |
{1:~ }{3:│}{1:~}{s: aaa }{1: }| {1:~ }│{1:~}{s: aaa }{1: }|
{1:~ }{3:│}{1:~}{n: aab }{1: }| {1:~ }│{1:~}{n: aab }{1: }|
{1:~ }{3:│}{1:~}{n: aac }{1: }| {1:~ }│{1:~}{n: aac }{1: }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{1:~ }{3:│}{1:~ }| {1:~ }│{1:~ }|
{3:<Name] [+] }{4:[No Name] [+] }| {3:<Name] [+] }{4:[No Name] [+] }|
{2:-- }{5:match 1 of 3} | {2:-- }{5:match 1 of 3} |
]]) ]])

192
test/functional/ui/screen_basic_spec.lua
View File

@@ -326,12 +326,12 @@ local function screen_tests(linegrid)
command('vsp') command('vsp')
command('vsp') command('vsp')
screen:expect([[ screen:expect([[
^ {3:│} {3:│} | ^ │ │ |
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{1:[No Name] }{3:[No Name] [No Name] }| {1:[No Name] }{3:[No Name] [No Name] }|
| |
{0:~ }| {0:~ }|
@@ -343,12 +343,12 @@ local function screen_tests(linegrid)
]]) ]])
insert('hello') insert('hello')
screen:expect([[ screen:expect([[
hell^o {3:│}hello {3:│}hello | hell^o │hello │hello |
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
hello | hello |
{0:~ }| {0:~ }|
@@ -369,12 +369,12 @@ local function screen_tests(linegrid)
command('vsp') command('vsp')
insert('hello') insert('hello')
screen:expect([[ screen:expect([[
hell^o {3:│}hello {3:│}hello | hell^o │hello │hello |
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
hello | hello |
{0:~ }| {0:~ }|
@@ -406,12 +406,12 @@ local function screen_tests(linegrid)
command('tabprevious') command('tabprevious')
screen:expect([[ screen:expect([[
{2: }{6:4}{2:+ [No Name] }{4: + [No Name] }{3: }{4:X}| {2: }{6:4}{2:+ [No Name] }{4: + [No Name] }{3: }{4:X}|
hell^o {3:│}hello {3:│}hello | hell^o │hello │hello |
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{0:~ }{3:│}{0:~ }{3:│}{0:~ }| {0:~ }│{0:~ }│{0:~ }|
{1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
hello | hello |
{0:~ }| {0:~ }|
@@ -520,36 +520,36 @@ local function screen_tests(linegrid)
command('vsplit') command('vsplit')
screen:expect([[ screen:expect([[
^foo {3:│}foo | ^foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
{1:[No Name] [+] }{3:[No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] }|
| |
]]) ]])
feed('<PageDown>') feed('<PageDown>')
screen:expect([[ screen:expect([[
^foo {3:│}foo | ^foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
foo {3:│}foo | foo │foo |
bar {3:│}foo | bar │foo |
bar {3:│}foo | bar │foo |
bar {3:│}foo | bar │foo |
bar {3:│}foo | bar │foo |
bar {3:│}foo | bar │foo |
bar {3:│}foo | bar │foo |
bar {3:│}foo | bar │foo |
bar {3:│}foo | bar │foo |
{1:[No Name] [+] }{3:[No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] }|
| |
]]) ]])
@@ -748,12 +748,12 @@ local function screen_tests(linegrid)
command('vsp') command('vsp')
command('vsp') command('vsp')
screen:expect([[ screen:expect([[
and {3:│}and {3:│}and | and │and │and |
clearing {3:│}clearing {3:│}clearing | clearing │clearing │clearing |
in {3:│}in {3:│}in | in │in │in |
split {3:│}split {3:│}split | split │split │split |
windows {3:│}windows {3:│}windows | windows │windows │windows |
^ {3:│} {3:│} | ^ │ │ |
{1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
clearing | clearing |
in | in |
@@ -768,12 +768,12 @@ local function screen_tests(linegrid)
it('only affects the current scroll region', function() it('only affects the current scroll region', function()
feed('6k') feed('6k')
screen:expect([[ screen:expect([[
^scrolling {3:│}and {3:│}and | ^scrolling │and │and |
and {3:│}clearing {3:│}clearing | and │clearing │clearing |
clearing {3:│}in {3:│}in | clearing │in │in |
in {3:│}split {3:│}split | in │split │split |
split {3:│}windows {3:│}windows | split │windows │windows |
windows {3:│} {3:│} | windows │ │ |
{1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }| {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
clearing | clearing |
in | in |
@@ -785,12 +785,12 @@ local function screen_tests(linegrid)
]]) ]])
feed('<c-w>l') feed('<c-w>l')
screen:expect([[ screen:expect([[
scrolling {3:│}and {3:│}and | scrolling │and │and |
and {3:│}clearing {3:│}clearing | and │clearing │clearing |
clearing {3:│}in {3:│}in | clearing │in │in |
in {3:│}split {3:│}split | in │split │split |
split {3:│}windows {3:│}windows | split │windows │windows |
windows {3:│}^ {3:│} | windows │^ │ |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
@@ -802,12 +802,12 @@ local function screen_tests(linegrid)
]]) ]])
feed('gg') feed('gg')
screen:expect([[ screen:expect([[
scrolling {3:│}^Inserting {3:│}and | scrolling │^Inserting │and |
and {3:│}text {3:│}clearing | and │text │clearing |
clearing {3:│}with {3:│}in | clearing │with │in |
in {3:│}many {3:│}split | in │many │split |
split {3:│}lines {3:│}windows | split │lines │windows |
windows {3:│}to {3:│} | windows │to │ |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
@@ -819,12 +819,12 @@ local function screen_tests(linegrid)
]]) ]])
feed('7j') feed('7j')
screen:expect([[ screen:expect([[
scrolling {3:│}with {3:│}and | scrolling │with │and |
and {3:│}many {3:│}clearing | and │many │clearing |
clearing {3:│}lines {3:│}in | clearing │lines │in |
in {3:│}to {3:│}split | in │to │split |
split {3:│}test {3:│}windows | split │test │windows |
windows {3:│}^scrolling {3:│} | windows │^scrolling │ |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
@@ -836,12 +836,12 @@ local function screen_tests(linegrid)
]]) ]])
feed('2j') feed('2j')
screen:expect([[ screen:expect([[
scrolling {3:│}lines {3:│}and | scrolling │lines │and |
and {3:│}to {3:│}clearing | and │to │clearing |
clearing {3:│}test {3:│}in | clearing │test │in |
in {3:│}scrolling {3:│}split | in │scrolling │split |
split {3:│}and {3:│}windows | split │and │windows |
windows {3:│}^clearing {3:│} | windows │^clearing │ |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
@@ -853,12 +853,12 @@ local function screen_tests(linegrid)
]]) ]])
feed('5k') feed('5k')
screen:expect([[ screen:expect([[
scrolling {3:│}^lines {3:│}and | scrolling │^lines │and |
and {3:│}to {3:│}clearing | and │to │clearing |
clearing {3:│}test {3:│}in | clearing │test │in |
in {3:│}scrolling {3:│}split | in │scrolling │split |
split {3:│}and {3:│}windows | split │and │windows |
windows {3:│}clearing {3:│} | windows │clearing │ |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
@@ -870,12 +870,12 @@ local function screen_tests(linegrid)
]]) ]])
feed('k') feed('k')
screen:expect([[ screen:expect([[
scrolling {3:│}^many {3:│}and | scrolling │^many │and |
and {3:│}lines {3:│}clearing | and │lines │clearing |
clearing {3:│}to {3:│}in | clearing │to │in |
in {3:│}test {3:│}split | in │test │split |
split {3:│}scrolling {3:│}windows | split │scrolling │windows |
windows {3:│}and {3:│} | windows │and │ |
{3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }| {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |