mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-05 18:24:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests/ui: Also test character at cursor

Browse Source
This commit is contained in:
Björn Linse
2015-03-05 10:07:55 +01:00
committed by Thiago de Arruda
parent 638452da2a
commit a7aeda8c7a
9 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/functional/legacy/051_highlight_spec.lua
View File

@@ -28,7 +28,7 @@ describe(':highlight', function()
gui=bold | gui=bold |
guifg=Blue | guifg=Blue |
Directory xxx ctermfg=4 | Directory xxx ctermfg=4 |
-- More --^ | -- More --^ |
]]) ]])
feed('q') feed('q')
wait() -- wait until we're back to normal wait() -- wait until we're back to normal

2
test/functional/legacy/107_adjust_window_and_contents_spec.lua
View File

@@ -43,7 +43,7 @@ describe('107', function()
start: | start: |
[1, '1 '] | [1, '1 '] |
[50, '50 '] | [50, '50 '] |
^59, '59 '] | ^[59, '59 '] |
~ | ~ |
~ | ~ |
~ | ~ |

12
test/functional/shell/viml_system_spec.lua
View File

@@ -60,7 +60,7 @@ describe('system()', function()
it('`echo` and waits for its return', function() it('`echo` and waits for its return', function()
feed(':call system("echo")<cr>') feed(':call system("echo")<cr>')
screen:expect([[ screen:expect([[
^ | ^ |
~ | ~ |
~ | ~ |
~ | ~ |
@@ -93,11 +93,11 @@ describe('system()', function()
~ | ~ |
~ | ~ |
~ | ~ |
^call system("yes") | ^:call system("yes") |
]]) ]])
feed('<c-c>') feed('<c-c>')
screen:expect([[ screen:expect([[
^ | ^ |
~ | ~ |
~ | ~ |
~ | ~ |
@@ -226,7 +226,7 @@ describe('systemlist()', function()
it('`echo` and waits for its return', function() it('`echo` and waits for its return', function()
feed(':call systemlist("echo")<cr>') feed(':call systemlist("echo")<cr>')
screen:expect([[ screen:expect([[
^ | ^ |
~ | ~ |
~ | ~ |
~ | ~ |
@@ -259,11 +259,11 @@ describe('systemlist()', function()
~ | ~ |
~ | ~ |
~ | ~ |
^call systemlist("yes | xargs") | ^:call systemlist("yes | xargs") |
]]) ]])
feed('<c-c>') feed('<c-c>')
screen:expect([[ screen:expect([[
^ | ^ |
~ | ~ |
~ | ~ |
~ | ~ |

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

@@ -54,7 +54,7 @@ describe('Default highlight groups', function()
}) })
execute('sp', 'vsp', 'vsp') execute('sp', 'vsp', 'vsp')
screen:expect([[ screen:expect([[
^ {2:|} {2:|} | ^ {2:|} {2:|} |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
@@ -79,7 +79,7 @@ describe('Default highlight groups', function()
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
{2:[No Name] [No Name] [No Name] }| {2:[No Name] [No Name] [No Name] }|
^ | ^ |
~ | ~ |
~ | ~ |
~ | ~ |
@@ -92,7 +92,7 @@ describe('Default highlight groups', 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:|} | {2:|}^ {2:|} |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
@@ -109,7 +109,7 @@ describe('Default highlight groups', function()
]]) ]])
feed('<c-w>l') feed('<c-w>l')
screen:expect([[ screen:expect([[
{2:|} {2:|}^ | {2:|} {2:|}^ |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
@@ -126,7 +126,7 @@ describe('Default highlight groups', function()
]]) ]])
feed('<c-w>h<c-w>h') feed('<c-w>h<c-w>h')
screen:expect([[ screen:expect([[
^ {2:|} {2:|} | ^ {2:|} {2:|} |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
~ {2:|}~ {2:|}~ | ~ {2:|}~ {2:|}~ |
@@ -146,7 +146,7 @@ describe('Default highlight groups', function()
it('insert mode text', function() it('insert mode text', function()
feed('i') feed('i')
screen:expect([[ screen:expect([[
^ | ^ |
~ | ~ |
~ | ~ |
~ | ~ |
@@ -165,7 +165,7 @@ describe('Default highlight groups', function()
it('end of file markers', function() it('end of file markers', function()
screen:expect([[ screen:expect([[
^ | ^ |
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
@@ -198,7 +198,7 @@ describe('Default highlight groups', function()
~ | ~ |
:ls | :ls |
1 %a "[No Name]" line 1 | 1 %a "[No Name]" line 1 |
{1:Press ENTER or type command to continue}^ | {1:Press ENTER or type command to continue}^ |
]], {[1] = {bold = true, foreground = hlgroup_colors.Question}}) ]], {[1] = {bold = true, foreground = hlgroup_colors.Question}})
feed('<cr>') -- skip the "Press ENTER..." state or tests will hang feed('<cr>') -- skip the "Press ENTER..." state or tests will hang
end) end)

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

@@ -28,7 +28,7 @@ describe('Mouse input', function()
screen:expect([[ screen:expect([[
testing | testing |
mouse | mouse |
support and selectio^ | support and selectio^n |
~ | ~ |
| |
]]) ]])
@@ -42,14 +42,14 @@ describe('Mouse input', function()
feed('<LeftMouse><2,1>') feed('<LeftMouse><2,1>')
screen:expect([[ screen:expect([[
testing | testing |
mo^se | mo^use |
support and selection | support and selection |
~ | ~ |
| |
]]) ]])
feed('<LeftMouse><0,0>') feed('<LeftMouse><0,0>')
screen:expect([[ screen:expect([[
^esting | ^testing |
mouse | mouse |
support and selection | support and selection |
~ | ~ |
@@ -62,7 +62,7 @@ describe('Mouse input', function()
feed('<LeftMouse><2,1>') feed('<LeftMouse><2,1>')
screen:expect([[ screen:expect([[
testing | testing |
mo^se | mo^use |
support and selection | support and selection |
~ | ~ |
| |
@@ -70,7 +70,7 @@ describe('Mouse input', function()
feed('<LeftDrag><4,1>') feed('<LeftDrag><4,1>')
screen:expect([[ screen:expect([[
testing | testing |
mo{1:us}^ | mo{1:us}^e |
support and selection | support and selection |
~ | ~ |
{2:-- VISUAL --} | {2:-- VISUAL --} |
@@ -79,13 +79,13 @@ describe('Mouse input', function()
screen:expect([[ screen:expect([[
testing | testing |
mo{1:use } | mo{1:use } |
{1:su}^port and selection | {1:su}^pport and selection |
~ | ~ |
{2:-- VISUAL --} | {2:-- VISUAL --} |
]]) ]])
feed('<LeftDrag><0,0>') feed('<LeftDrag><0,0>')
screen:expect([[ screen:expect([[
^{1:esting } | ^t{1:esting } |
{1:mou}se | {1:mou}se |
support and selection | support and selection |
~ | ~ |
@@ -98,7 +98,7 @@ describe('Mouse input', function()
screen:expect([[ screen:expect([[
testing | testing |
mouse | mouse |
{1:suppor}^ and selection | {1:suppor}^t and selection |
~ | ~ |
{2:-- VISUAL --} | {2:-- VISUAL --} |
]]) ]])
@@ -109,7 +109,7 @@ describe('Mouse input', function()
screen:expect([[ screen:expect([[
testing | testing |
mouse | mouse |
{1:su}^{1:port and selection } | {1:su}^p{1:port and selection } |
~ | ~ |
{2:-- VISUAL LINE --} | {2:-- VISUAL LINE --} |
]]) ]])
@@ -120,7 +120,7 @@ describe('Mouse input', function()
screen:expect([[ screen:expect([[
testing | testing |
mouse | mouse |
su^port and selection | su^pport and selection |
~ | ~ |
{2:-- VISUAL BLOCK --} | {2:-- VISUAL BLOCK --} |
]]) ]])
@@ -129,7 +129,7 @@ describe('Mouse input', function()
it('right click extends visual selection to the clicked location', function() it('right click extends visual selection to the clicked location', function()
feed('<LeftMouse><0,0>') feed('<LeftMouse><0,0>')
screen:expect([[ screen:expect([[
^esting | ^testing |
mouse | mouse |
support and selection | support and selection |
~ | ~ |
@@ -139,7 +139,7 @@ describe('Mouse input', function()
screen:expect([[ screen:expect([[
{1:testing } | {1:testing } |
{1:mouse } | {1:mouse } |
{1:su}^port and selection | {1:su}^pport and selection |
~ | ~ |
{2:-- VISUAL --} | {2:-- VISUAL --} |
]]) ]])
@@ -153,7 +153,7 @@ describe('Mouse input', function()
E426: tag not found: test| E426: tag not found: test|
ing | ing |
Press ENTER or type comma| Press ENTER or type comma|
nd to continue^ | nd to continue^ |
]],nil,true) ]],nil,true)
feed('<cr>') feed('<cr>')
end) end)
@@ -179,7 +179,7 @@ describe('Mouse input', function()
to |to | to |to |
test |test | test |test |
mouse scrolling |mouse scrolling | mouse scrolling |mouse scrolling |
^ | | ^ | |
~ |~ | ~ |~ |
[No Name] [+] [No Name] [+] | [No Name] [+] [No Name] [+] |
to | to |
@@ -193,7 +193,7 @@ describe('Mouse input', function()
feed('<MouseUp><0,0>') feed('<MouseUp><0,0>')
screen:expect([[ screen:expect([[
mouse scrolling |lines | mouse scrolling |lines |
^ |to | ^ |to |
~ |test | ~ |test |
~ |mouse scrolling | ~ |mouse scrolling |
~ | | ~ | |
@@ -210,7 +210,7 @@ describe('Mouse input', function()
feed('<MouseDown><27,0>') feed('<MouseDown><27,0>')
screen:expect([[ screen:expect([[
mouse scrolling |text | mouse scrolling |text |
^ |with | ^ |with |
~ |many | ~ |many |
~ |lines | ~ |lines |
~ |to | ~ |to |
@@ -227,7 +227,7 @@ describe('Mouse input', function()
feed('<MouseDown><27,7><MouseDown>') feed('<MouseDown><27,7><MouseDown>')
screen:expect([[ screen:expect([[
mouse scrolling |text | mouse scrolling |text |
^ |with | ^ |with |
~ |many | ~ |many |
~ |lines | ~ |lines |
~ |to | ~ |to |

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

@@ -418,9 +418,8 @@ function Screen:_row_repr(row, attr_ids, attr_ignore)
end end
if self._rows[self._cursor.row] == row and self._cursor.col == i then if self._rows[self._cursor.row] == row and self._cursor.col == i then
table.insert(rv, '^') table.insert(rv, '^')
else
table.insert(rv, row[i].text)
end end
table.insert(rv, row[i].text)
end end
if current_attr_id then if current_attr_id then
table.insert(rv, '}') table.insert(rv, '}')

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

@@ -85,7 +85,7 @@ describe('Screen', function()
it('horizontal', function() it('horizontal', function()
execute('sp') execute('sp')
screen:expect([[ screen:expect([[
^ | ^ |
~ | ~ |
~ | ~ |
~ | ~ |
@@ -106,7 +106,7 @@ describe('Screen', function()
execute('sp') execute('sp')
execute('resize 8') execute('resize 8')
screen:expect([[ screen:expect([[
^ | ^ |
~ | ~ |
~ | ~ |
~ | ~ |
@@ -126,7 +126,7 @@ 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([[
^ | | | ^ | | |
~ |~ |~ | ~ |~ |~ |
~ |~ |~ | ~ |~ |~ |
~ |~ |~ | ~ |~ |~ |
@@ -143,7 +143,7 @@ describe('Screen', function()
]]) ]])
insert('hello') insert('hello')
screen:expect([[ screen:expect([[
hell^ |hello |hello | hell^o |hello |hello |
~ |~ |~ | ~ |~ |~ |
~ |~ |~ | ~ |~ |~ |
~ |~ |~ | ~ |~ |~ |
@@ -169,7 +169,7 @@ describe('Screen', function()
execute('sp', 'vsp', 'vsp') execute('sp', 'vsp', 'vsp')
insert('hello') insert('hello')
screen:expect([[ screen:expect([[
hell^ |hello |hello | hell^o |hello |hello |
~ |~ |~ | ~ |~ |~ |
~ |~ |~ | ~ |~ |~ |
~ |~ |~ | ~ |~ |~ |
@@ -189,7 +189,7 @@ describe('Screen', function()
feed('h') feed('h')
screen:expect([[ screen:expect([[
4+ [No Name] + [No Name] X| 4+ [No Name] + [No Name] X|
hell^2 | hell^o2 |
~ | ~ |
~ | ~ |
~ | ~ |
@@ -206,7 +206,7 @@ describe('Screen', function()
execute('tabprevious') execute('tabprevious')
screen:expect([[ screen:expect([[
4+ [No Name] + [No Name] X| 4+ [No Name] + [No Name] X|
hell^ |hello |hello | hell^o |hello |hello |
~ |~ |~ | ~ |~ |~ |
~ |~ |~ | ~ |~ |~ |
~ |~ |~ | ~ |~ |~ |
@@ -229,7 +229,7 @@ describe('Screen', function()
screen:expect([[ screen:expect([[
line 1 | line 1 |
line 2 | line 2 |
^ | ^ |
~ | ~ |
~ | ~ |
~ | ~ |
@@ -262,7 +262,7 @@ describe('Screen', function()
~ | ~ |
~ | ~ |
~ | ~ |
:ls^ | :ls^ |
]]) ]])
end) end)
@@ -282,7 +282,7 @@ describe('Screen', function()
~ | ~ |
:ls | :ls |
1 %a "[No Name]" line 1 | 1 %a "[No Name]" line 1 |
Press ENTER or type command to continue^ | 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)
@@ -312,7 +312,7 @@ describe('Screen', function()
in |in |in | in |in |in |
split |split |split | split |split |split |
windows |windows |windows | windows |windows |windows |
^ | | | ^ | | |
[No Name] [+] [No Name] [+] [No Name] [+] | [No Name] [+] [No Name] [+] [No Name] [+] |
clearing | clearing |
in | in |
@@ -327,7 +327,7 @@ 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([[
^crolling |and |and | ^scrolling |and |and |
and |clearing |clearing | and |clearing |clearing |
clearing |in |in | clearing |in |in |
in |split |split | in |split |split |
@@ -349,7 +349,7 @@ describe('Screen', function()
clearing |in |in | clearing |in |in |
in |split |split | in |split |split |
split |windows |windows | split |windows |windows |
windows |^ | | windows |^ | |
[No Name] [+] [No Name] [+] <Name] [+] | [No Name] [+] [No Name] [+] <Name] [+] |
clearing | clearing |
in | in |
@@ -361,7 +361,7 @@ describe('Screen', function()
]]) ]])
feed('gg') feed('gg')
screen:expect([[ screen:expect([[
scrolling |^nserting |and | scrolling |^Inserting |and |
and |text |clearing | and |text |clearing |
clearing |with |in | clearing |with |in |
in |many |split | in |many |split |
@@ -383,7 +383,7 @@ describe('Screen', function()
clearing |lines |in | clearing |lines |in |
in |to |split | in |to |split |
split |test |windows | split |test |windows |
windows |^crolling | | windows |^scrolling | |
[No Name] [+] [No Name] [+] <Name] [+] | [No Name] [+] [No Name] [+] <Name] [+] |
clearing | clearing |
in | in |
@@ -400,7 +400,7 @@ describe('Screen', function()
clearing |test |in | clearing |test |in |
in |scrolling |split | in |scrolling |split |
split |and |windows | split |and |windows |
windows |^learing | | windows |^clearing | |
[No Name] [+] [No Name] [+] <Name] [+] | [No Name] [+] [No Name] [+] <Name] [+] |
clearing | clearing |
in | in |
@@ -412,7 +412,7 @@ describe('Screen', function()
]]) ]])
feed('5k') feed('5k')
screen:expect([[ screen:expect([[
scrolling |^ines |and | scrolling |^lines |and |
and |to |clearing | and |to |clearing |
clearing |test |in | clearing |test |in |
in |scrolling |split | in |scrolling |split |
@@ -429,7 +429,7 @@ describe('Screen', function()
]]) ]])
feed('k') feed('k')
screen:expect([[ screen:expect([[
scrolling |^any |and | scrolling |^many |and |
and |lines |clearing | and |lines |clearing |
clearing |to |in | clearing |to |in |
in |test |split | in |test |split |
@@ -455,7 +455,7 @@ describe('Screen', function()
it('rebuilds the whole screen', function() it('rebuilds the whole screen', function()
screen:expect([[ screen:expect([[
resize^ | resize^ |
~ | ~ |
~ | ~ |
~ | ~ |
@@ -466,13 +466,13 @@ describe('Screen', function()
it('has minimum width/height values', function() it('has minimum width/height values', function()
screen:try_resize(1, 1) screen:try_resize(1, 1)
screen:expect([[ screen:expect([[
-- INS^RT --| -- INS^ERT --|
| |
]]) ]])
feed('<esc>:ls') feed('<esc>:ls')
screen:expect([[ screen:expect([[
resize | resize |
:ls^ | :ls^ |
]]) ]])
end) end)
end) end)

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

@@ -28,7 +28,7 @@ describe('Signs', function()
>!a | >!a |
b | b |
>>c | >>c |
^ | ^ |
~ | ~ |
~ | ~ |
~ | ~ |

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

@@ -25,7 +25,7 @@ describe("'wildmode'", function()
~ | ~ |
~ | ~ |
define jump list > | define jump list > |
:sign define^ | :sign define^ |
]]) ]])
end) end)
end) end)