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

refactor(tests): all screen tests should use highlights

Browse Source 
This is the first installment of a multi-PR series significantly
refactoring how highlights are being specified.

The end goal is to have a base set of 20 ish most common highlights,
and then specific files only need to add more groups to that as needed.

As a complicating factor, we also want to migrate to the new default
color scheme eventually. But by sharing a base set, that future PR
will hopefully be a lot smaller since a lot of tests will be migrated
just simply by updating the base set in place.

As a first step, fix the anti-pattern than Screen defaults to ignoring
highlights. Highlights are integral part of the screen state, not
something "extra" which we only test "sometimes". For now, we still
allow opt-out via the intentionally ugly

  screen._default_attr_ids = nil

The end goal is to get rid of all of these eventually (which will be
easier as part of the color scheme migration)
This commit is contained in:
bfredl
2024-03-22 11:02:52 +01:00
parent dc110cba3c
commit 0c59771e31
40 changed files with 793 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
test/functional/vimscript/execute_spec.lua
View File

@@ -191,21 +191,21 @@ describe('execute()', function()
feed([[:call Test1()<cr>]])
screen:expect([[
^ |
~ |*4
{1:~ }|*4
ABCD |
]])
feed([[:call Test2()<cr>]])
screen:expect([[
^ |
~ |*4
{1:~ }|*4
1234ABCD |
]])
feed([[:call Test3()<cr>]])
screen:expect([[
^ |
~ |*4
{1:~ }|*4
1234ABCDXZYZ |
]])
@@ -215,39 +215,39 @@ describe('execute()', function()
-- "ef" was overwritten since msg_col was recovered wrongly
screen:expect([[
1234 |
Error detected while processing function|
Test4: |
line 2: |
abcdABCD |
Press ENTER or type command to continue^ |
{9:Error detected while processing function}|
{9: Test4:} |
{8:line 2:} |
{9:abcd}ABCD |
{6:Press ENTER or type command to continue}^ |
]])
feed([[<cr>]]) -- to clear screen
feed([[:call Test5()<cr>]])
screen:expect([[
^ |
~ |*4
{1:~ }|*4
1234ABCD |
]])
feed([[:call Test6()<cr>]])
screen:expect([[
|
Error detected while processing function|
Test6: |
line 2: |
E121ABCD |
Press ENTER or type command to continue^ |
{9:Error detected while processing function}|
{9: Test6:} |
{8:line 2:} |
{9:E121}ABCD |
{6:Press ENTER or type command to continue}^ |
]])
feed([[:call Test7()<cr>]])
screen:expect([[
Error detected while processing function|
Test6: |
line 2: |
E121ABCD |
{9:Error detected while processing function}|
{9: Test6:} |
{8:line 2:} |
{9:E121}ABCD |
ABCD |
Press ENTER or type command to continue^ |
{6:Press ENTER or type command to continue}^ |
]])
end)
@@ -265,7 +265,7 @@ describe('execute()', function()
command('let g:mes = execute("echon 42", "")')
screen:expect([[
^ |
~ |*3
{1:~ }|*3
42 |
]])
eq('42', eval('g:mes'))
@@ -289,7 +289,7 @@ describe('execute()', function()
command('let g:mes = execute("echon 42")')
screen:expect([[
^ |
~ |*3
{1:~ }|*3
|
]])
eq('42', eval('g:mes'))
@@ -298,7 +298,7 @@ describe('execute()', function()
screen:expect {
grid = [[
^ |
~ |*3
{1:~ }|*3
|
]],
unchanged = true,