aboutsummaryrefslogtreecommitdiff
path: root/runtime/compiler/cppcheck.vim
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/compiler/cppcheck.vim')
-rw-r--r--runtime/compiler/cppcheck.vim18
1 files changed, 9 insertions, 9 deletions
diff --git a/runtime/compiler/cppcheck.vim b/runtime/compiler/cppcheck.vim
index ed7c46e90f..4df12d1714 100644
--- a/runtime/compiler/cppcheck.vim
+++ b/runtime/compiler/cppcheck.vim
@@ -1,15 +1,15 @@
" vim compiler file
" Compiler: cppcheck (C++ static checker)
" Maintainer: Vincent B. (twinside@free.fr)
-" Last Change: 2024 Oct 4 by @Konfekt
+" Last Change: 2024 Nov 08 by @Konfekt
-if exists("cppcheck")
- finish
-endif
+if exists("current_compiler") | finish | endif
let current_compiler = "cppcheck"
let s:cpo_save = &cpo
-set cpo-=C
+set cpo&vim
+
+let s:slash = has('win32')? '\' : '/'
if !exists('g:c_cppcheck_params')
let g:c_cppcheck_params = '--verbose --force --inline-suppr'
@@ -20,12 +20,12 @@ endif
let &l:makeprg = 'cppcheck --quiet'
\ ..' --template="{file}:{line}:{column}: {severity}: [{id}] {message} {callstack}"'
- \ ..' '..get(b:, 'c_cppcheck_params',
- \ g:c_cppcheck_params..' '..(&filetype ==# 'cpp' ? ' --language=c++' : ''))
+ \ ..' '..get(b:, 'c_cppcheck_params', get(g:, 'c_cppcheck_params', (&filetype ==# 'cpp' ? ' --language=c++' : '')))
\ ..' '..get(b:, 'c_cppcheck_includes', get(g:, 'c_cppcheck_includes',
\ (filereadable('compile_commands.json') ? '--project=compile_commands.json' :
- \ (empty(&path) ? '' : '-I')..join(map(filter(split(&path, ','), 'isdirectory(v:val)'),'shellescape(v:val)'), ' -I'))))
-silent CompilerSet makeprg
+ \ (!empty(glob('*'..s:slash..'compile_commands.json', 1, 1)) ? '--project='..glob('*'..s:slash..'compile_commands.json', 1, 1)[0] :
+ \ (empty(&path) ? '' : '-I')..join(map(filter(split(&path, ','), 'isdirectory(v:val)'),'shellescape(v:val)'), ' -I')))))
+exe 'CompilerSet makeprg='..escape(&l:makeprg, ' "')
CompilerSet errorformat=
\%f:%l:%c:\ %tarning:\ %m,