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

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
18 changed files with 1405 additions and 1401 deletions

View File

@@ -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",

View File

@@ -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}|
|
]])

View File

@@ -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] |
]])

View File

@@ -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:~ }|
^aaaa |
abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb|
abbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
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|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbba|
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb a|
{1:~ }b|
{1:~ }b|
{1:~ }b|
{1:~ }b|
{1:~ }{1:@}|
{2:[No Name] [+] }{3:<}|
|
]])

View File

@@ -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 |
]])

View File

@@ -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 naa 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] [+] }|
|
]])

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

@@ -14,6 +14,7 @@ describe('ext_hlstate detailed highlights', function()
before_each(function()
clear()
command('syntax on')
command('hi VertSplit gui=reverse')
screen = Screen.new(40, 8)
screen:attach({ext_hlstate=true})
end)
@@ -59,7 +60,7 @@ describe('ext_hlstate detailed highlights', function()
it('work with cleared UI highlights', function()
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},
{{hi_name = "NonText", ui_name = "EndOfBuffer", kind = "ui"}}},
[3] = {{bold = true, reverse = true},

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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