mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(screen): still match by full row when {MATCH:} is present (#34437)

Browse Source 
Add '^' and '$' around the pattern. This makes it less likely to make
mistakes of when writing tests with {MATCH:}, as most such tests have
text before and after {MATCH:}.
This commit is contained in:
zeertzjq
2025-06-11 09:56:12 +08:00
committed by GitHub
parent 1abcd9fe28
commit 37d6ac8a15
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/terminal/tui_spec.lua
View File

@@ -113,11 +113,13 @@ describe('TUI :detach', function()
nvim_set .. ' notermguicolors laststatus=2 background=dark', nvim_set .. ' notermguicolors laststatus=2 background=dark',
}, job_opts) }, job_opts)
--- FIXME: On Windows spaces at the end of a screen line may have wrong attrs.
--- Remove the {MATCH:} when that's fixed.
tt.feed_data('iHello, World') tt.feed_data('iHello, World')
screen:expect([[ screen:expect([[
Hello, World^ | Hello, World^ |
{4:~ }|*3 {4:~ }|*3
{MATCH:No Name} {5:[No Name] [+]{MATCH: *}}{MATCH: *}|
{3:-- INSERT --} | {3:-- INSERT --} |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]) ]])

1
test/functional/ui/screen.lua
View File

@@ -586,6 +586,7 @@ function Screen:expect(expected, attr_ids, ...)
after = after:sub(e + 1) after = after:sub(e + 1)
end end
end end
pat = pat and '^' .. pat .. '$'
if row ~= actual_rows[i] and (not pat or not actual_rows[i]:match(pat)) then if row ~= actual_rows[i] and (not pat or not actual_rows[i]:match(pat)) then
msg_expected_rows[i] = '*' .. msg_expected_rows[i] msg_expected_rows[i] = '*' .. msg_expected_rows[i]
if i <= #actual_rows then if i <= #actual_rows then