Fix: Ruff output option (#4632)

* fix --output-format option
* Add conditionally changing flag based on Ruff version
This commit is contained in:
Adam Blackwater
2023-11-08 21:44:11 +00:00
committed by GitHub
parent 901d3ff8dd
commit 50e237facd
2 changed files with 9 additions and 2 deletions

View File

@@ -46,9 +46,10 @@ function! ale_linters#python#ruff#GetCommand(buffer, version) abort
\ : '' \ : ''
" NOTE: ruff version `0.0.69` supports liniting input from stdin " NOTE: ruff version `0.0.69` supports liniting input from stdin
" NOTE: ruff version `0.1.0` deprecates `--format text`
return ale#Escape(l:executable) . l:exec_args return ale#Escape(l:executable) . l:exec_args
\ . ale#Pad(ale#Var(a:buffer, 'python_ruff_options')) \ . ale#Pad(ale#Var(a:buffer, 'python_ruff_options'))
\ . ' --format text' \ . (ale#semver#GTE(a:version, [0, 1, 0]) ? ' --output-format text' : ' --format text')
\ . (ale#semver#GTE(a:version, [0, 0, 69]) ? ' --stdin-filename %s -' : ' %s') \ . (ale#semver#GTE(a:version, [0, 0, 69]) ? ' --stdin-filename %s -' : ' %s')
endfunction endfunction

View File

@@ -28,6 +28,12 @@ Execute(ruff should run with the file path of buffer in old versions):
AssertLinterCwd expand('%:p:h') AssertLinterCwd expand('%:p:h')
AssertLinter 'ruff', ale#Escape('ruff') . b:command_tail[:-23] . ' %s' AssertLinter 'ruff', ale#Escape('ruff') . b:command_tail[:-23] . ' %s'
Execute(ruff should run with the --output-format flag in new versions):
GivenCommandOutput ['ruff 0.1.0']
AssertLinterCwd expand('%:p:h')
AssertLinter 'ruff', ale#Escape('ruff') . ' --output-format text --stdin-filename %s -'
Execute(ruff should run with the stdin in new enough versions): Execute(ruff should run with the stdin in new enough versions):
GivenCommandOutput ['ruff 0.0.83'] GivenCommandOutput ['ruff 0.0.83']