Skip to content

Commit 388cf33

Browse files
committed
Fix #3579 - Escape cppcheck arguments for Windows
1 parent 77c0348 commit 388cf33

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

ale_linters/c/cppcheck.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function! ale_linters#c#cppcheck#GetCommand(buffer) abort
1010
let l:buffer_path_include = empty(l:compile_commands_option)
1111
\ ? ale#handlers#cppcheck#GetBufferPathIncludeOptions(a:buffer)
1212
\ : ''
13-
let l:template = ' --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'''
13+
let l:template = ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
1414

1515
return l:cd_command
1616
\ . '%e -q --language=c'

ale_linters/cpp/cppcheck.vim

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function! ale_linters#cpp#cppcheck#GetCommand(buffer) abort
1010
let l:buffer_path_include = empty(l:compile_commands_option)
1111
\ ? ale#handlers#cppcheck#GetBufferPathIncludeOptions(a:buffer)
1212
\ : ''
13-
let l:template = ' --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'''
13+
let l:template = ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
1414

1515
return l:cd_command
1616
\ . '%e -q --language=c++'

test/command_callback/test_c_cppcheck_command_callbacks.vader

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Before:
22
call ale#assert#SetUpLinterTest('c', 'cppcheck')
3-
let b:command_tail = ' -q --language=c --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'' --enable=style -I' . ale#Escape(ale#path#Simplify(g:dir)) .' %t'
3+
let b:command_tail = ' -q --language=c --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}') . ' --enable=style -I' . ale#Escape(ale#path#Simplify(g:dir)) .' %t'
44

55
After:
66
" Remove a test file we might open for some tests.
@@ -26,7 +26,7 @@ Execute(cppcheck for C should detect compile_commands.json files):
2626
\ ale#path#CdString(ale#path#Simplify(g:dir . '/cppcheck_paths/one'))
2727
\ . ale#Escape('cppcheck')
2828
\ . ' -q --language=c'
29-
\ . ' --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'''
29+
\ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
3030
\ . ' --project=' . ale#Escape('compile_commands.json')
3131
\ . ' --enable=style %t'
3232

@@ -37,7 +37,7 @@ Execute(cppcheck for C should detect compile_commands.json files in build direct
3737
\ ale#path#CdString(ale#path#Simplify(g:dir . '/cppcheck_paths/with_build_dir'))
3838
\ . ale#Escape('cppcheck')
3939
\ . ' -q --language=c'
40-
\ . ' --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'''
40+
\ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
4141
\ . ' --project=' . ale#Escape(ale#path#Simplify('build/compile_commands.json'))
4242
\ . ' --enable=style %t'
4343

@@ -47,7 +47,7 @@ Execute(cppcheck for C should include file dir if compile_commands.json file is
4747
AssertLinter 'cppcheck',
4848
\ ale#Escape('cppcheck')
4949
\ . ' -q --language=c'
50-
\ . ' --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'''
50+
\ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
5151
\ . ' --enable=style'
5252
\ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/cppcheck_paths'))
5353
\ . ' %t'
@@ -62,7 +62,7 @@ Execute(cppcheck for C should ignore compile_commands.json file if buffer is mod
6262
\ ale#path#CdString(ale#path#Simplify(g:dir . '/cppcheck_paths/one'))
6363
\ . ale#Escape('cppcheck')
6464
\ . ' -q --language=c'
65-
\ . ' --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'''
65+
\ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
6666
\ . ' --enable=style'
6767
\ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/cppcheck_paths/one'))
6868
\ . ' %t'

test/command_callback/test_cpp_cppcheck_command_callbacks.vader

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Before:
22
call ale#assert#SetUpLinterTest('cpp', 'cppcheck')
3-
let b:command_tail = ' -q --language=c++ --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'' --enable=style -I' . ale#Escape(ale#path#Simplify(g:dir)) .' %t'
3+
let b:command_tail = ' -q --language=c++ --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}') . ' --enable=style -I' . ale#Escape(ale#path#Simplify(g:dir)) .' %t'
44

55
After:
66
" Remove a test file we might open for some tests.
@@ -26,7 +26,7 @@ Execute(cppcheck for C++ should detect compile_commands.json files):
2626
\ ale#path#CdString(ale#path#Simplify(g:dir . '/cppcheck_paths/one'))
2727
\ . ale#Escape('cppcheck')
2828
\ . ' -q --language=c++'
29-
\ . ' --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'''
29+
\ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
3030
\ . ' --project=' . ale#Escape('compile_commands.json')
3131
\ . ' --enable=style %t'
3232

@@ -37,7 +37,7 @@ Execute(cppcheck for C++ should detect compile_commands.json files in build dire
3737
\ ale#path#CdString(ale#path#Simplify(g:dir . '/cppcheck_paths/with_build_dir'))
3838
\ . ale#Escape('cppcheck')
3939
\ . ' -q --language=c++'
40-
\ . ' --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'''
40+
\ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
4141
\ . ' --project=' . ale#Escape(ale#path#Simplify('build/compile_commands.json'))
4242
\ . ' --enable=style %t'
4343

@@ -47,7 +47,7 @@ Execute(cppcheck for C++ should include file dir if compile_commands.json file i
4747
AssertLinter 'cppcheck',
4848
\ ale#Escape('cppcheck')
4949
\ . ' -q --language=c++'
50-
\ . ' --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'''
50+
\ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
5151
\ . ' --enable=style'
5252
\ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/cppcheck_paths'))
5353
\ . ' %t'
@@ -62,7 +62,7 @@ Execute(cppcheck for C++ should ignore compile_commands.json file if buffer is m
6262
\ ale#path#CdString(ale#path#Simplify(g:dir . '/cppcheck_paths/one'))
6363
\ . ale#Escape('cppcheck')
6464
\ . ' -q --language=c++'
65-
\ . ' --template=''{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}'''
65+
\ . ' --template=' . ale#Escape('{file}:{line}:{column}: {severity}:{inconclusive:inconclusive:} {message} [{id}]\\n{code}')
6666
\ . ' --enable=style'
6767
\ . ' -I' . ale#Escape(ale#path#Simplify(g:dir . '/cppcheck_paths/one'))
6868
\ . ' %t'

0 commit comments

Comments
 (0)