Skip to content

Commit 7f7a888

Browse files
committed
patch 8.2.1410: adding compiler plugin requires test change
Problem: Adding compiler plugin requires test change. Solution: Include compiler plugin and adjust test.
1 parent 1e91eaf commit 7f7a888

3 files changed

Lines changed: 30 additions & 2 deletions

File tree

runtime/compiler/xo.vim

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
" Vim compiler file
2+
" Compiler: XO
3+
" Maintainer: Doug Kearns <[email protected]>
4+
" Last Change: 2019 Jul 10
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "xo"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
" CompilerSet makeprg=npx\ xo\ --reporter\ compact
19+
20+
CompilerSet makeprg=xo\ --reporter\ compact
21+
CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %trror\ %m,
22+
\%f:\ line\ %l\\,\ col\ %c\\,\ %tarning\ %m,
23+
\%-G%.%#
24+
25+
let &cpo = s:cpo_save
26+
unlet s:cpo_save

src/testdir/test_compiler.vim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func Test_compiler_without_arg()
4646
let a = split(execute('compiler'))
4747
call assert_match(runtime .. '/compiler/ant.vim$', a[0])
4848
call assert_match(runtime .. '/compiler/bcc.vim$', a[1])
49-
call assert_match(runtime .. '/compiler/xmlwf.vim$', a[-1])
49+
call assert_match(runtime .. '/compiler/xo.vim$', a[-1])
5050
endfunc
5151

5252
" Test executing :compiler from the command line, not from a script
@@ -60,7 +60,7 @@ endfunc
6060

6161
func Test_compiler_completion()
6262
call feedkeys(":compiler \<C-A>\<C-B>\"\<CR>", 'tx')
63-
call assert_match('^"compiler ant bcc .* xmlwf$', @:)
63+
call assert_match('^"compiler ant bcc .* xmlwf xo$', @:)
6464

6565
call feedkeys(":compiler p\<C-A>\<C-B>\"\<CR>", 'tx')
6666
call assert_equal('"compiler pbx perl php pylint pyunit', @:)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static char *(features[]) =
754754

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
1410,
757759
/**/
758760
1409,
759761
/**/

0 commit comments

Comments
 (0)