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 (file)
index 0000000..525657d
--- /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 464dd9bcb5a6243f4c19f659675d5c7be9405a01..dd753c55ba0b5b64ce0923d6696c111dc32bba36 100644 (file)
--- 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 0cd89d67a23044b15d3fe222f6540d2c1e7587e9..e290ea29cae8aa315b311f2cd72d31b09ba66515 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1410,
 /**/
     1409,
 /**/