Commit: runtime(compiler): check for compile_commands in build dirs for cppcheck

2 views
Skip to first unread message

Christian Brabandt

unread,
Oct 17, 2024, 3:01:57 PM10/17/24
to vim...@googlegroups.com
runtime(compiler): check for compile_commands in build dirs for cppcheck

Commit: https://github.com/vim/vim/commit/5e48e97e4231e95385e07470a7e5659ff59bd0d7
Author: Konfekt <Kon...@users.noreply.github.com>
Date: Thu Oct 17 20:54:00 2024 +0200

runtime(compiler): check for compile_commands in build dirs for cppcheck

closes: https://github.com/vim/vim/issues/15889

Signed-off-by: Konfekt <Kon...@users.noreply.github.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/compiler/cppcheck.vim b/runtime/compiler/cppcheck.vim
index ed7c46e90..20c906f41 100644
--- a/runtime/compiler/cppcheck.vim
+++ b/runtime/compiler/cppcheck.vim
@@ -1,7 +1,7 @@
" vim compiler file
" Compiler: cppcheck (C++ static checker)
" Maintainer: Vincent B. (twin...@free.fr)
-" Last Change: 2024 Oct 4 by @Konfekt
+" Last Change: 2024 oct 17 by @Konfekt

if exists("cppcheck")
finish
@@ -11,6 +11,8 @@ let current_compiler = "cppcheck"
let s:cpo_save = &cpo
set cpo-=C

+let s:slash = has('win32')? '\' : '/'
+
if !exists('g:c_cppcheck_params')
let g:c_cppcheck_params = '--verbose --force --inline-suppr'
\ ..' '..'--enable=warning,style,performance,portability,information,missingInclude'
@@ -20,11 +22,11 @@ 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'))))
+ \ (!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')))))
silent CompilerSet makeprg

CompilerSet errorformat=
Reply all
Reply to author
Forward
0 new messages