support clippy options with --

This commit is contained in:
Jean Mertz 2019-06-24 19:47:49 +02:00
parent 65ba4b85ec
commit e52388b8b1
No known key found for this signature in database
GPG Key ID: D41E2C2760F4E0F4
2 changed files with 18 additions and 2 deletions

View File

@ -69,7 +69,15 @@ function! ale_linters#rust#cargo#GetCommand(buffer, version) abort
if ale#Var(a:buffer, 'rust_cargo_use_clippy')
let l:subcommand = 'clippy'
let l:clippy_options = ' ' . ale#Var(a:buffer, 'rust_cargo_clippy_options')
let l:clippy_options = ale#Var(a:buffer, 'rust_cargo_clippy_options')
if l:clippy_options =~ "^-- "
let l:clippy_options = join(split(l:clippy_options, '-- '))
endif
if l:clippy_options isnot# ''
let l:clippy_options = ' -- ' . l:clippy_options
endif
endif
return l:nearest_cargo_prefix . 'cargo '

View File

@ -141,7 +141,7 @@ Execute(When ale_rust_cargo_use_clippy is set, cargo-clippy is used as linter):
let b:ale_rust_cargo_use_clippy = 1
AssertLinter 'cargo', [
\ ale#Escape('cargo') . ' --version',
\ 'cargo clippy --frozen --message-format=json -q ',
\ 'cargo clippy --frozen --message-format=json -q',
\]
Execute(When ale_rust_cargo_clippy_options is set, cargo-clippy appends it to commandline):
@ -152,6 +152,14 @@ Execute(When ale_rust_cargo_clippy_options is set, cargo-clippy appends it to co
\ 'cargo clippy --frozen --message-format=json -q -- -D warnings',
\]
Execute(When ale_rust_cargo_clippy_options does not start with --, it is added):
let b:ale_rust_cargo_use_clippy = 1
let b:ale_rust_cargo_clippy_options = '-D warnings'
AssertLinter 'cargo', [
\ ale#Escape('cargo') . ' --version',
\ 'cargo clippy --frozen --message-format=json -q -- -D warnings',
\]
Execute(cargo-check does not refer ale_rust_cargo_clippy_options):
let b:ale_rust_cargo_use_clippy = 0
let b:ale_rust_cargo_use_check = 1