Merge pull request #3056 from ts826848/remove-ale-std-if-already-in-GetCFlags

[WIP] Avoid overriding parsed C/C++ -std=* flag

4 files changed, 40 insertions, 4 deletions

diff --git a/ale_linters/c/clang.vim b/ale_linters/c/clang.vim
index 681101fc..84c105de 100644
--- a/ale_linters/c/clang.vim
+++ b/ale_linters/c/clang.vim
@@ -6,13 +6,22 @@ call ale#Set('c_clang_options', '-std=c11 -Wall')
 
 function! ale_linters#c#clang#GetCommand(buffer, output) abort
     let l:cflags = ale#c#GetCFlags(a:buffer, a:output)
+    let l:ale_flags = ale#Var(a:buffer, 'c_clang_options')
+
+    if l:cflags =~# '-std='
+        let l:ale_flags = substitute(
+        \   l:ale_flags,
+        \   '-std=\(c\|gnu\)[0-9]\{2\}',
+        \   '',
+        \   'g')
+    endif
 
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
     return '%e -S -x c -fsyntax-only'
     \   . ' -iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
     \   . ale#Pad(l:cflags)
-    \   . ale#Pad(ale#Var(a:buffer, 'c_clang_options')) . ' -'
+    \   . ale#Pad(l:ale_flags) . ' -'
 endfunction
 
 call ale#linter#Define('c', {
diff --git a/ale_linters/c/gcc.vim b/ale_linters/c/gcc.vim
index 1df1018e..252285a3 100644
--- a/ale_linters/c/gcc.vim
+++ b/ale_linters/c/gcc.vim
@@ -6,6 +6,15 @@ call ale#Set('c_gcc_options', '-std=c11 -Wall')
 
 function! ale_linters#c#gcc#GetCommand(buffer, output) abort
     let l:cflags = ale#c#GetCFlags(a:buffer, a:output)
+    let l:ale_flags = ale#Var(a:buffer, 'c_gcc_options')
+
+    if l:cflags =~# '-std='
+        let l:ale_flags = substitute(
+        \   l:ale_flags,
+        \   '-std=\(c\|gnu\)[0-9]\{2\}',
+        \   '',
+        \   'g')
+    endif
 
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
@@ -16,7 +25,7 @@ function! ale_linters#c#gcc#GetCommand(buffer, output) abort
     \   . ' -o ' . g:ale#util#nul_file
     \   . ' -iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
     \   . ale#Pad(l:cflags)
-    \   . ale#Pad(ale#Var(a:buffer, 'c_gcc_options')) . ' -'
+    \   . ale#Pad(l:ale_flags) . ' -'
 endfunction
 
 call ale#linter#Define('c', {
diff --git a/ale_linters/cpp/clang.vim b/ale_linters/cpp/clang.vim
index e48291eb..d93638ec 100644
--- a/ale_linters/cpp/clang.vim
+++ b/ale_linters/cpp/clang.vim
@@ -6,13 +6,22 @@ call ale#Set('cpp_clang_options', '-std=c++14 -Wall')
 
 function! ale_linters#cpp#clang#GetCommand(buffer, output) abort
     let l:cflags = ale#c#GetCFlags(a:buffer, a:output)
+    let l:ale_flags = ale#Var(a:buffer, 'cpp_clang_options')
+
+    if l:cflags =~# '-std='
+        let l:ale_flags = substitute(
+        \   l:ale_flags,
+        \   '-std=\(c\|gnu\)++[0-9]\{2\}',
+        \   '',
+        \   'g')
+    endif
 
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
     return '%e -S -x c++ -fsyntax-only'
     \   . ' -iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
     \   . ale#Pad(l:cflags)
-    \   . ale#Pad(ale#Var(a:buffer, 'cpp_clang_options')) . ' -'
+    \   . ale#Pad(l:ale_flags) . ' -'
 endfunction
 
 call ale#linter#Define('cpp', {
diff --git a/ale_linters/cpp/gcc.vim b/ale_linters/cpp/gcc.vim
index 108d6d70..89c2d358 100644
--- a/ale_linters/cpp/gcc.vim
+++ b/ale_linters/cpp/gcc.vim
@@ -6,6 +6,15 @@ call ale#Set('cpp_gcc_options', '-std=c++14 -Wall')
 
 function! ale_linters#cpp#gcc#GetCommand(buffer, output) abort
     let l:cflags = ale#c#GetCFlags(a:buffer, a:output)
+    let l:ale_flags = ale#Var(a:buffer, 'cpp_gcc_options')
+
+    if l:cflags =~# '-std='
+        let l:ale_flags = substitute(
+        \   l:ale_flags,
+        \   '-std=\(c\|gnu\)++[0-9]\{2\}',
+        \   '',
+        \   'g')
+    endif
 
     " -iquote with the directory the file is in makes #include work for
     "  headers in the same directory.
@@ -16,7 +25,7 @@ function! ale_linters#cpp#gcc#GetCommand(buffer, output) abort
     \   . ' -o ' . g:ale#util#nul_file
     \   . ' -iquote ' . ale#Escape(fnamemodify(bufname(a:buffer), ':p:h'))
     \   . ale#Pad(l:cflags)
-    \   . ale#Pad(ale#Var(a:buffer, 'cpp_gcc_options')) . ' -'
+    \   . ale#Pad(l:ale_flags) . ' -'
 endfunction
 
 call ale#linter#Define('cpp', {