diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-09 20:05:41 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-09 20:05:41 +0200 |
| commit | 7f7a8888699bca6df0a45a16db5f0e313383b5f1 (patch) | |
| tree | a9a42fb672337ff8768952981da8239f3056fc22 | |
| parent | 1e91eafc2e19b84ea44347ea929d2791d2fdd5e3 (diff) | |
| download | vim-git-7f7a8888699bca6df0a45a16db5f0e313383b5f1.tar.gz | |
patch 8.2.1410: adding compiler plugin requires test changev8.2.1410
Problem: Adding compiler plugin requires test change.
Solution: Include compiler plugin and adjust test.
| -rw-r--r-- | runtime/compiler/xo.vim | 26 | ||||
| -rw-r--r-- | src/testdir/test_compiler.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 30 insertions, 2 deletions
diff --git a/runtime/compiler/xo.vim b/runtime/compiler/xo.vim new file mode 100644 index 000000000..525657d4b --- /dev/null +++ b/runtime/compiler/xo.vim @@ -0,0 +1,26 @@ +" Vim compiler file +" Compiler: XO +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2019 Jul 10 + +if exists("current_compiler") + finish +endif +let current_compiler = "xo" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo&vim + +" CompilerSet makeprg=npx\ xo\ --reporter\ compact + +CompilerSet makeprg=xo\ --reporter\ compact +CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %trror\ %m, + \%f:\ line\ %l\\,\ col\ %c\\,\ %tarning\ %m, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save diff --git a/src/testdir/test_compiler.vim b/src/testdir/test_compiler.vim index 464dd9bcb..dd753c55b 100644 --- a/src/testdir/test_compiler.vim +++ b/src/testdir/test_compiler.vim @@ -46,7 +46,7 @@ func Test_compiler_without_arg() let a = split(execute('compiler')) call assert_match(runtime .. '/compiler/ant.vim$', a[0]) call assert_match(runtime .. '/compiler/bcc.vim$', a[1]) - call assert_match(runtime .. '/compiler/xmlwf.vim$', a[-1]) + call assert_match(runtime .. '/compiler/xo.vim$', a[-1]) endfunc " Test executing :compiler from the command line, not from a script @@ -60,7 +60,7 @@ endfunc func Test_compiler_completion() call feedkeys(":compiler \<C-A>\<C-B>\"\<CR>", 'tx') - call assert_match('^"compiler ant bcc .* xmlwf$', @:) + call assert_match('^"compiler ant bcc .* xmlwf xo$', @:) call feedkeys(":compiler p\<C-A>\<C-B>\"\<CR>", 'tx') call assert_equal('"compiler pbx perl php pylint pyunit', @:) diff --git a/src/version.c b/src/version.c index 0cd89d67a..e290ea29c 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1410, +/**/ 1409, /**/ 1408, |