refactor(tests): use global defaults instead of set_default_attr_ids (2)

This commit is contained in:
bfredl
2024-03-27 10:35:50 +01:00
parent 63f7b1f31e
commit b556bd1a53
30 changed files with 580 additions and 857 deletions

View File

@@ -10,28 +10,24 @@ describe('matchaddpos()', function()
-- oldtest: Test_matchaddpos_dump()
it('can add more than 8 match positions vim-patch:9.0.0620', function()
local screen = Screen.new(60, 14)
screen:set_default_attr_ids({
[0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
[1] = { background = Screen.colors.Yellow }, -- Search
})
screen:attach()
exec([[
call setline(1, ['1234567890123']->repeat(14))
call matchaddpos('Search', range(1, 12)->map({i, v -> [v, v]}))
]])
screen:expect([[
{1:^1}234567890123 |
1{1:2}34567890123 |
12{1:3}4567890123 |
123{1:4}567890123 |
1234{1:5}67890123 |
12345{1:6}7890123 |
123456{1:7}890123 |
1234567{1:8}90123 |
12345678{1:9}0123 |
123456789{1:0}123 |
1234567890{1:1}23 |
12345678901{1:2}3 |
{10:^1}234567890123 |
1{10:2}34567890123 |
12{10:3}4567890123 |
123{10:4}567890123 |
1234{10:5}67890123 |
12345{10:6}7890123 |
123456{10:7}890123 |
1234567{10:8}90123 |
12345678{10:9}0123 |
123456789{10:0}123 |
1234567890{10:1}23 |
12345678901{10:2}3 |
1234567890123 |
|
]])
@@ -42,10 +38,6 @@ describe('match highlighting', function()
-- oldtest: Test_match_in_linebreak()
it('does not continue in linebreak vim-patch:8.2.3698', function()
local screen = Screen.new(75, 10)
screen:set_default_attr_ids({
[0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
[1] = { background = Screen.colors.Red, foreground = Screen.colors.White }, -- ErrorMsg
})
screen:attach()
exec([=[
set breakindent linebreak breakat+=]
@@ -53,20 +45,15 @@ describe('match highlighting', function()
call matchaddpos('ErrorMsg', [[1, 51]])
]=])
screen:expect([[
^xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx{1:]} |
^xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx{9:]} |
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx |
{0:~ }|*7
{1:~ }|*7
|
]])
end)
it('is shown with incsearch vim-patch:8.2.3940', function()
local screen = Screen.new(75, 6)
screen:set_default_attr_ids({
[0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
[1] = { background = Screen.colors.Yellow }, -- Search
[2] = { background = Screen.colors.Red, foreground = Screen.colors.White }, -- ErrorMsg
})
screen:attach()
exec([[
set incsearch
@@ -76,16 +63,16 @@ describe('match highlighting', function()
screen:expect([[
^0 |
1 |
{2:2} |
{9:2} |
3 |
4 |
|
]])
feed(':s/0')
screen:expect([[
{1:0} |
{10:0} |
1 |
{2:2} |
{9:2} |
3 |
4 |
:s/0^ |
@@ -94,10 +81,6 @@ describe('match highlighting', function()
it('on a Tab vim-patch:8.2.4062', function()
local screen = Screen.new(75, 10)
screen:set_default_attr_ids({
[0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
[1] = { background = Screen.colors.Red, foreground = Screen.colors.White }, -- ErrorMsg
})
screen:attach()
exec([[
set linebreak
@@ -105,8 +88,8 @@ describe('match highlighting', function()
call matchadd('ErrorMsg', '\t')
]])
screen:expect([[
{1: ^ }ix |
{0:~ }|*8
{9: ^ }ix |
{1:~ }|*8
|
]])
end)