mirror of
https://github.com/neovim/neovim.git
synced 2025-12-16 11:25:33 +00:00
tests: don't ignore highlights in bufhl_spec
This commit is contained in:
Björn Linse
@@ -13,16 +13,16 @@ describe('Buffer highlighting', function()
|
|||||||
execute("syntax on")
|
execute("syntax on")
|
||||||
screen = Screen.new(40, 8)
|
screen = Screen.new(40, 8)
|
||||||
screen:attach()
|
screen:attach()
|
||||||
screen:set_default_attr_ignore( {{bold=true, foreground=Screen.colors.Blue}} )
|
|
||||||
screen:set_default_attr_ids({
|
screen:set_default_attr_ids({
|
||||||
[1] = {foreground = Screen.colors.Fuchsia}, -- String
|
[1] = {bold=true, foreground=Screen.colors.Blue},
|
||||||
[2] = {foreground = Screen.colors.Brown, bold = true}, -- Statement
|
[2] = {foreground = Screen.colors.Fuchsia}, -- String
|
||||||
[3] = {foreground = Screen.colors.SlateBlue}, -- Special
|
[3] = {foreground = Screen.colors.Brown, bold = true}, -- Statement
|
||||||
[4] = {bold = true, foreground = Screen.colors.SlateBlue},
|
[4] = {foreground = Screen.colors.SlateBlue}, -- Special
|
||||||
[5] = {foreground = Screen.colors.DarkCyan}, -- Identifier
|
[5] = {bold = true, foreground = Screen.colors.SlateBlue},
|
||||||
[6] = {bold = true},
|
[6] = {foreground = Screen.colors.DarkCyan}, -- Identifier
|
||||||
[7] = {underline = true, bold = true, foreground = Screen.colors.SlateBlue},
|
[7] = {bold = true},
|
||||||
[8] = {foreground = Screen.colors.SlateBlue, underline = true}
|
[8] = {underline = true, bold = true, foreground = Screen.colors.SlateBlue},
|
||||||
|
[9] = {foreground = Screen.colors.SlateBlue, underline = true}
|
||||||
})
|
})
|
||||||
curbuf = request('vim_get_current_buffer')
|
curbuf = request('vim_get_current_buffer')
|
||||||
end)
|
end)
|
||||||
@@ -49,11 +49,11 @@ describe('Buffer highlighting', function()
|
|||||||
screen:expect([[
|
screen:expect([[
|
||||||
these are some lines |
|
these are some lines |
|
||||||
with colorful tex^t |
|
with colorful tex^t |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
|
|
|
|
||||||
]])
|
]])
|
||||||
|
|
||||||
@@ -61,25 +61,25 @@ describe('Buffer highlighting', function()
|
|||||||
add_hl(-1, "Statement", 1 , 5, -1)
|
add_hl(-1, "Statement", 1 , 5, -1)
|
||||||
|
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
these are {1:some} lines |
|
these are {2:some} lines |
|
||||||
with {2:colorful tex^t} |
|
with {3:colorful tex^t} |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
|
|
|
|
||||||
]])
|
]])
|
||||||
|
|
||||||
feed("ggo<esc>")
|
feed("ggo<esc>")
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
these are {1:some} lines |
|
these are {2:some} lines |
|
||||||
^ |
|
^ |
|
||||||
with {2:colorful text} |
|
with {3:colorful text} |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
|
|
|
|
||||||
]])
|
]])
|
||||||
|
|
||||||
@@ -88,10 +88,10 @@ describe('Buffer highlighting', function()
|
|||||||
these are some lines |
|
these are some lines |
|
||||||
^ |
|
^ |
|
||||||
with colorful text |
|
with colorful text |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
|
|
|
|
||||||
]])
|
]])
|
||||||
end)
|
end)
|
||||||
@@ -119,13 +119,13 @@ describe('Buffer highlighting', function()
|
|||||||
neq(id1, id2)
|
neq(id1, id2)
|
||||||
|
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
a {4:longer} example |
|
a {5:longer} example |
|
||||||
in {5:order} to {6:de}{4:monstr}{6:ate} |
|
in {6:order} to {7:de}{5:monstr}{7:ate} |
|
||||||
{6:combin}{7:ing}{8: hi}ghlights |
|
{7:combin}{8:ing}{9: hi}ghlights |
|
||||||
{8:from }{7:diff}{6:erent} source^s |
|
{9:from }{8:diff}{7:erent} source^s |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
:hi ImportantWord gui=bold cterm=bold |
|
:hi ImportantWord gui=bold cterm=bold |
|
||||||
]])
|
]])
|
||||||
end)
|
end)
|
||||||
@@ -133,13 +133,13 @@ describe('Buffer highlighting', function()
|
|||||||
it('and clearing the first added', function()
|
it('and clearing the first added', function()
|
||||||
clear_hl(id1, 0, -1)
|
clear_hl(id1, 0, -1)
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
a {3:longer} example |
|
a {4:longer} example |
|
||||||
in {5:order} to de{3:monstr}ate |
|
in {6:order} to de{4:monstr}ate |
|
||||||
combin{8:ing hi}ghlights |
|
combin{9:ing hi}ghlights |
|
||||||
{8:from diff}erent source^s |
|
{9:from diff}erent source^s |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
:hi ImportantWord gui=bold cterm=bold |
|
:hi ImportantWord gui=bold cterm=bold |
|
||||||
]])
|
]])
|
||||||
end)
|
end)
|
||||||
@@ -147,13 +147,13 @@ describe('Buffer highlighting', function()
|
|||||||
it('and clearing the second added', function()
|
it('and clearing the second added', function()
|
||||||
clear_hl(id2, 0, -1)
|
clear_hl(id2, 0, -1)
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
a {6:longer} example |
|
a {7:longer} example |
|
||||||
in order to {6:demonstrate} |
|
in order to {7:demonstrate} |
|
||||||
{6:combining} highlights |
|
{7:combining} highlights |
|
||||||
from {6:different} source^s |
|
from {7:different} source^s |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
:hi ImportantWord gui=bold cterm=bold |
|
:hi ImportantWord gui=bold cterm=bold |
|
||||||
]])
|
]])
|
||||||
end)
|
end)
|
||||||
@@ -164,12 +164,12 @@ describe('Buffer highlighting', function()
|
|||||||
clear_hl(id2, 2, -1)
|
clear_hl(id2, 2, -1)
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
a longer example |
|
a longer example |
|
||||||
in {5:order} to de{3:monstr}ate |
|
in {6:order} to de{4:monstr}ate |
|
||||||
{6:combining} highlights |
|
{7:combining} highlights |
|
||||||
from {6:different} source^s |
|
from {7:different} source^s |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
:hi ImportantWord gui=bold cterm=bold |
|
:hi ImportantWord gui=bold cterm=bold |
|
||||||
]])
|
]])
|
||||||
end)
|
end)
|
||||||
@@ -177,25 +177,25 @@ describe('Buffer highlighting', function()
|
|||||||
it('and renumbering lines', function()
|
it('and renumbering lines', function()
|
||||||
feed('3Gddggo<esc>')
|
feed('3Gddggo<esc>')
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
a {4:longer} example |
|
a {5:longer} example |
|
||||||
^ |
|
^ |
|
||||||
in {5:order} to {6:de}{4:monstr}{6:ate} |
|
in {6:order} to {7:de}{5:monstr}{7:ate} |
|
||||||
{8:from }{7:diff}{6:erent} sources |
|
{9:from }{8:diff}{7:erent} sources |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
|
|
|
|
||||||
]])
|
]])
|
||||||
|
|
||||||
execute(':3move 4')
|
execute(':3move 4')
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
a {4:longer} example |
|
a {5:longer} example |
|
||||||
|
|
|
|
||||||
{8:from }{7:diff}{6:erent} sources |
|
{9:from }{8:diff}{7:erent} sources |
|
||||||
^in {5:order} to {6:de}{4:monstr}{6:ate} |
|
^in {6:order} to {7:de}{5:monstr}{7:ate} |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
::3move 4 |
|
::3move 4 |
|
||||||
]])
|
]])
|
||||||
end)
|
end)
|
||||||
@@ -209,25 +209,25 @@ describe('Buffer highlighting', function()
|
|||||||
local id = add_hl(0, "Special", 0, 0, 9)
|
local id = add_hl(0, "Special", 0, 0, 9)
|
||||||
|
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
{3:three ove}{5:rlapp}{1:ing color}^s |
|
{4:three ove}{6:rlapp}{2:ing color}^s |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
|
|
|
|
||||||
]])
|
]])
|
||||||
|
|
||||||
clear_hl(id, 0, 1)
|
clear_hl(id, 0, 1)
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
three {5:overlapp}{1:ing color}^s |
|
three {6:overlapp}{2:ing color}^s |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
|
|
|
|
||||||
]])
|
]])
|
||||||
end)
|
end)
|
||||||
@@ -239,13 +239,13 @@ describe('Buffer highlighting', function()
|
|||||||
add_hl(-1, "String", 0, 16, 21)
|
add_hl(-1, "String", 0, 16, 21)
|
||||||
|
|
||||||
screen:expect([[
|
screen:expect([[
|
||||||
Ta {5:båten} över {1:sjön}^! |
|
Ta {6:båten} över {2:sjön}^! |
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
~ |
|
{1:~ }|
|
||||||
|
|
|
|
||||||
]])
|
]])
|
||||||
end)
|
end)
|
||||||
|
|||||||
Reference in New Issue
Block a user