From 96dd453f4ac917f8290f6343e86d3d764cb20ad9 Mon Sep 17 00:00:00 2001
From: Joshua Rahm <joshua.rahm@colorado.edu>
Date: Fri, 20 Dec 2013 16:10:18 -0700
Subject: [PATCH] added --vapidir support for vala

---
 syntax_checkers/vala/valac.vim | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/syntax_checkers/vala/valac.vim b/syntax_checkers/vala/valac.vim
index 5d33dab4..d3964547 100644
--- a/syntax_checkers/vala/valac.vim
+++ b/syntax_checkers/vala/valac.vim
@@ -6,7 +6,12 @@
 "             "// modules: " and containing space delimited list of vala
 "             modules, used by the file, so this script can build correct
 "             --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
 "             (http://www.vim.org/scripts/script.php?script_id=441).
 "             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\+')
 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
     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 =
         \ '%A%f:%l.%c-%\d%\+.%\d%\+: %t%[a-z]%\+: %m,'.