CI(screendump): Support iterative filtering for screendump comparison
Commit:
https://github.com/vim/vim/commit/624b75a272ccb736a463a2271811644618c3f5ab
Author: Aliaksei Budavei <0x000...@gmail.com>
Date: Fri Jul 25 20:06:38 2025 +0200
CI(screendump): Support iterative filtering for screendump comparison
Before two screendumps are compared for equality by calling
"VerifyScreenDump()", parts of their contents can be omitted
from comparison by executing arbitrary Vim commands written
in a filter file that shares its basename with screendumps.
Sometimes, such filtering can only be too general, as more
context is required in order to decide what parts to touch.
Two new arbitrary functions are therefore hooked in the body
of "VerifyScreenDump()" for the purpose of probing into the
current context and applying iterative filtering as needed.
A paired-up public implementation of each function is also
provided to expedite a workaround for #16559:
------------------------------------------------------------
source util/screendump.vim
let opts = {
\ 'FileComparisonPreAction':
\ function('g:ScreenDumpDiscardFFFDChars'),
\ 'NonEqualLineComparisonPostAction':
\ function('g:ScreenDumpLookForFFFDChars'),
\ }
call g:VerifyScreenDump(buf, basename, opts)
------------------------------------------------------------
related: #17704
Signed-off-by: Aliaksei Budavei <0x000...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/testdir/util/screendump.vim b/src/testdir/util/screendump.vim
index e39b334d2..c881eb963 100644
--- a/src/testdir/util/screendump.vim
+++ b/src/testdir/util/screendump.vim
@@ -29,11 +29,83 @@ def ReadAndFilter(fname: string, filter: string):
list<string>
return contents
enddef
+" Accommodate rendering idiosyncrasies (see #16559). For details, refer to
+" "VerifyScreenDump()" and the "options" dictionary passed to it: this is
+" an implementation of its "FileComparisonPreAction" entry. (This function
+" runs in couples with "g:ScreenDumpLookForFFFDChars()".)
+def g:ScreenDumpDiscardFFFDChars(
+ state: dict<number>,
+ testdump: list<string>,
+ refdump: list<string>)
+ if empty(state) || len(testdump) != len(refdump)
+ return
+ endif
+ for lstr: string in keys(state)
+ const lnum: number = str2nr(lstr)
+ const fst_fffd_idx: number = stridx(testdump[lnum], "\xef\xbf\xbd")
+ # Retroactively discard non-equal line suffixes. It is assumed that no
+ # runs of U+EFU+BFU+BD and no U+FFFDs are present in "refdump".
+ if fst_fffd_idx >= 0
+ # Mask the "||" character cells and the cursor cell ">.".
+ const masked_part: string = substitute(
+ substitute(
+ strpart(testdump[lnum], 0, (fst_fffd_idx - 1)),
+ '[>|]|', '|.', 'g'),
+ '|\@<!>', '|', 'g')
+ const prev_cell_idx: number = strridx(masked_part, '|')
+ # A series of repeated characters will be found recorded in shorthand;
+ # e.g. "|α@3" stands for a cell of four "α"s. Replacing any repeated
+ # multibyte character of a series with a U+FFFD character will split the
+ # series and its shorthand record will reflect this fact: "|α@2|�".
+ # Therefore, a common prefix to share for two corresponding lines can
+ # extend to either an ASCII character(s) cell before the leftmost U+FFFD
+ # character cell; or, a last-but-one arbitrary cell before the leftmost
+ # U+FFFD character cell; or, an empty string.
+ const prefix: number = (prev_cell_idx >= 0)
+ ? (char2nr(strpart(masked_part, (prev_cell_idx + 1), 1), true) < 128)
+ ? fst_fffd_idx - 1
+ : (strridx(masked_part, '|', (prev_cell_idx - 1)) >= 0)
+ ? prev_cell_idx
+ : 0
+ : 0
+ refdump[lnum] = strpart(refdump[lnum], 0, prefix)
+ testdump[lnum] = strpart(testdump[lnum], 0, prefix)
+ endif
+ endfor
+enddef
+
+" Accommodate rendering idiosyncrasies (see #16559). For details, refer to
+" "VerifyScreenDump()" and the "options" dictionary passed to it: this is
+" an implementation of its "NonEqualLineComparisonPostAction" entry. (This
+" function runs in couples with "g:ScreenDumpDiscardFFFDChars()".)
+def g:ScreenDumpLookForFFFDChars(
+ state: dict<number>,
+ testdump: list<string>,
+ lnum: number)
+ if stridx(testdump[lnum], "\xef\xbf\xbd") >= 0
+ state[string(lnum)] = 1
+ endif
+enddef
" Verify that Vim running in terminal buffer "buf" matches the screen dump.
-" "options" is passed to term_dumpwrite().
-" Additionally, the "wait" entry can specify the maximum time to wait for the
-" screen dump to match in msec (default 1000 msec).
+"
+" A copy of "options" is passed to "term_dumpwrite()". For convenience, this
+" dictionary supports other optional entries:
+" "wait", (default to 1000 msec at least)
+" the maximum time to wait for the screen dump to match in msec.
+" "FileComparisonPreAction", (default to a no-op action)
+" some Funcref to call, passing the following three arguments, each time
+" before the file contents of two screen dumps are compared:
+" some dictionary with some state entries;
+" the file contents of the newly generated screen dump;
+" the file contents of the reference screen dump.
+" "NonEqualLineComparisonPostAction", (default to a no-op action)
+" some Funcref to call, passing the following three arguments, each time
+" after a corresponding pair of lines is found not equal:
+" some dictionary with some state entries;
+" the file contents of the newly generated screen dump;
+" the zero-based number of the line whose copies are not equal.
+"
" The file name used is "dumps/{filename}.dump".
"
" To ignore part of the dump, provide a "dumps/{filename}.vim" file with
@@ -53,7 +125,24 @@ func VerifyScreenDump(buf, filename, options, ...)
let filter = 'dumps/' . a:filename . '.vim'
let testfile = 'failed/' . a:filename . '.dump'
- let max_loops = get(a:options, 'wait', 1000) / 1
+ let options_copy = copy(a:options)
+ if has_key(options_copy, 'wait')
+ let max_loops = max([0, remove(options_copy, 'wait')])
+ else
+ let max_loops = 1000
+ endif
+ if has_key(options_copy, 'FileComparisonPreAction')
+ let FileComparisonPreAction = remove(options_copy,
'FileComparisonPreAction')
+ let CopyStringList = {_refdump -> copy(_refdump)}
+ else
+ let FileComparisonPreAction = {_state, _testdump, _refdump -> 0}
+ let CopyStringList = {_refdump -> _refdump}
+ endif
+ if has_key(options_copy, 'NonEqualLineComparisonPostAction')
+ let NonEqualLineComparisonPostAction = remove(options_copy,
'NonEqualLineComparisonPostAction')
+ else
+ let NonEqualLineComparisonPostAction = {_state, _testdump, _lnum -> 0}
+ endif
" Starting a terminal to make a screendump is always considered flaky.
let g:test_is_flaky = 1
@@ -76,21 +165,25 @@ func VerifyScreenDump(buf, filename, options, ...)
" Leave a bit of time for updating the original window while we spin wait.
sleep 10m
call delete(testfile)
- call term_dumpwrite(a:buf, testfile, a:options)
+ call term_dumpwrite(a:buf, testfile, options_copy)
call assert_report('See new dump file: call term_dumpload("testdir/' ..
testfile .. '")')
" No point in retrying.
let g:run_nr = 10
return 1
endif
- let refdump = ReadAndFilter(reference, filter)
+ let refdump_orig = ReadAndFilter(reference, filter)
+ let state = {}
let i = 0
while 1
" Leave a bit of time for updating the original window while we spin wait.
sleep 1m
call delete(testfile)
- call term_dumpwrite(a:buf, testfile, a:options)
+ call term_dumpwrite(a:buf, testfile, options_copy)
+ " Filtering done with "FileComparisonPreAction()" may change "refdump*".
+ let refdump = CopyStringList(refdump_orig)
let testdump = ReadAndFilter(testfile, filter)
+ call FileComparisonPreAction(state, testdump, refdump)
if refdump == testdump
call delete(testfile)
if did_mkdir
@@ -116,6 +209,7 @@ func VerifyScreenDump(buf, filename, options, ...)
endif
if testdump[j] != refdump[j]
let msg = msg . '; difference in line ' . (j + 1) . ': "' . testdump[j]
. '"'
+ call NonEqualLineComparisonPostAction(state, testdump, j)
endif
endfor
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1ufMwt-00A4n0-2Y%40256bit.org.
