From 5e4c302b5bfd916214865c3c3d3808c75d137932 Mon Sep 17 00:00:00 2001 From: w0rp Date: Wed, 31 May 2017 20:01:40 +0100 Subject: Fix #557 - Detect C project roots and include root directories with headers, or include directories --- ale_linters/cpp/clang.vim | 7 +++++-- ale_linters/cpp/gcc.vim | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'ale_linters/cpp') 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', { -- cgit v1.2.3