mirror of
https://github.com/amix/vimrc
synced 2025-07-21 20:05:00 +08:00
merge
This commit is contained in:
@ -8,12 +8,9 @@
|
||||
" Want To Public License, Version 2, as published by Sam Hocevar.
|
||||
" See http://sam.zoy.org/wtfpl/COPYING for more details.
|
||||
"
|
||||
"
|
||||
"Installation: $ npm install -g js-yaml
|
||||
"
|
||||
"============================================================================
|
||||
|
||||
if exists("g:loaded_syntastic_yaml_jsyaml_checker")
|
||||
if exists('g:loaded_syntastic_yaml_jsyaml_checker')
|
||||
finish
|
||||
endif
|
||||
let g:loaded_syntastic_yaml_jsyaml_checker = 1
|
||||
@ -23,9 +20,7 @@ set cpo&vim
|
||||
|
||||
function! SyntaxCheckers_yaml_jsyaml_GetLocList() dict
|
||||
if !exists('s:js_yaml_new')
|
||||
let ver = syntastic#util#getVersion(self.getExecEscaped() . ' --version')
|
||||
call self.log(self.getExec() . ' version =', ver)
|
||||
let s:js_yaml_new = syntastic#util#versionIsAtLeast(ver, [2])
|
||||
let s:js_yaml_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2])
|
||||
endif
|
||||
|
||||
let makeprg = self.makeprgBuild({ 'args_after': (s:js_yaml_new ? '' : '--compact') })
|
||||
@ -33,12 +28,13 @@ function! SyntaxCheckers_yaml_jsyaml_GetLocList() dict
|
||||
let errorformat =
|
||||
\ 'Error on line %l\, col %c:%m,' .
|
||||
\ 'JS-YAML: %m at line %l\, column %c:,' .
|
||||
\ 'YAMLException: %m at line %l\, column %c:,' .
|
||||
\ '%-G%.%#'
|
||||
|
||||
return SyntasticMake({
|
||||
\ 'makeprg': makeprg,
|
||||
\ 'errorformat': errorformat,
|
||||
\ 'defaults': {'bufnr': bufnr("")} })
|
||||
\ 'defaults': {'bufnr': bufnr('')} })
|
||||
endfunction
|
||||
|
||||
call g:SyntasticRegistry.CreateAndRegisterChecker({
|
||||
@ -49,4 +45,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
|
||||
let &cpo = s:save_cpo
|
||||
unlet s:save_cpo
|
||||
|
||||
" vim: set et sts=4 sw=4:
|
||||
" vim: set sw=4 sts=4 et fdm=marker:
|
||||
|
@ -0,0 +1,52 @@
|
||||
"============================================================================
|
||||
"File: yamllint.vim
|
||||
"Description: YAML files linting for syntastic.vim
|
||||
"Maintainer: Adrien Vergé
|
||||
"License: This program is free software. It comes without any warranty,
|
||||
" to the extent permitted by applicable law. You can redistribute
|
||||
" it and/or modify it under the terms of the Do What The Fuck You
|
||||
" Want To Public License, Version 2, as published by Sam Hocevar.
|
||||
" See http://sam.zoy.org/wtfpl/COPYING for more details.
|
||||
"
|
||||
"============================================================================
|
||||
|
||||
if exists('g:loaded_syntastic_yaml_yamllint_checker')
|
||||
finish
|
||||
endif
|
||||
let g:loaded_syntastic_yaml_yamllint_checker = 1
|
||||
|
||||
let s:save_cpo = &cpo
|
||||
set cpo&vim
|
||||
|
||||
function! SyntaxCheckers_yaml_yamllint_GetLocList() dict
|
||||
let makeprg = self.makeprgBuild({ 'args_after': '-f parsable' })
|
||||
|
||||
let errorformat =
|
||||
\ '%f:%l:%c: [%trror] %m,' .
|
||||
\ '%f:%l:%c: [%tarning] %m'
|
||||
|
||||
let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
|
||||
|
||||
let loclist = SyntasticMake({
|
||||
\ 'makeprg': makeprg,
|
||||
\ 'errorformat': errorformat,
|
||||
\ 'env': env,
|
||||
\ 'returns': [0, 1] })
|
||||
|
||||
for e in loclist
|
||||
if e['type'] ==? 'W'
|
||||
let e['subtype'] = 'Style'
|
||||
endif
|
||||
endfor
|
||||
|
||||
return loclist
|
||||
endfunction
|
||||
|
||||
call g:SyntasticRegistry.CreateAndRegisterChecker({
|
||||
\ 'filetype': 'yaml',
|
||||
\ 'name': 'yamllint' })
|
||||
|
||||
let &cpo = s:save_cpo
|
||||
unlet s:save_cpo
|
||||
|
||||
" vim: set sw=4 sts=4 et fdm=marker:
|
@ -7,11 +7,10 @@
|
||||
" it and/or modify it under the terms of the Do What The Fuck You
|
||||
" Want To Public License, Version 2, as published by Sam Hocevar.
|
||||
" See http://sam.zoy.org/wtfpl/COPYING for more details.
|
||||
"Installation: cpanm YAML::XS
|
||||
"
|
||||
"============================================================================
|
||||
|
||||
if exists("g:loaded_syntastic_yaml_yamlxs_checker")
|
||||
if exists('g:loaded_syntastic_yaml_yamlxs_checker')
|
||||
finish
|
||||
endif
|
||||
let g:loaded_syntastic_yaml_yamlxs_checker = 1
|
||||
@ -30,13 +29,14 @@ function! SyntaxCheckers_yaml_yamlxs_IsAvailable() dict
|
||||
|
||||
" don't call executable() here, to allow things like
|
||||
" let g:syntastic_perl_interpreter='/usr/bin/env perl'
|
||||
silent! call system(self.getExecEscaped() . ' ' . s:Modules() . ' -e ' . syntastic#util#shescape('exit(0)'))
|
||||
silent! call syntastic#util#system(self.getExecEscaped() . ' ' . s:Modules(bufnr('')) . ' -e ' . syntastic#util#shescape('exit(0)'))
|
||||
return v:shell_error == 0
|
||||
endfunction
|
||||
|
||||
function! SyntaxCheckers_yaml_yamlxs_GetLocList() dict
|
||||
let buf = bufnr('')
|
||||
let makeprg = self.makeprgBuild({
|
||||
\ 'args_before': s:Modules() . ' -e ' . syntastic#util#shescape('YAML::XS::LoadFile($ARGV[0])') })
|
||||
\ 'args_before': s:Modules(buf) . ' -e ' . syntastic#util#shescape('YAML::XS::LoadFile($ARGV[0])') })
|
||||
|
||||
let errorformat =
|
||||
\ '%EYAML::XS::Load Error: The problem:,' .
|
||||
@ -49,15 +49,16 @@ function! SyntaxCheckers_yaml_yamlxs_GetLocList() dict
|
||||
\ 'makeprg': makeprg,
|
||||
\ 'errorformat': errorformat,
|
||||
\ 'postprocess': ['compressWhitespace'],
|
||||
\ 'defaults': {'bufnr': bufnr("")} })
|
||||
\ 'defaults': {'bufnr': bufnr('')} })
|
||||
endfunction
|
||||
|
||||
function s:Modules()
|
||||
if type(g:syntastic_perl_lib_path) == type('')
|
||||
call syntastic#log#oneTimeWarn('variable g:syntastic_perl_lib_path should be a list')
|
||||
let includes = split(g:syntastic_perl_lib_path, ',')
|
||||
function s:Modules(buf)
|
||||
let lib_path = syntastic#util#bufVar(a:buf, 'perl_lib_path')
|
||||
if type(lib_path) == type('')
|
||||
call syntastic#log#oneTimeWarn('variable syntastic_perl_lib_path should be a list')
|
||||
let includes = split(lib_path, ',')
|
||||
else
|
||||
let includes = copy(syntastic#util#var('perl_lib_path'))
|
||||
let includes = copy(lib_path)
|
||||
endif
|
||||
return join(map(includes, '"-I" . v:val') + ['-MYAML::XS'])
|
||||
endfunction
|
||||
@ -70,4 +71,4 @@ call g:SyntasticRegistry.CreateAndRegisterChecker({
|
||||
let &cpo = s:save_cpo
|
||||
unlet s:save_cpo
|
||||
|
||||
" vim: set et sts=4 sw=4:
|
||||
" vim: set sw=4 sts=4 et fdm=marker:
|
||||
|
Reference in New Issue
Block a user