Fix #557 - Detect C project roots and include root directories with headers, or include directories

4 files changed, 20 insertions, 8 deletions

diff --git a/ale_linters/c/clang.vim b/ale_linters/c/clang.vim
index ae96ba43..ecfa5050 100644
--- a/ale_linters/c/clang.vim
+++ b/ale_linters/c/clang.vim
@@ -10,11 +10,14 @@ if !exists('g:ale_c_clang_options')
 endif
 
 function! ale_linters#c#clang#GetCommand(buffer) abort
+    let l:paths = ale#handlers#c#FindLocalHeaderPaths(a:buffer)
+
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
     return 'clang -S -x c -fsyntax-only '
-    \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
-    \   . ' ' . ale#Var(a:buffer, 'c_clang_options') . ' -'
+    \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h')) . ' '
+    \   . ale#handlers#c#IncludeOptions(l:paths)
+    \   . ale#Var(a:buffer, 'c_clang_options') . ' -'
 endfunction
 
 call ale#linter#Define('c', {
diff --git a/ale_linters/c/gcc.vim b/ale_linters/c/gcc.vim
index 79c6eb25..bcf8017e 100644
--- a/ale_linters/c/gcc.vim
+++ b/ale_linters/c/gcc.vim
@@ -10,11 +10,14 @@ if !exists('g:ale_c_gcc_options')
 endif
 
 function! ale_linters#c#gcc#GetCommand(buffer) abort
+    let l:paths = ale#handlers#c#FindLocalHeaderPaths(a:buffer)
+
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
     return 'gcc -S -x c -fsyntax-only '
-    \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
-    \   . ' ' . ale#Var(a:buffer, 'c_gcc_options') . ' -'
+    \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h')) . ' '
+    \   . ale#handlers#c#IncludeOptions(l:paths)
+    \   . ale#Var(a:buffer, 'c_gcc_options') . ' -'
 endfunction
 
 call ale#linter#Define('c', {
diff --git a/ale_linters/cpp/clang.vim b/ale_linters/cpp/clang.vim
index 430903fb..953c8a71 100644
--- a/ale_linters/cpp/clang.vim
+++ b/ale_linters/cpp/clang.vim
@@ -7,11 +7,14 @@ if !exists('g:ale_cpp_clang_options')
 endif
 
 function! ale_linters#cpp#clang#GetCommand(buffer) abort
+    let l:paths = ale#handlers#c#FindLocalHeaderPaths(a:buffer)
+
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
     return 'clang++ -S -x c++ -fsyntax-only '
-    \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
-    \   . ' ' . ale#Var(a:buffer, 'cpp_clang_options') . ' -'
+    \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h')) . ' '
+    \   . ale#handlers#c#IncludeOptions(l:paths)
+    \   . ale#Var(a:buffer, 'cpp_clang_options') . ' -'
 endfunction
 
 call ale#linter#Define('cpp', {
diff --git a/ale_linters/cpp/gcc.vim b/ale_linters/cpp/gcc.vim
index e85f1894..36e958e7 100644
--- a/ale_linters/cpp/gcc.vim
+++ b/ale_linters/cpp/gcc.vim
@@ -17,11 +17,14 @@ if !exists('g:ale_cpp_gcc_options')
 endif
 
 function! ale_linters#cpp#gcc#GetCommand(buffer) abort
+    let l:paths = ale#handlers#c#FindLocalHeaderPaths(a:buffer)
+
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
     return 'gcc -S -x c++ -fsyntax-only '
-    \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
-    \   . ' ' . ale#Var(a:buffer, 'cpp_gcc_options') . ' -'
+    \   . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h')) . ' '
+    \   . ale#handlers#c#IncludeOptions(l:paths)
+    \   . ale#Var(a:buffer, 'cpp_gcc_options') . ' -'
 endfunction
 
 call ale#linter#Define('cpp', {