mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-21 17:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: don't ignore highlights in screen_basic_spec

Browse Source
This commit is contained in:
Björn Linse
2016-08-09 15:04:43 +02:00
parent 82b434dd51
commit 0a882b4818
1 changed files with 222 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,10 @@ describe('Initial screen', function()
set_session(screen_nvim) set_session(screen_nvim)
screen = Screen.new() screen = Screen.new()
screen:attach() screen:attach()
screen:set_default_attr_ignore( {{bold=true, foreground=255}} ) screen:set_default_attr_ids( {
[0] = {bold=true, foreground=255},
[1] = {bold=true, reverse=true},
} )
end) end)
after_each(function() after_each(function()
@@ -25,18 +28,18 @@ describe('Initial screen', function()
it('is the default initial screen', function() it('is the default initial screen', function()
screen:expect([[ screen:expect([[
^ | ^ |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
[No Name] | {1:[No Name] }|
| |
]]) ]])
end) end)
@@ -49,7 +52,16 @@ describe('Screen', function()
clear() clear()
screen = Screen.new() screen = Screen.new()
screen:attach() screen:attach()
screen:set_default_attr_ignore( {{bold=true, foreground=255}} ) screen:set_default_attr_ids( {
[0] = {bold=true, foreground=255},
[1] = {bold=true, reverse=true},
[2] = {bold=true},
[3] = {reverse=true},
[4] = {background = Screen.colors.LightGrey, underline = true},
[5] = {background = Screen.colors.LightGrey, underline = true, bold = true, foreground = Screen.colors.Fuchsia},
[6] = {bold = true, foreground = Screen.colors.Fuchsia},
[7] = {bold = true, foreground = Screen.colors.SeaGreen},
} )
end) end)
after_each(function() after_each(function()
@@ -147,18 +159,18 @@ describe('Screen', function()
execute('sp') execute('sp')
screen:expect([[ screen:expect([[
^ | ^ |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
[No Name] | {1:[No Name] }|
| |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
[No Name] | {3:[No Name] }|
:sp | :sp |
]]) ]])
end) end)
@@ -168,18 +180,18 @@ describe('Screen', function()
execute('resize 8') execute('resize 8')
screen:expect([[ screen:expect([[
^ | ^ |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
[No Name] | {1:[No Name] }|
| |
~ | {0:~ }|
~ | {0:~ }|
[No Name] | {3:[No Name] }|
:resize 8 | :resize 8 |
]]) ]])
end) end)
@@ -187,36 +199,36 @@ describe('Screen', function()
it('horizontal and vertical', function() it('horizontal and vertical', function()
execute('sp', 'vsp', 'vsp') execute('sp', 'vsp', 'vsp')
screen:expect([[ 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:~ }|
[No Name] [No Name] [No Name] | {1:[No Name] }{3:[No Name] [No Name] }|
| |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
[No Name] | {3:[No Name] }|
| |
]]) ]])
insert('hello') insert('hello')
screen:expect([[ screen:expect([[
hell^o |hello |hello | 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:~ }|
[No Name] [+] [No Name] [+] [No Name] [+] | {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
hello | hello |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
[No Name] [+] | {3:[No Name] [+] }|
| |
]]) ]])
end) end)
@@ -228,55 +240,55 @@ describe('Screen', function()
execute('sp', 'vsp', 'vsp') execute('sp', 'vsp', 'vsp')
insert('hello') insert('hello')
screen:expect([[ screen:expect([[
hell^o |hello |hello | 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:~ }|
[No Name] [+] [No Name] [+] [No Name] [+] | {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
hello | hello |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
[No Name] [+] | {3:[No Name] [+] }|
| |
]]) ]])
execute('tabnew') execute('tabnew')
insert('hello2') insert('hello2')
feed('h') feed('h')
screen:expect([[ screen:expect([[
4+ [No Name] + [No Name] X| {4: }{5:4}{4:+ [No Name] }{2: + [No Name] }{3: }{4:X}|
hell^o2 | hell^o2 |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
| |
]]) ]])
execute('tabprevious') execute('tabprevious')
screen:expect([[ screen:expect([[
4+ [No Name] + [No Name] X| {2: }{6:4}{2:+ [No Name] }{4: + [No Name] }{3: }{4:X}|
hell^o |hello |hello | 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:~ }|
[No Name] [+] [No Name] [+] [No Name] [+] | {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
hello | hello |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
[No Name] [+] | {3:[No Name] [+] }|
| |
]]) ]])
end) end)
@@ -289,17 +301,17 @@ describe('Screen', function()
line 1 | line 1 |
line 2 | line 2 |
^ | ^ |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
-- INSERT -- | {2:-- INSERT --} |
]]) ]])
end) end)
end) end)
@@ -314,17 +326,17 @@ describe('Screen', function()
screen:expect([[ screen:expect([[
0123^456 | 0123^456 |
789 | 789 |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
:set ruler 1,5 All | :set ruler 1,5 All |
]]) ]])
end) end)
@@ -335,18 +347,18 @@ describe('Screen', function()
feed(':ls') feed(':ls')
screen:expect([[ screen:expect([[
| |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
:ls^ | :ls^ |
]]) ]])
end) end)
@@ -354,20 +366,20 @@ describe('Screen', function()
it('execute command with multi-line output', function() it('execute command with multi-line output', function()
feed(':ls<cr>') feed(':ls<cr>')
screen:expect([[ screen:expect([[
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
:ls | :ls |
1 %a "[No Name]" line 1 | 1 %a "[No Name]" line 1 |
Press ENTER or type command to continue^ | {7:Press ENTER or type command to continue}^ |
]]) ]])
feed('<cr>') -- skip the "Press ENTER..." state or tests will hang feed('<cr>') -- skip the "Press ENTER..." state or tests will hang
end) end)
@@ -392,19 +404,19 @@ describe('Screen', function()
]]) ]])
execute('sp', 'vsp', 'vsp') execute('sp', 'vsp', 'vsp')
screen:expect([[ screen:expect([[
and |and |and | and {3:|}and {3:|}and |
clearing |clearing |clearing | clearing {3:|}clearing {3:|}clearing |
in |in |in | in {3:|}in {3:|}in |
split |split |split | split {3:|}split {3:|}split |
windows |windows |windows | windows {3:|}windows {3:|}windows |
^ | | | ^ {3:|} {3:|} |
[No Name] [+] [No Name] [+] [No Name] [+] | {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
clearing | clearing |
in | in |
split | split |
windows | windows |
| |
[No Name] [+] | {3:[No Name] [+] }|
| |
]]) ]])
end) end)
@@ -412,121 +424,121 @@ describe('Screen', function()
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 |and |and | ^scrolling {3:|}and {3:|}and |
and |clearing |clearing | and {3:|}clearing {3:|}clearing |
clearing |in |in | clearing {3:|}in {3:|}in |
in |split |split | in {3:|}split {3:|}split |
split |windows |windows | split {3:|}windows {3:|}windows |
windows | | | windows {3:|} {3:|} |
[No Name] [+] [No Name] [+] [No Name] [+] | {1:[No Name] [+] }{3:[No Name] [+] [No Name] [+] }|
clearing | clearing |
in | in |
split | split |
windows | windows |
| |
[No Name] [+] | {3:[No Name] [+] }|
| |
]]) ]])
feed('<c-w>l') feed('<c-w>l')
screen:expect([[ screen:expect([[
scrolling |and |and | scrolling {3:|}and {3:|}and |
and |clearing |clearing | and {3:|}clearing {3:|}clearing |
clearing |in |in | clearing {3:|}in {3:|}in |
in |split |split | in {3:|}split {3:|}split |
split |windows |windows | split {3:|}windows {3:|}windows |
windows |^ | | windows {3:|}^ {3:|} |
[No Name] [+] [No Name] [+] <Name] [+] | {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
split | split |
windows | windows |
| |
[No Name] [+] | {3:[No Name] [+] }|
| |
]]) ]])
feed('gg') feed('gg')
screen:expect([[ screen:expect([[
scrolling |^Inserting |and | scrolling {3:|}^Inserting {3:|}and |
and |text |clearing | and {3:|}text {3:|}clearing |
clearing |with |in | clearing {3:|}with {3:|}in |
in |many |split | in {3:|}many {3:|}split |
split |lines |windows | split {3:|}lines {3:|}windows |
windows |to | | windows {3:|}to {3:|} |
[No Name] [+] [No Name] [+] <Name] [+] | {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
split | split |
windows | windows |
| |
[No Name] [+] | {3:[No Name] [+] }|
| |
]]) ]])
feed('7j') feed('7j')
screen:expect([[ screen:expect([[
scrolling |with |and | scrolling {3:|}with {3:|}and |
and |many |clearing | and {3:|}many {3:|}clearing |
clearing |lines |in | clearing {3:|}lines {3:|}in |
in |to |split | in {3:|}to {3:|}split |
split |test |windows | split {3:|}test {3:|}windows |
windows |^scrolling | | windows {3:|}^scrolling {3:|} |
[No Name] [+] [No Name] [+] <Name] [+] | {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
split | split |
windows | windows |
| |
[No Name] [+] | {3:[No Name] [+] }|
| |
]]) ]])
feed('2j') feed('2j')
screen:expect([[ screen:expect([[
scrolling |lines |and | scrolling {3:|}lines {3:|}and |
and |to |clearing | and {3:|}to {3:|}clearing |
clearing |test |in | clearing {3:|}test {3:|}in |
in |scrolling |split | in {3:|}scrolling {3:|}split |
split |and |windows | split {3:|}and {3:|}windows |
windows |^clearing | | windows {3:|}^clearing {3:|} |
[No Name] [+] [No Name] [+] <Name] [+] | {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
split | split |
windows | windows |
| |
[No Name] [+] | {3:[No Name] [+] }|
| |
]]) ]])
feed('5k') feed('5k')
screen:expect([[ screen:expect([[
scrolling |^lines |and | scrolling {3:|}^lines {3:|}and |
and |to |clearing | and {3:|}to {3:|}clearing |
clearing |test |in | clearing {3:|}test {3:|}in |
in |scrolling |split | in {3:|}scrolling {3:|}split |
split |and |windows | split {3:|}and {3:|}windows |
windows |clearing | | windows {3:|}clearing {3:|} |
[No Name] [+] [No Name] [+] <Name] [+] | {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
split | split |
windows | windows |
| |
[No Name] [+] | {3:[No Name] [+] }|
| |
]]) ]])
feed('k') feed('k')
screen:expect([[ screen:expect([[
scrolling |^many |and | scrolling {3:|}^many {3:|}and |
and |lines |clearing | and {3:|}lines {3:|}clearing |
clearing |to |in | clearing {3:|}to {3:|}in |
in |test |split | in {3:|}test {3:|}split |
split |scrolling |windows | split {3:|}scrolling {3:|}windows |
windows |and | | windows {3:|}and {3:|} |
[No Name] [+] [No Name] [+] <Name] [+] | {3:[No Name] [+] }{1:[No Name] [+] }{3:<Name] [+] }|
clearing | clearing |
in | in |
split | split |
windows | windows |
| |
[No Name] [+] | {3:[No Name] [+] }|
| |
]]) ]])
end) end)
@@ -541,10 +553,10 @@ describe('Screen', function()
it('rebuilds the whole screen', function() it('rebuilds the whole screen', function()
screen:expect([[ screen:expect([[
resize^ | resize^ |
~ | {0:~ }|
~ | {0:~ }|
~ | {0:~ }|
-- INSERT -- | {2:-- INSERT --} |
]]) ]])
end) end)