added --vapidir support for vala

This commit is contained in:
Joshua Rahm 2013-12-20 16:10:18 -07:00
parent 1852b5d386
commit 96dd453f4a

View File

@ -6,7 +6,12 @@
" "// modules: " and containing space delimited list of vala " "// modules: " and containing space delimited list of vala
" modules, used by the file, so this script can build correct " modules, used by the file, so this script can build correct
" --pkg arguments. " --pkg arguments.
" Alternatively you can set g:syntastic_vala_modules array " Add another special camment line into your vala file starting
" with "// vapidirs: " followed by a space delimited list of
" the vapi directories so this script can build with the correct
" --vapidir arguments
" Alternatively you can set the g:syntastic_vala_modules array
" and/or the g:syntastic_vala_vapidirs array
" in your .vimrc or .lvimrc with localvimrc plugin " in your .vimrc or .lvimrc with localvimrc plugin
" (http://www.vim.org/scripts/script.php?script_id=441). " (http://www.vim.org/scripts/script.php?script_id=441).
" Valac compiler is not the fastest thing in the world, so you " Valac compiler is not the fastest thing in the world, so you
@ -48,9 +53,26 @@ function! s:GetValaModules()
return split(strpart(modules_str, 12), '\s\+') return split(strpart(modules_str, 12), '\s\+')
endfunction endfunction
function! s:GetValaVapiDirs()
if exists('g:syntastic_vala_vapi_dirs')
if type(g:syntastic_vala_vapi_dirs) == type('')
return split(g:syntastic_vala_vapi_dirs, '\s\+')
elseif type(g:syntastic_vala_vapi_dirs) == type([])
return copy(g:syntastic_vala_vapi_dirs)
else
echoerr 'g:syntastic_vala_vapi_dirs must be either list or string: fallback to in file modules string'
endif
endif
let vapi_line = search('^//\s*vapidirs:\s*','n')
let vapi_str = getline(vapi_line)
return split( substitute( vapi_str, '^//\s*vapidirs:\s*', '', 'g' ), '\s\+' )
endfunction
function! SyntaxCheckers_vala_valac_GetLocList() dict function! SyntaxCheckers_vala_valac_GetLocList() dict
let vala_pkg_args = join(map(s:GetValaModules(), '"--pkg ".v:val'), ' ') let vala_pkg_args = join(map(s:GetValaModules(), '"--pkg ".v:val'), ' ')
let makeprg = self.makeprgBuild({ 'args': '-C ' . vala_pkg_args }) let vala_vapi_args = join(map(s:GetValaVapiDirs(), '"--vapidir ".v:val'), ' ')
let makeprg = self.makeprgBuild({ 'args': '-C ' . vala_pkg_args . " " . vala_vapi_args })
let errorformat = let errorformat =
\ '%A%f:%l.%c-%\d%\+.%\d%\+: %t%[a-z]%\+: %m,'. \ '%A%f:%l.%c-%\d%\+.%\d%\+: %t%[a-z]%\+: %m,'.