mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-15 19:05:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: format test/*

Browse Source
This commit is contained in:
Justin M. Keyes
2024-01-03 02:09:18 +01:00
parent 59d117ec99
commit 04f2f864e2
363 changed files with 30631 additions and 20833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

209
test/functional/ui/syntax_conceal_spec.lua
View File

@@ -11,26 +11,25 @@ describe('Screen', function()
before_each(function()
clear()
screen = Screen.new(nil,10)
screen = Screen.new(nil, 10)
screen:attach()
screen:set_default_attr_ids( {
[0] = {bold=true, foreground=Screen.colors.Blue},
[1] = {foreground = Screen.colors.LightGrey, background = Screen.colors.DarkGray},
[2] = {bold = true, reverse = true},
[3] = {reverse = true},
[4] = {bold = true},
[5] = {background = Screen.colors.Yellow},
[6] = {background = Screen.colors.LightGrey},
} )
screen:set_default_attr_ids({
[0] = { bold = true, foreground = Screen.colors.Blue },
[1] = { foreground = Screen.colors.LightGrey, background = Screen.colors.DarkGray },
[2] = { bold = true, reverse = true },
[3] = { reverse = true },
[4] = { bold = true },
[5] = { background = Screen.colors.Yellow },
[6] = { background = Screen.colors.LightGrey },
})
end)
describe("match and conceal", function()
describe('match and conceal', function()
before_each(function()
command("let &conceallevel=1")
command('let &conceallevel=1')
end)
describe("multiple", function()
describe('multiple', function()
before_each(function()
insert([[
&&
@@ -43,7 +42,7 @@ describe('Screen', function()
command("syn match dAmpersand '[&][&]' conceal cchar=∧")
end)
it("double characters.", function()
it('double characters.', function()
screen:expect([[
{1:∧} |*6
^ |
@@ -53,7 +52,7 @@ describe('Screen', function()
end)
it('double characters and move the cursor one line up.', function()
feed("k")
feed('k')
screen:expect([[
{1:∧} |*5
^&& |
@@ -64,7 +63,7 @@ describe('Screen', function()
end)
it('double characters and move the cursor to the beginning of the file.', function()
feed("gg")
feed('gg')
screen:expect([[
^&& |
{1:∧} |*5
@@ -75,7 +74,7 @@ describe('Screen', function()
end)
it('double characters and move the cursor to the second line in the file.', function()
feed("ggj")
feed('ggj')
screen:expect([[
{1:∧} |
^&& |
@@ -86,21 +85,24 @@ describe('Screen', function()
]])
end)
it('double characters and then move the cursor to the beginning of the file and back to the end of the file.', function()
feed("ggG")
screen:expect([[
it(
'double characters and then move the cursor to the beginning of the file and back to the end of the file.',
function()
feed('ggG')
screen:expect([[
{1:∧} |*6
^ |
{0:~ }|*2
|
]])
end)
end
)
end) -- multiple
it("keyword instances in initially in the document.", function()
feed("2ilambda<cr><ESC>")
command("let &conceallevel=1")
command("syn keyword kLambda lambda conceal cchar=λ")
it('keyword instances in initially in the document.', function()
feed('2ilambda<cr><ESC>')
command('let &conceallevel=1')
command('syn keyword kLambda lambda conceal cchar=λ')
screen:expect([[
{1:λ} |*2
^ |
@@ -109,12 +111,11 @@ describe('Screen', function()
]])
end) -- Keyword
describe("regions in the document", function()
describe('regions in the document', function()
before_each(function()
feed("2")
insert("<r> a region of text </r>\n")
command("let &conceallevel=1")
feed('2')
insert('<r> a region of text </r>\n')
command('let &conceallevel=1')
end)
it('initially and conceal it.', function()
@@ -139,9 +140,11 @@ describe('Screen', function()
]])
end)
it('that are nested and conceal the nested region\'s start and end tags.', function()
command("syn region rText contains=rText matchgroup=rMatch start='<r>' end='</r>' concealends cchar=-")
insert("<r> A region with <r> a nested <r> nested region.</r> </r> </r>\n")
it("that are nested and conceal the nested region's start and end tags.", function()
command(
"syn region rText contains=rText matchgroup=rMatch start='<r>' end='</r>' concealends cchar=-"
)
insert('<r> A region with <r> a nested <r> nested region.</r> </r> </r>\n')
screen:expect([[
{1: } a region of text {1:-} |*2
{1: } A region with {1: } a nested {1: } nested region.{1:-} |
@@ -153,15 +156,15 @@ describe('Screen', function()
end)
end) -- regions in the document
describe("a region of text", function()
describe('a region of text', function()
before_each(function()
command("syntax conceal on")
feed("2")
insert("<r> a region of text </r>\n")
command('syntax conceal on')
feed('2')
insert('<r> a region of text </r>\n')
command("syn region rText start='<r>' end='</r>' cchar=-")
end)
it("and turn on implicit concealing", function()
it('and turn on implicit concealing', function()
screen:expect([[
{1:-} |*2
^ |
@@ -170,10 +173,10 @@ describe('Screen', function()
]])
end)
it("and then turn on, then off, and then back on implicit concealing.", function()
command("syntax conceal off")
feed("2")
insert("<i> italian text </i>\n")
it('and then turn on, then off, and then back on implicit concealing.', function()
command('syntax conceal off')
feed('2')
insert('<i> italian text </i>\n')
command("syn region iText start='<i>' end='</i>' cchar=*")
screen:expect([[
{1:-} |*2
@@ -182,7 +185,7 @@ describe('Screen', function()
{0:~ }|*4
|
]])
command("syntax conceal on")
command('syntax conceal on')
command("syn region iText start='<i>' end='</i>' cchar=*")
screen:expect([[
{1:-} |*2
@@ -194,18 +197,18 @@ describe('Screen', function()
end)
end) -- a region of text (implicit concealing)
it("cursor position is correct when entering Insert mode with cocu=ni #13916", function()
it('cursor position is correct when entering Insert mode with cocu=ni #13916', function()
insert([[foobarfoobarfoobar]])
-- move to end of line
feed("$")
command("set concealcursor=ni")
command("syn match Foo /foobar/ conceal cchar=&")
feed('$')
command('set concealcursor=ni')
command('syn match Foo /foobar/ conceal cchar=&')
screen:expect([[
{1:&&&}^ |
{0:~ }|*8
|
]])
feed("i")
feed('i')
-- cursor should stay in place, not jump to column 16
screen:expect([[
{1:&&&}^ |
@@ -215,18 +218,18 @@ describe('Screen', function()
end)
end) -- match and conceal
describe("let the conceal level be", function()
describe('let the conceal level be', function()
before_each(function()
insert("// No Conceal\n")
insert('// No Conceal\n')
insert('"Conceal without a cchar"\n')
insert("+ With cchar\n\n")
insert('+ With cchar\n\n')
command("syn match noConceal '^//.*$'")
command("syn match concealNoCchar '\".\\{-}\"$' conceal")
command('syn match concealNoCchar \'".\\{-}"$\' conceal')
command("syn match concealWCchar '^+.\\{-}$' conceal cchar=C")
end)
it("0. No concealing.", function()
command("let &conceallevel=0")
it('0. No concealing.', function()
command('let &conceallevel=0')
screen:expect([[
// No Conceal |
"Conceal without a cchar" |
@@ -238,8 +241,8 @@ describe('Screen', function()
]])
end)
it("1. Conceal using cchar or reference listchars.", function()
command("let &conceallevel=1")
it('1. Conceal using cchar or reference listchars.', function()
command('let &conceallevel=1')
screen:expect([[
// No Conceal |
{1: } |
@@ -251,8 +254,8 @@ describe('Screen', function()
]])
end)
it("2. Hidden unless cchar is set.", function()
command("let &conceallevel=2")
it('2. Hidden unless cchar is set.', function()
command('let &conceallevel=2')
screen:expect([[
// No Conceal |
|
@@ -264,8 +267,8 @@ describe('Screen', function()
]])
end)
it("3. Hide all concealed text.", function()
command("let &conceallevel=3")
it('3. Hide all concealed text.', function()
command('let &conceallevel=3')
screen:expect([[
// No Conceal |
|*3
@@ -276,11 +279,10 @@ describe('Screen', function()
end)
end) -- conceallevel
describe("cursor movement", function()
describe('cursor movement', function()
before_each(function()
command("syn keyword concealy barf conceal cchar=b")
command("set cole=2")
command('syn keyword concealy barf conceal cchar=b')
command('set cole=2')
feed('5Ofoo barf bar barf eggs<esc>')
screen:expect([[
foo {1:b} bar {1:b} eggs |*4
@@ -289,12 +291,11 @@ describe('Screen', function()
{0:~ }|*3
|
]])
end)
it('between windows', function()
feed('k')
command("split")
command('split')
screen:expect([[
foo {1:b} bar {1:b} eggs |
foo barf bar barf egg^s |
@@ -386,7 +387,6 @@ describe('Screen', function()
{0:~ }|*3
|
]])
end)
it('between modes cocu=n', function()
@@ -418,7 +418,6 @@ describe('Screen', function()
|
]])
feed('v')
screen:expect([[
^foo barf bar barf eggs |
@@ -648,27 +647,33 @@ describe('Screen', function()
feed('10Ofoo barf bar barf eggs<esc>')
feed(':3<cr>o a<Esc>ggV')
screen:expect{grid=[[
screen:expect {
grid = [[
^f{6:oo }{1:b}{6: bar }{1:b}{6: eggs} |
foo {1:b} bar {1:b} eggs |*2
a |
foo {1:b} bar {1:b} eggs |*5
{4:-- VISUAL LINE --} |
]]}
]],
}
feed(string.rep('j', 15))
screen:expect{grid=[[
screen:expect {
grid = [[
{6:foo }{1:b}{6: bar }{1:b}{6: eggs} |*8
^f{6:oo }{1:b}{6: bar }{1:b}{6: eggs} |
{4:-- VISUAL LINE --} |
]]}
]],
}
feed(string.rep('k', 15))
screen:expect{grid=[[
screen:expect {
grid = [[
^f{6:oo }{1:b}{6: bar }{1:b}{6: eggs} |
foo {1:b} bar {1:b} eggs |*2
a |
foo {1:b} bar {1:b} eggs |*5
{4:-- VISUAL LINE --} |
]]}
]],
}
end)
end)
@@ -681,33 +686,37 @@ describe('Screen', function()
bbb
ccc
]])
screen:expect{grid=[[
screen:expect {
grid = [[
aaa |
bbb |
ccc |
^ |
{0:~ }|*5
|
]]}
]],
}
-- XXX: hack to get notifications, and check only a single line is
-- updated. Could use next_msg() also.
local orig_handle_grid_line = screen._handle_grid_line
local grid_lines = {}
function screen._handle_grid_line(self, grid, row, col, items)
table.insert(grid_lines, {row, col, items})
table.insert(grid_lines, { row, col, items })
orig_handle_grid_line(self, grid, row, col, items)
end
feed('k')
screen:expect{grid=[[
screen:expect {
grid = [[
aaa |
bbb |
^ccc |
|
{0:~ }|*5
|
]]}
eq({{2, 0, {{'c', 0, 3}, {' ', 0, 50}}}, {3, 0, {{' ', 0, 53}}}}, grid_lines)
]],
}
eq({ { 2, 0, { { 'c', 0, 3 }, { ' ', 0, 50 } } }, { 3, 0, { { ' ', 0, 53 } } } }, grid_lines)
end)
it('K_EVENT should not cause extra redraws with concealcursor #13196', function()
@@ -720,35 +729,39 @@ describe('Screen', function()
bbb
ccc
]])
screen:expect{grid=[[
screen:expect {
grid = [[
aaa |
bbb |
ccc |
^ |
{0:~ }|*5
|
]]}
]],
}
-- XXX: hack to get notifications, and check only a single line is
-- updated. Could use next_msg() also.
local orig_handle_grid_line = screen._handle_grid_line
local grid_lines = {}
function screen._handle_grid_line(self, grid, row, col, items)
table.insert(grid_lines, {row, col, items})
table.insert(grid_lines, { row, col, items })
orig_handle_grid_line(self, grid, row, col, items)
end
feed('k')
screen:expect{grid=[[
screen:expect {
grid = [[
aaa |
bbb |
^ccc |
|
{0:~ }|*5
|
]]}
eq({{2, 0, {{'c', 0, 3}, {' ', 0, 50}}}}, grid_lines)
]],
}
eq({ { 2, 0, { { 'c', 0, 3 }, { ' ', 0, 50 } } } }, grid_lines)
grid_lines = {}
poke_eventloop() -- causes K_EVENT key
poke_eventloop() -- causes K_EVENT key
screen:expect_unchanged()
eq({}, grid_lines) -- no redraw was done
end)
@@ -767,7 +780,8 @@ describe('Screen', function()
command('set nomodified')
command('so')
screen:expect{grid=[[
screen:expect {
grid = [[
^3split |
let m matchadd('Conceal', '') |
setl conceallevel2 concealcursornc |
@@ -778,16 +792,18 @@ describe('Screen', function()
normal gg |
{3:Xcolesearch }|
|
]]}
]],
}
-- Jump to something that is beyond the bottom of the window,
-- so there's a scroll down.
feed("/expr<CR>")
feed('/expr<CR>')
-- Are the concealed parts of the current line really hidden?
-- Is the window's cursor column properly updated for hidden
-- parts of the current line?
screen:expect{grid=[[
screen:expect {
grid = [[
setl conceallevel2 concealcursornc |
normal gg |
"{5:^expr} |
@@ -798,7 +814,8 @@ describe('Screen', function()
normal gg |
{3:Xcolesearch }|
/expr |
]]}
]],
}
end)
-- oldtest: Test_cursor_column_in_concealed_line_after_leftcol_change()
@@ -816,12 +833,14 @@ describe('Screen', function()
-- Are the concealed parts of the current line really hidden?
-- Is the window's cursor column properly updated for conceal?
screen:expect{grid=[[
screen:expect {
grid = [[
^c |
|
{0:~ }|*7
|
]]}
]],
}
end)
end)
end)