commit e2bc84e3156032d78891bc52ff466b9e552140cf
parent 196df35cca7df2f499ce6f1352184bf7034801c7
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu, 22 Jan 2026 14:08:57 +0800
Merge pull request #37498 from zeertzjq/vim-6f585da
vim-patch: po/check.vim updates
Diffstat:
| M | src/nvim/po/check.vim | | | 198 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------- |
1 file changed, 148 insertions(+), 50 deletions(-)
diff --git a/src/nvim/po/check.vim b/src/nvim/po/check.vim
@@ -1,14 +1,21 @@
" 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".
+" Goes through the xx.po file (more than once)
+" and verify various congruences
+" See the comments in the code
-if 1 " Only execute this if the eval feature is available.
+" Last Update: 2025 Aug 06
-" using line continuation
+if 1 " Only execute this if the eval feature is available.
+
+" Using line continuation (set cpo to vim default value)
+let s:save_cpo = &cpo
set cpo&vim
+" This only works when 'wrapscan' is not set.
+let s:save_wrapscan = &wrapscan
+set nowrapscan
+
let filename = "check-" . expand("%:t:r") . ".log"
exe 'redir! > ' . filename
@@ -18,7 +25,7 @@ exe 'redir! > ' . filename
func! GetMline()
let idline = substitute(getline('.'), '"\(.*\)"$', '\1', '')
while line('.') < line('$')
- +
+ silent +
let line = getline('.')
if line[0] != '"'
break
@@ -44,77 +51,92 @@ func! GetMline()
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
+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
+
+" main
" Start at the first "msgid" line.
let wsv = winsaveview()
-1
-keeppatterns /^msgid\>
+silent 1
+silent 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
+ " for each "msgid"
+
+ " check msgid "Text;editor;"
+ " translation must have two or more ";" (in case of more categories)
let lnum = line('.')
if getline(lnum) =~ 'msgid "Text;.*;"'
- if getline(lnum + 1) !~ '^msgstr "\([^;]\+;\)\+"'
+ if getline(lnum + 1) !~ '^msgstr "\([^;]\+;\)\+"$'
echomsg 'Mismatching ; in line ' . (lnum + 1)
- echomsg 'Did you forget the trailing semicolon?'
+ echomsg 'Wrong semicolon count'
if error == 0
- let error = lnum + 1
+ let error = lnum + 1
endif
endif
endif
+ " check for equal number of % in msgid and msgstr
+ " it is skipping the no-c-format strings
if getline(line('.') - 1) !~ "no-c-format"
- " go over the "msgid" and "msgid_plural" lines
+ " skip the "msgid_plural" lines
let prevfromline = 'foobar'
let plural = 0
while 1
if getline('.') =~ 'msgid_plural'
- let plural += 1
+ 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
+ \ && (plural != 1
+ \ || count(prevfromline, '%') + 1 != count(fromline, '%'))
+ echomsg 'possibly mismatching % in line ' . (line('.') - 1)
+ echomsg 'msgid: ' . prevfromline
+ echomsg 'msgid: ' . fromline
+ if error == 0
+ let error = line('.')
+ endif
endif
if getline('.') !~ 'msgid_plural'
- break
+ break
endif
let prevfromline = fromline
endwhile
+ " checks that for each 'msgid' there is a 'msgstr'
if getline('.') !~ '^msgstr'
echomsg 'Missing "msgstr" in line ' . line('.')
if error == 0
- let error = line('.')
+ let error = line('.')
endif
endif
- " check all the 'msgstr' lines
+ " check all the 'msgstr' lines have the same number of '%'
+ " only the number of '%' is checked,
+ " %d vs. %s or %d vs. %ld go undetected
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
+ \ && (plural == 0 || count(fromline, '%') != count(toline, '%') + 1)
+ echomsg 'possibly mismatching % in line ' . (line('.') - 1)
+ echomsg 'msgid: ' . fromline
+ echomsg 'msgstr: ' . toline
+ if error == 0
+ let error = line('.')
+ endif
endif
if line('.') == line('$')
- break
+ break
endif
endwhile
endif
@@ -135,7 +157,7 @@ endwhile
" - msgstr "E123 ..." missing colon
" - msgstr "..." missing error code
"
-1
+silent 1
if search('msgid "\("\n"\)\?\([EW][0-9]\+:\).*\nmsgstr "\("\n"\)\?[^"]\@=\2\@!') > 0
echomsg 'Mismatching error/warning code in line ' . line('.')
if error == 0
@@ -143,18 +165,10 @@ if search('msgid "\("\n"\)\?\([EW][0-9]\+:\).*\nmsgstr "\("\n"\)\?[^"]\@=\2\@!')
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:
+silent 1
+silent keeppatterns /^"MIME-Version:
while 1
let lnum = search('^msgid\>')
if lnum <= 0
@@ -176,6 +190,64 @@ while 1
endif
endwhile
+" Check that the eventual continuation of 'msgstr' is well formed
+" final '""', '\n"', ' "' '/"' '."' '-"' are OK
+" Beware, it can give false positives if the message is split
+" in the middle of a word
+silent 1
+silent keeppatterns /^"MIME-Version:
+while 1
+ let lnum = search('^msgid\>')
+ if lnum <= 0
+ break
+ endif
+ " "msgstr" goes from strlnum to end-1
+ let strlnum = search('^msgstr\>')
+ let end = search('^$')
+ if end <= 0
+ let end = line('$') + 1
+ endif
+ " only if there is a continuation line...
+ if end > strlnum + 1
+ let ilnum = strlnum
+ while ilnum < end - 1
+ let iltype = 0
+ if getline( ilnum ) =~ "^msgid_plural"
+ let iltype = 2
+ endif
+ if getline( ilnum ) =~ "^msgstr["
+ let iltype = 2
+ endif
+ if getline( ilnum ) =~ "\"\""
+ let iltype = 1
+ endif
+ if getline( ilnum ) =~ " \"$"
+ let iltype = 1
+ endif
+ if getline( ilnum ) =~ "-\"$"
+ let iltype = 1
+ endif
+ if getline( ilnum ) =~ "/\"$"
+ let iltype = 1
+ endif
+ if getline( ilnum ) =~ "\\.\"$"
+ let iltype = 1
+ endif
+ if getline( ilnum ) =~ "\\\\n\"$"
+ let iltype = 1
+ endif
+ if iltype == 0
+ echomsg 'Possibly incorrect final at line: ' . ilnum
+ " TODO: make this an error
+ " if error == 0
+ " let error = ilnum
+ " endif
+ endif
+ let ilnum += 1
+ endwhile
+ endif
+endwhile
+
" Check that the file is well formed according to msgfmts understanding
if executable("msgfmt")
let filename = expand("%")
@@ -190,7 +262,7 @@ if executable("msgfmt")
endif
" Check that the plural form is properly initialized
-1
+silent 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
@@ -210,25 +282,44 @@ 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"
+ echomsg "Warn: 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_...'"
+ echomsg "Warn: 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'"
+ echomsg "Warn: Content-Type charset should be 'UTF-8' instead of 'utf-8'"
" TODO: make this an error
" if error == 0
" let error = ct
" endif
endif
+" Check that no lines are longer than 80 chars (except comments)
+let overlong = search('^[^#]\%>80v', 'n')
+if overlong > 0
+ echomsg "Warn: Lines should be wrapped at 80 columns"
+ " TODO: make this an error
+ " if error == 0
+ " let error = overlong
+ " endif
+endif
+
+" Check that there is no trailing whitespace
+let overlong = search('\s\+$', 'n')
+if overlong > 0
+ echomsg $"Warn: Trailing whitespace at line: {overlong}"
+ " TODO: make this an error
+ " if error == 0
+ " let error = overlong
+ " endif
+endif
if error == 0
" If all was OK restore the view.
@@ -241,7 +332,14 @@ endif
redir END
+" restore original wrapscan
let &wrapscan = s:save_wrapscan
unlet s:save_wrapscan
+" restore original cpo
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
endif
+
+" vim:sts=2:sw=2:et
