From e97dada261c4a69f43c5a6c34d349ad6246fe34c Mon Sep 17 00:00:00 2001
From: w0rp <devw0rp@gmail.com>
Date: Sun, 16 Apr 2017 01:24:08 +0100
Subject: #427 Implement buffer variable overrides for all linter options

---
 ale_linters/cpp/clang.vim     |  2 +-
 ale_linters/cpp/clangtidy.vim |  2 +-
 ale_linters/cpp/cppcheck.vim  | 10 +++++++---
 ale_linters/cpp/gcc.vim       |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'ale_linters/cpp')

diff --git a/ale_linters/cpp/clang.vim b/ale_linters/cpp/clang.vim
index e8af6dc2..b830f6a7 100644
--- a/ale_linters/cpp/clang.vim
+++ b/ale_linters/cpp/clang.vim
@@ -11,7 +11,7 @@ function! ale_linters#cpp#clang#GetCommand(buffer) abort
     "  headers in the same directory.
     return 'clang++ -S -x c++ -fsyntax-only '
     \   . '-iquote ' . fnameescape(fnamemodify(bufname(a:buffer), ':p:h'))
-    \   . ' ' . g:ale_cpp_clang_options . ' -'
+    \   . ' ' . ale#Var(a:buffer, 'cpp_clang_options') . ' -'
 endfunction
 
 call ale#linter#Define('cpp', {
diff --git a/ale_linters/cpp/clangtidy.vim b/ale_linters/cpp/clangtidy.vim
index 6b72e1f5..2acd345a 100644
--- a/ale_linters/cpp/clangtidy.vim
+++ b/ale_linters/cpp/clangtidy.vim
@@ -6,7 +6,7 @@ let g:ale_cpp_clangtidy_options =
 \   get(g:, 'ale_cpp_clangtidy_options', '-std=c++14 -Wall')
 
 function! ale_linters#cpp#clangtidy#GetCommand(buffer) abort
-    return 'clang-tidy %t -- ' . g:ale_cpp_clangtidy_options
+    return 'clang-tidy %t -- ' . ale#Var(a:buffer, 'cpp_clangtidy_options')
 endfunction
 
 call ale#linter#Define('cpp', {
diff --git a/ale_linters/cpp/cppcheck.vim b/ale_linters/cpp/cppcheck.vim
index b2877158..adb3f450 100644
--- a/ale_linters/cpp/cppcheck.vim
+++ b/ale_linters/cpp/cppcheck.vim
@@ -4,12 +4,16 @@
 " Set this option to change the cppcheck options
 let g:ale_cpp_cppcheck_options = get(g:, 'ale_cpp_cppcheck_options', '--enable=style')
 
+function! ale_linters#cpp#cppcheck#GetCommand(buffer) abort
+    return 'cppcheck -q --language=c++ '
+    \   . ale#Var(a:buffer, 'cpp_cppcheck_options')
+    \   . ' %t'
+endfunction
+
 call ale#linter#Define('cpp', {
 \   'name': 'cppcheck',
 \   'output_stream': 'both',
 \   'executable': 'cppcheck',
-\   'command': 'cppcheck -q --language=c++ '
-\       . g:ale_cpp_cppcheck_options
-\       . ' %t',
+\   'command_callback': 'ale_linters#cpp#cppcheck#GetCommand',
 \   'callback': 'ale#handlers#HandleCppCheckFormat',
 \})
diff --git a/ale_linters/cpp/gcc.vim b/ale_linters/cpp/gcc.vim
index c16a0706..9e8f859d 100644
--- a/ale_linters/cpp/gcc.vim
+++ b/ale_linters/cpp/gcc.vim
@@ -20,7 +20,7 @@ function! ale_linters#cpp#gcc#GetCommand(buffer) abort
     "  headers in the same directory.
     return 'gcc -S -x c++ -fsyntax-only '
     \   . '-iquote ' . fnameescape(fnamemodify(bufname(a:buffer), ':p:h'))
-    \   . ' ' . g:ale_cpp_gcc_options . ' -'
+    \   . ' ' . ale#Var(a:buffer, 'cpp_gcc_options') . ' -'
 endfunction
 
 call ale#linter#Define('cpp', {
-- 
cgit v1.2.3