diff options
| author | roel0 <roel.postelmans@altran.com> | 2018-03-20 11:56:46 +0100 |
|---|---|---|
| committer | roel0 <roel.postelmans@altran.com> | 2018-03-20 11:56:46 +0100 |
| commit | 3fb7efa2c6d249ccc5b69036dbeda690c7459515 (patch) | |
| tree | 33393c06810204d57e558ed7cec68cb0902032ba /ale_linters/c/clang.vim | |
| parent | c47b5fd4b8f9b7c08774e631dae60ca51c23e7c9 (diff) | |
| download | ale-3fb7efa2c6d249ccc5b69036dbeda690c7459515.zip | |
Added some unit tests and fixed some linting errors for automatic makefile parsing in C #1167
Diffstat (limited to 'ale_linters/c/clang.vim')
| -rw-r--r-- | ale_linters/c/clang.vim | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ale_linters/c/clang.vim b/ale_linters/c/clang.vim index 25d93715..74279b7c 100644 --- a/ale_linters/c/clang.vim +++ b/ale_linters/c/clang.vim @@ -3,7 +3,7 @@ call ale#Set('c_clang_executable', 'clang') call ale#Set('c_clang_options', '-std=c11 -Wall') -call ale#Set('c_gcc_parse_makefile', 0) +call ale#Set('c_clang_parse_makefile', 0) function! ale_linters#c#clang#GetExecutable(buffer) abort return ale#Var(a:buffer, 'c_clang_executable') @@ -11,11 +11,13 @@ endfunction function! ale_linters#c#clang#GetCommand(buffer) abort let l:cflags = [] - if g:ale_c_parse_makefile - let l:cflags = join(ale#c#ParseMakefile(a:buffer), ' ') + if g:ale_c_clang_parse_makefile + let l:cflags = join(ale#c#ParseMakefile(a:buffer), ' ') . ' ' endif if empty(l:cflags) let l:cflags = ale#c#IncludeOptions(ale#c#FindLocalHeaderPaths(a:buffer)) + else + let l:cflags .= ' ' endif " -iquote with the directory the file is in makes #include work for @@ -23,7 +25,7 @@ let l:cflags = [] return ale#Escape(ale_linters#c#clang#GetExecutable(a:buffer)) \ . ' -S -x c -fsyntax-only ' \ . '-iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h')) . ' ' - \ . l:cflags . ' ' + \ . l:cflags \ . ale#Var(a:buffer, 'c_clang_options') . ' -' endfunction |