BaseX checker: cleanup.

README.markdown

@@ -62,8 +62,8 @@ Mercury, NASM, Nix, Objective-C, Objective-C++, OCaml, Perl, Perl POD, PHP,
 gettext Portable Object, OS X and iOS property lists, Puppet, Python, QML, R,
 Racket, Relax NG, reStructuredText, RPM spec, Ruby, SASS/SCSS, Scala, Slim,
 SML, Sphinx, SQL, Stylus, Tcl, TeX, Texinfo, Twig, TypeScript, Vala, Verilog,
-VHDL, VimL, xHtml, XML, XSLT, YACC, YAML, z80, Zope page templates, and zsh.
-See the [wiki][3] for details about the corresponding supported checkers.
+VHDL, VimL, xHtml, XML, XSLT, XQuery, YACC, YAML, z80, Zope page templates, and
+zsh.  See the [wiki][3] for details about the corresponding supported checkers.
 
 A number of third-party Vim plugins also provide checkers for syntastic,
 for example: [merlin][30], [omnisharp-vim][25], [rust.vim][12],

plugin/syntastic.vim

@@ -19,7 +19,7 @@ if has('reltime')
     lockvar! g:_SYNTASTIC_START
 endif
 
-let g:_SYNTASTIC_VERSION = '3.7.0-6'
+let g:_SYNTASTIC_VERSION = '3.7.0-9'
 lockvar g:_SYNTASTIC_VERSION
 
 " Sanity checks {{{1

syntax_checkers/xquery/basex.vim

@@ -17,27 +17,28 @@ let g:loaded_syntastic_xquery_basex_checker = 1
 let s:save_cpo = &cpo
 set cpo&vim
 
-if exists('g:syntastic_extra_filetypes')
-    call add(g:syntastic_extra_filetypes, 'xquery')
-else
-    let g:syntastic_extra_filetypes = ['xquery']
-endif
+function! SyntaxCheckers_xquery_basex_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'fname_before': '-z',
+        \ 'fname': ['-q', "inspect:module('" . expand('%:p', 1) . "')"] })
 
-function SyntaxCheckers_xquery_basex_IsAvailable() dict
-    return executable(expand(self.getExec(), 1))
-endfunction
-
-function SyntaxCheckers_xquery_basex_GetLocList() dict
-    let makeprg = 'basex -z -q "inspect:module(' . "'" . expand("%:p") . "')" . '"'
     let errorformat =
-        \ '%-GStopped at .\, %l/%c:,'.
-        \ '%E[%.%#] Stopped at %f\, %l/%c:,'.
-        \ '%Z[%t%#%n] %m'
+        \ '%-GStopped at %\%.\, %l/%c:,'.
+        \ '%A[%.%#] Stopped at %f\, %l/%c:,'.
+        \ '%Z[%t%\D%#%n] %m'
 
-    return SyntasticMake({
+    let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat
-        \ })
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'] })
+
+    for e in loclist
+        if e['type'] !=# 'W' && e['type'] !=# 'E'
+            let e['type'] = 'E'
+        endif
+    endfor
+
+    return loclist
 endfunction
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({