From d950984489e50b12d87c85f0cce1d672c880aa23 Mon Sep 17 00:00:00 2001 From: h-east Date: Tue, 21 Feb 2023 13:33:17 +0000 Subject: patch 9.0.1335: no test for bad use of spaces in help files Problem: No test for bad use of spaces in help files. Solution: Add checks for use of spaces in help files. Ignore intentional spaces. (Hirohito Higashi, closes #11952) --- src/testdir/test_codestyle.vim | 63 ++++++++++++++++++++++++++++++++++++++++++ src/version.c | 2 ++ 2 files changed, 65 insertions(+) diff --git a/src/testdir/test_codestyle.vim b/src/testdir/test_codestyle.vim index c643ff2e84..ec476c038b 100644 --- a/src/testdir/test_codestyle.vim +++ b/src/testdir/test_codestyle.vim @@ -78,5 +78,68 @@ def Test_test_files() bwipe! enddef +def Test_help_files() + var lnum: number + set nowrapscan + + for fpath in glob('../../runtime/doc/*.txt', 0, 1) + exe 'edit ' .. fpath + + var fname = fnamemodify(fpath, ":t") + + # todo.txt is for developers, it's not need a strictly check + # version*.txt is a history and large size, so it's not checked + if fname == 'todo.txt' || fname =~ 'version.*\.txt' + continue + endif + + # Check for mixed tabs and spaces + cursor(1, 1) + while 1 + lnum = search('[^/] \t') + if fname == 'visual.txt' && getline(lnum) =~ "STRING \tjkl" + || fname == 'usr_27.txt' && getline(lnum) =~ "\[^\? \t\]" + continue + endif + assert_equal(0, lnum, fpath .. ': space before tab') + if lnum == 0 + break + endif + endwhile + + # Check for unnecessary whitespace at the end of a line + cursor(1, 1) + while 1 + lnum = search('[^/~\\]\s$') + # skip line that are known to have trailing white space + if fname == 'map.txt' && getline(lnum) =~ "unmap @@ $" + || fname == 'usr_12.txt' && getline(lnum) =~ "^\t/ \t$" + || fname == 'usr_41.txt' && getline(lnum) =~ "map o#include $" + || fname == 'change.txt' && getline(lnum) =~ "foobar bla $" + continue + endif + assert_equal(0, lnum, fpath .. ': trailing white space') + if lnum == 0 + break + endif + endwhile + + # TODO: Do check and fix help files +# # Check over 80 columns +# cursor(1, 1) +# while 1 +# lnum = search('\%>80v.*$') +# assert_equal(0, lnum, fpath .. ': line over 80 columns') +# if lnum == 0 +# break +# endif +# endwhile + + endfor + + set wrapscan&vim + bwipe! +enddef + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index c757629b16..d1dd656894 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1335, /**/ 1334, /**/ -- cgit v1.2.3