Mercurial > vim
view src/po/check.vim @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 28 Mar 2024 12:15:03 +0100 |
parents | 2d5e8c46508b |
children | c4ca0b638fac |
line wrap: on
line source
" Vim script for checking .po files. " " Go through the file and verify that: " - All %...s items in "msgid" are identical to the ones in "msgstr". " - An error or warning code in "msgid" matches the one in "msgstr". if 1 " Only execute this if the eval feature is available. " using line continuation set cpo&vim " Function to get a split line at the cursor. " Used for both msgid and msgstr lines. " Removes all text except % items and returns the result. func! GetMline() let idline = substitute(getline('.'), '"\(.*\)"$', '\1', '') while line('.') < line('$') + let line = getline('.') if line[0] != '"' break endif let idline .= substitute(line, '"\(.*\)"$', '\1', '') endwhile " remove '%', not used for formatting. let idline = substitute(idline, "'%'", '', 'g') let idline = substitute(idline, "%%", '', 'g') " remove '%' used for plural forms. let idline = substitute(idline, '\\nPlural-Forms: .\+;\\n', '', '') " remove duplicate positional format arguments let idline2 = "" while idline2 != idline let idline2 = idline let idline = substitute(idline, '%\([1-9][0-9]*\)\$\([-+ #''.*]*[0-9]*l\=[dsuxXpoc%]\)\(.*\)%\1$\([-+ #''.*]*\)\(l\=[dsuxXpoc%]\)', '%\1$\2\3\4', 'g') endwhile " remove everything but % items. return substitute(idline, '[^%]*\(%([1-9][0-9]*\$)\=[-+ #''.0-9*]*l\=[dsuxXpoc%]\)\=', '\1', 'g') endfunc " This only works when 'wrapscan' is not set. let s:save_wrapscan = &wrapscan set nowrapscan " Start at the first "msgid" line. let wsv = winsaveview() 1 keeppatterns /^msgid\> " When an error is detected this is set to the line number. " Note: this is used in the Makefile. let error = 0 while 1 let lnum = line('.') if getline(lnum) =~ 'msgid "Text;.*;"' if getline(lnum + 1) !~ '^msgstr "\([^;]\+;\)\+"' echomsg 'Mismatching ; in line ' . (lnum + 1) echomsg 'Did you forget the trailing semicolon?' if error == 0 let error = lnum + 1 endif endif endif if getline(line('.') - 1) !~ "no-c-format" " go over the "msgid" and "msgid_plural" lines let prevfromline = 'foobar' let plural = 0 while 1 if getline('.') =~ 'msgid_plural' let plural += 1 endif let fromline = GetMline() if prevfromline != 'foobar' && prevfromline != fromline \ && (plural != 1 \ || count(prevfromline, '%') + 1 != count(fromline, '%')) echomsg 'Mismatching % in line ' . (line('.') - 1) echomsg 'msgid: ' . prevfromline echomsg 'msgid: ' . fromline if error == 0 let error = line('.') endif endif if getline('.') !~ 'msgid_plural' break endif let prevfromline = fromline endwhile if getline('.') !~ '^msgstr' echomsg 'Missing "msgstr" in line ' . line('.') if error == 0 let error = line('.') endif endif " check all the 'msgstr' lines while getline('.') =~ '^msgstr' let toline = GetMline() if fromline != toline \ && (plural == 0 || count(fromline, '%') != count(toline, '%') + 1) echomsg 'Mismatching % in line ' . (line('.') - 1) echomsg 'msgid: ' . fromline echomsg 'msgstr: ' . toline if error == 0 let error = line('.') endif endif if line('.') == line('$') break endif endwhile endif " Find next msgid. Quit when there is no more. let lnum = line('.') silent! keeppatterns /^msgid\> if line('.') == lnum break endif endwhile " Check that error code in msgid matches the one in msgstr. " " Examples of mismatches found with msgid "E123: ..." " - msgstr "E321: ..." error code mismatch " - msgstr "W123: ..." warning instead of error " - msgstr "E123 ..." missing colon " - msgstr "..." missing error code " 1 if search('msgid "\("\n"\)\?\([EW][0-9]\+:\).*\nmsgstr "\("\n"\)\?[^"]\@=\2\@!') > 0 echomsg 'Mismatching error/warning code in line ' . line('.') if error == 0 let error = line('.') endif endif func! CountNl(first, last) let nl = 0 for lnum in range(a:first, a:last) let nl += count(getline(lnum), "\n") endfor return nl endfunc " Check that the \n at the end of the msgid line is also present in the msgstr " line. Skip over the header. 1 keeppatterns /^"MIME-Version: while 1 let lnum = search('^msgid\>') if lnum <= 0 break endif let strlnum = search('^msgstr\>') let end = search('^$') if end <= 0 let end = line('$') + 1 endif let origcount = CountNl(lnum, strlnum - 1) let transcount = CountNl(strlnum, end - 1) " Allow for a few more or less line breaks when there are 2 or more if origcount != transcount && (origcount <= 2 || transcount <= 2) echomsg 'Mismatching "\n" in line ' . line('.') if error == 0 let error = lnum endif endif endwhile " Check that the file is well formed according to msgfmts understanding if executable("msgfmt") let filename = expand("%") " Newer msgfmt does not take OLD_PO_FILE_INPUT argument, must be in " environment. let $OLD_PO_FILE_INPUT = 'yes' let a = system("msgfmt --statistics " . filename) if v:shell_error != 0 let error = matchstr(a, filename.':\zs\d\+\ze:')+0 for line in split(a, '\n') | echomsg line | endfor endif endif " Check that the plural form is properly initialized 1 let plural = search('^msgid_plural ', 'n') if (plural && search('^"Plural-Forms: ', 'n') == 0) || (plural && search('^msgstr\[0\] ".\+"', 'n') != plural + 1) if search('^"Plural-Forms: ', 'n') == 0 echomsg "Missing Plural header" if error == 0 let error = search('\(^"[A-Za-z-_]\+: .*\\n"\n\)\+\zs', 'n') - 1 endif elseif error == 0 let error = plural endif elseif !plural && search('^"Plural-Forms: ', 'n') " We allow for a stray plural header, msginit adds one. endif " Check that 8bit encoding is used instead of 8-bit let cte = search('^"Content-Transfer-Encoding:\s\+8-bit', 'n') let ctc = search('^"Content-Type:.*;\s\+\<charset=[iI][sS][oO]_', 'n') let ctu = search('^"Content-Type:.*;\s\+\<charset=utf-8', 'n') if cte echomsg "Content-Transfer-Encoding should be 8bit instead of 8-bit" " TODO: make this an error " if error == 0 " let error = cte " endif elseif ctc echomsg "Content-Type charset should be 'ISO-...' instead of 'ISO_...'" " TODO: make this an error " if error == 0 " let error = ct " endif elseif ctu echomsg "Content-Type charset should be 'UTF-8' instead of 'utf-8'" " TODO: make this an error " if error == 0 " let error = ct " endif endif if error == 0 " If all was OK restore the view. call winrestview(wsv) echomsg "OK" else " Put the cursor on the line with the error. exe error endif let &wrapscan = s:save_wrapscan unlet s:save_wrapscan endif