diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2024-10-17 22:02:20 +0200 |
|---|---|---|
| committer | Christian Clason <ch.clason+github@icloud.com> | 2024-10-18 01:00:01 +0200 |
| commit | 27f3a2002c50dbe4d0be486201bf63446cf95838 (patch) | |
| tree | 01a7777f37daf3ad5c71e922689b00e024de85c7 | |
| parent | ee1624845844e36e0adce32b7e5b0dae34e322c3 (diff) | |
| download | rneovim-27f3a2002c50dbe4d0be486201bf63446cf95838.tar.gz rneovim-27f3a2002c50dbe4d0be486201bf63446cf95838.tar.bz2 rneovim-27f3a2002c50dbe4d0be486201bf63446cf95838.zip | |
vim-patch:5e48e97: runtime(compiler): check for compile_commands in build dirs for cppcheck
closes: vim/vim#15889
https://github.com/vim/vim/commit/5e48e97e4231e95385e07470a7e5659ff59bd0d7
Co-authored-by: Konfekt <Konfekt@users.noreply.github.com>
| -rw-r--r-- | runtime/compiler/cppcheck.vim | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/runtime/compiler/cppcheck.vim b/runtime/compiler/cppcheck.vim index ed7c46e90f..20c906f412 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. (twinside@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= |