# HG changeset patch # User Bram Moolenaar # Date 1596996909 -7200 # Node ID 165d5890e4110c09af8e9955ce871945fd0efd1e # Parent 76dae0016d48e8dbceacd3d6a0a5229752bfef52 patch 8.2.1410: adding compiler plugin requires test change Commit: https://github.com/vim/vim/commit/7f7a8888699bca6df0a45a16db5f0e313383b5f1 Author: Bram Moolenaar Date: Sun Aug 9 20:05:41 2020 +0200 patch 8.2.1410: adding compiler plugin requires test change Problem: Adding compiler plugin requires test change. Solution: Include compiler plugin and adjust test. diff --git a/runtime/compiler/xo.vim b/runtime/compiler/xo.vim new file mode 100644 --- /dev/null +++ b/runtime/compiler/xo.vim @@ -0,0 +1,26 @@ +" Vim compiler file +" Compiler: XO +" Maintainer: Doug Kearns +" 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 +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 --- 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 \\\"\", 'tx') - call assert_match('^"compiler ant bcc .* xmlwf$', @:) + call assert_match('^"compiler ant bcc .* xmlwf xo$', @:) call feedkeys(":compiler p\\\"\", 'tx') call assert_equal('"compiler pbx perl php pylint pyunit', @:) diff --git a/src/version.c b/src/version.c --- 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,