mirror of
https://github.com/amix/vimrc
synced 2025-06-24 07:44:59 +08:00
Updated plugins. Removed the tabstop merge that 010c2940ce
introduced
This commit is contained in:
@ -20,25 +20,33 @@ set cpo&vim
|
||||
function! SyntaxCheckers_javascript_closurecompiler_IsAvailable() dict
|
||||
call syntastic#log#deprecationWarn('javascript_closure_compiler_path', 'javascript_closurecompiler_path')
|
||||
|
||||
return
|
||||
\ executable("java") &&
|
||||
\ exists("g:syntastic_javascript_closurecompiler_path") &&
|
||||
\ filereadable(g:syntastic_javascript_closurecompiler_path)
|
||||
if !executable(self.getExec())
|
||||
return 0
|
||||
endif
|
||||
|
||||
let cp = get(g:, 'syntastic_javascript_closurecompiler_path', '')
|
||||
call self.log('g:syntastic_javascript_closurecompiler_path =', cp)
|
||||
|
||||
let jar = expand(cp)
|
||||
call self.log('filereadable(' . string(jar) . ') = ' . filereadable(jar))
|
||||
|
||||
return filereadable(jar)
|
||||
endfunction
|
||||
|
||||
function! SyntaxCheckers_javascript_closurecompiler_GetLocList() dict
|
||||
call syntastic#log#deprecationWarn('javascript_closure_compiler_options', 'javascript_closurecompiler_args')
|
||||
call syntastic#log#deprecationWarn('javascript_closure_compiler_file_list', 'javascript_closurecompiler_file_list')
|
||||
|
||||
if exists("g:syntastic_javascript_closurecompiler_file_list")
|
||||
let file_list = join(readfile(g:syntastic_javascript_closurecompiler_file_list))
|
||||
let flist = expand(get(g:, 'syntastic_javascript_closurecompiler_file_list', ''))
|
||||
if filereadable(flist)
|
||||
let file_list = map( readfile(flist), 'expand(v:var)' )
|
||||
else
|
||||
let file_list = syntastic#util#shexpand('%')
|
||||
let file_list = [expand('%')]
|
||||
endif
|
||||
|
||||
let makeprg = self.makeprgBuild({
|
||||
\ 'exe_after': '-jar ' . g:syntastic_javascript_closurecompiler_path,
|
||||
\ 'args_after': '--js' ,
|
||||
\ 'exe_after': ['-jar', expand(g:syntastic_javascript_closurecompiler_path)],
|
||||
\ 'args_after': '--js',
|
||||
\ 'fname': file_list })
|
||||
|
||||
let errorformat =
|
||||
|
@ -18,9 +18,14 @@ let s:save_cpo = &cpo
|
||||
set cpo&vim
|
||||
|
||||
function! SyntaxCheckers_javascript_eslint_IsAvailable() dict
|
||||
return
|
||||
\ executable(self.getExec()) &&
|
||||
\ syntastic#util#versionIsAtLeast(syntastic#util#getVersion(self.getExecEscaped() . ' --version'), [0, 1])
|
||||
if !executable(self.getExec())
|
||||
return 0
|
||||
endif
|
||||
|
||||
let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
|
||||
call self.log(self.getExec() . ' version =', ver)
|
||||
|
||||
return syntastic#util#versionIsAtLeast(ver, [0, 1])
|
||||
endfunction
|
||||
|
||||
function! SyntaxCheckers_javascript_eslint_GetLocList() dict
|
||||
|
@ -22,7 +22,10 @@ function! SyntaxCheckers_javascript_jshint_IsAvailable() dict
|
||||
if !executable(self.getExec())
|
||||
return 0
|
||||
endif
|
||||
|
||||
let s:jshint_version = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
|
||||
call self.log(self.getExec() . ' version =', s:jshint_version)
|
||||
|
||||
return syntastic#util#versionIsAtLeast(s:jshint_version, [1])
|
||||
endfunction
|
||||
|
||||
|
@ -19,10 +19,14 @@ set cpo&vim
|
||||
|
||||
function! SyntaxCheckers_javascript_jsxhint_IsAvailable() dict
|
||||
let jsxhint_version = system(self.getExecEscaped() . ' --version')
|
||||
return
|
||||
\ v:shell_error == 0 &&
|
||||
\ jsxhint_version =~# '\m^JSXHint\>' &&
|
||||
\ syntastic#util#versionIsAtLeast(syntastic#util#parseVersion(jsxhint_version), [0, 4, 1])
|
||||
if v:shell_error || (jsxhint_version !~# '\m^JSXHint\>')
|
||||
return 0
|
||||
endif
|
||||
|
||||
let ver = syntastic#util#parseVersion(jsxhint_version)
|
||||
call self.log(self.getExec() . ' version =', ver)
|
||||
|
||||
return syntastic#util#versionIsAtLeast(ver, [0, 4, 1])
|
||||
endfunction
|
||||
|
||||
function! SyntaxCheckers_javascript_jsxhint_GetLocList() dict
|
||||
|
Reference in New Issue
Block a user