1
0
forked from aniani/vim

runtime(syntax-tests): include missing changes

related: #14215

Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Aliaksei Budavei 2024-03-18 20:39:32 +01:00 committed by Christian Brabandt
parent ef21bcaab1
commit a2addebca3
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
3 changed files with 10 additions and 9 deletions

View File

@ -34,7 +34,7 @@ Make sure to include some interesting constructs with plenty of complicated
highlighting. Optionally, pre-configure the testing environment by including highlighting. Optionally, pre-configure the testing environment by including
setup commands at the top of the input file. The format for these lines is: setup commands at the top of the input file. The format for these lines is:
TEST_SETUP {command} VIM_TEST_SETUP {command}
where {command} is any valid Ex command, which extends to the end of the line. where {command} is any valid Ex command, which extends to the end of the line.
The first 20 lines of the input file are ALWAYS scanned for setup commands and The first 20 lines of the input file are ALWAYS scanned for setup commands and
@ -44,8 +44,8 @@ errors in the input file but this is not required.
Continuing the Java example: Continuing the Java example:
// TEST_SETUP let g:java_space_errors = 1 // VIM_TEST_SETUP let g:java_space_errors = 1
// TEST_SETUP let g:java_minlines = 5 // VIM_TEST_SETUP let g:java_minlines = 5
class Test { } class Test { }
As an alternative, setup commands can be included in an external Vim script As an alternative, setup commands can be included in an external Vim script
@ -59,7 +59,7 @@ an "input/setup/java.vim" script file with the following lines:
let g:java_minlines = 5 let g:java_minlines = 5
Both inline setup commands and setup scripts may be used at the same time, the Both inline setup commands and setup scripts may be used at the same time, the
script file will be sourced before any TEST_SETUP commands are executed. script file will be sourced before any VIM_TEST_SETUP commands are executed.
If there is no further setup required, you can now run the tests: If there is no further setup required, you can now run the tests:

View File

@ -1,5 +1,5 @@
/* vi:set ts=8 sts=4 sw=4 noet: /* vi:set ts=8 sts=4 sw=4 noet:
* TEST_SETUP let g:c_comment_strings = 1 * VIM_TEST_SETUP let g:c_comment_strings = 1
* *
* VIM - Vi IMproved by Bram Moolenaar * VIM - Vi IMproved by Bram Moolenaar
* *

View File

@ -149,17 +149,18 @@ func RunTest()
func SetUpVim() func SetUpVim()
call cursor(1, 1) call cursor(1, 1)
" Defend against rogue TEST_SETUP commands. " Defend against rogue VIM_TEST_SETUP commands.
for _ in range(20) for _ in range(20)
let lnum = search('\<TEST_SETUP\>', 'eW', 20) let lnum = search('\C\<VIM_TEST_SETUP\>', 'eW', 20)
if lnum < 1 if lnum < 1
break break
endif endif
exe substitute(getline(lnum), '.*TEST_SETUP', '', '') exe substitute(getline(lnum), '\C.*\<VIM_TEST_SETUP\>', '', '')
endfor endfor
call cursor(1, 1) call cursor(1, 1)
" BEGIN [runtime/defaults.vim] " BEGIN [runtime/defaults.vim]
set display=truncate ruler scrolloff=5 " Also, disable italic highlighting to avoid issues on some terminals.
set display=truncate ruler scrolloff=5 t_ZH= t_ZR=
syntax on syntax on
" END [runtime/defaults.vim] " END [runtime/defaults.vim]
redraw! redraw!