It gets a bit tedious to see all the tests in the same color, so I wrote a vim syntax file to relax my eyes. I've tried to make it work in as many situations as possible, yet there are still some issues with HEREDOC strings. Much better than nothing though. This can be enabled with the following pattern: au BufRead,BufNewFile */t/*.sh set filetype=sh.sharness Whoever, that's already added to the project .vimrc. Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> --- .vimrc | 1 + contrib/vim/syntax/sharness.vim | 34 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 contrib/vim/syntax/sharness.vim diff --git a/.vimrc b/.vimrc index 602c746477..31600aaeca 100644 --- a/.vimrc +++ b/.vimrc @@ -11,6 +11,7 @@ " augroup git + au BufRead,BufNewFile */t/*.sh set filetype=sh.sharness au BufRead,BufNewFile */Documentation/*.txt set filetype=asciidoc au FileType c setl noexpandtab tabstop=8 shiftwidth=0 cino=(s,:0,l1,t0 diff --git a/contrib/vim/syntax/sharness.vim b/contrib/vim/syntax/sharness.vim new file mode 100644 index 0000000000..6ffc64ff06 --- /dev/null +++ b/contrib/vim/syntax/sharness.vim @@ -0,0 +1,34 @@ +let b:is_bash=1 +runtime! syntax/sh.vim + +syn keyword shsStatement test_done +syn keyword shsStatement test_set_editor test_set_index_version test_decode_color lf_to_nul nul_to_q q_to_nul q_to_cr q_to_tab qz_to_tab_space append_cr remove_cr generate_zero_bytes sane_unset test_tick test_pause debug test_commit test_merge test_commit_bulk test_chmod test_modebits test_unconfig test_config test_config_global write_script test_unset_prereq test_set_prereq test_have_prereq test_declared_prereq test_verify_prereq test_external test_external_without_stderr test_path_is_file test_path_is_dir test_path_exists test_dir_is_empty test_file_not_empty test_path_is_missing test_line_count test_file_size list_contains test_must_fail_acceptable test_must_fail test_might_fail test_expect_code test_i18ncmp test_i18ngrep verbose test_must_be_empty test_cmp_rev test_cmp_fspath test_seq test_when_finished test_atexit test_create_repo test_ln_s_add test_write_lines perl test_bool_env test_skip_or_die mingw_test_cmp test_env test_match_signal test_copy_bytes nongit depacketize hex2oct test_set_hash test_detect_hash test_oid_init test_oid_cache test_oid test_oid_to_path test_set_port test_bitmap_traversal test_path_is_hidden test_subcommand +syn keyword shsStatement test_cmp test_cmp_config test_cmp_bin packetize + +syn region shsTest fold start="\<test_expect_\w\+\>" end="$" contains=shsTestTitle +syn region shsTest fold start="\<test_expect_\w\+\>\s\+\<[A-Z_,]\+\>" end="$" contains=shsPrereq +syn region shsTest fold start="\<test_lazy_prereq\>\s\+\<[A-Z_,]\+\>" end="$" contains=shsPrereqLazy + +syn keyword shsTestStatement contained containedin=shsTest test_expect_success test_expect_failure test_expect_unstable test_lazy_prereq + +syn region shsTestTitle contained start=' 'hs=s+1 end=' 'me=e-1 nextgroup=shsTestBody contains=shSingleQuote,shDoubleQuote + +" multiple line body +syn region shsTestBody contained transparent excludenl matchgroup=shQuote start=+ '$+hs=s+1,rs=e end=+'$+ contains=@shSubShList +syn region shsTestBody contained transparent excludenl matchgroup=shQuote start=+ "$+hs=s+1,rs=e end=+"$+ contains=@shSubShList + +" single line body +syn region shsTestBody contained oneline transparent excludenl keepend matchgroup=shQuote start=+ '+hs=s+1 end=+'$+ contains=@shSubShList +syn region shsTestBody contained oneline transparent excludenl keepend matchgroup=shQuote start=+ "+hs=s+1 end=+"$+ contains=@shSubShList + +syn match shsPrereq contained "\<[A-Z_,]\+\>" nextgroup=shsTestTitle +syn match shsPrereqLazy contained "\<[A-Z_,]\+\>" nextgroup=shsTestBody + +syn cluster shCommandSubList add=shsTest,shsStatement + +hi def link shsStatement Statement +hi def link shsTestStatement Function +hi def link shsPrereq Identifier +hi def link shsPrereqLazy shsPrereq + +let b:current_syntax='sharness' -- 2.29.2
