refactor(tests): all screen tests should use highlights

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

View File

@@ -58,11 +58,11 @@ describe('prompt buffer', function()
]])
screen:expect([[
cmd: ^ |
~ |*3
[Prompt] [+] |
{1:~ }|*3
{3:[Prompt] [+] }|
other buffer |
~ |*3
-- INSERT -- |
{1:~ }|*3
{5:-- INSERT --} |
]])
end
@@ -79,15 +79,15 @@ describe('prompt buffer', function()
Command: "hello" |
Result: "hello" |
cmd: ^ |
[Prompt] |
{3:[Prompt] }|
other buffer |
~ |*3
-- INSERT -- |
{1:~ }|*3
{5:-- INSERT --} |
]])
feed('exit\n')
screen:expect([[
^other buffer |
~ |*8
{1:~ }|*8
|
]])
end)
@@ -98,43 +98,43 @@ describe('prompt buffer', function()
feed('hello<BS><BS>')
screen:expect([[
cmd: hel^ |
~ |*3
[Prompt] [+] |
{1:~ }|*3
{3:[Prompt] [+] }|
other buffer |
~ |*3
-- INSERT -- |
{1:~ }|*3
{5:-- INSERT --} |
]])
feed('<Left><Left><Left><BS>-')
screen:expect([[
cmd: -^hel |
~ |*3
[Prompt] [+] |
{1:~ }|*3
{3:[Prompt] [+] }|
other buffer |
~ |*3
-- INSERT -- |
{1:~ }|*3
{5:-- INSERT --} |
]])
feed('<C-O>lz')
screen:expect([[
cmd: -hz^el |
~ |*3
[Prompt] [+] |
{1:~ }|*3
{3:[Prompt] [+] }|
other buffer |
~ |*3
-- INSERT -- |
{1:~ }|*3
{5:-- INSERT --} |
]])
feed('<End>x')
screen:expect([[
cmd: -hzelx^ |
~ |*3
[Prompt] [+] |
{1:~ }|*3
{3:[Prompt] [+] }|
other buffer |
~ |*3
-- INSERT -- |
{1:~ }|*3
{5:-- INSERT --} |
]])
feed('<C-U>exit\n')
screen:expect([[
^other buffer |
~ |*8
{1:~ }|*8
|
]])
end)
@@ -143,32 +143,30 @@ describe('prompt buffer', function()
it('switch windows', function()
source_script()
feed('<C-O>:call SwitchWindows()<CR>')
screen:expect {
grid = [[
screen:expect([[
cmd: |
~ |*3
[Prompt] [+] |
{1:~ }|*3
{2:[Prompt] [+] }|
^other buffer |
~ |*3
{1:~ }|*3
|
]],
}
]])
feed('<C-O>:call SwitchWindows()<CR>')
screen:expect([[
cmd: ^ |
~ |*3
[Prompt] [+] |
{1:~ }|*3
{3:[Prompt] [+] }|
other buffer |
~ |*3
-- INSERT -- |
{1:~ }|*3
{5:-- INSERT --} |
]])
feed('<Esc>')
screen:expect([[
cmd:^ |
~ |*3
[Prompt] [+] |
{1:~ }|*3
{3:[Prompt] [+] }|
other buffer |
~ |*3
{1:~ }|*3
|
]])
end)