Added support for Python black fixer (#1451)
This commit is contained in:
parent
85a2a00826
commit
c5d3af04fc
@ -139,7 +139,7 @@ formatting.
|
|||||||
| proto | [protoc-gen-lint](https://github.com/ckaznocha/protoc-gen-lint) |
|
| proto | [protoc-gen-lint](https://github.com/ckaznocha/protoc-gen-lint) |
|
||||||
| Pug | [pug-lint](https://github.com/pugjs/pug-lint) |
|
| Pug | [pug-lint](https://github.com/pugjs/pug-lint) |
|
||||||
| Puppet | [puppet](https://puppet.com), [puppet-lint](https://puppet-lint.com) |
|
| Puppet | [puppet](https://puppet.com), [puppet-lint](https://puppet-lint.com) |
|
||||||
| Python | [autopep8](https://github.com/hhatto/autopep8), [flake8](http://flake8.pycqa.org/en/latest/), [isort](https://github.com/timothycrosley/isort), [mypy](http://mypy-lang.org/), [prospector](http://github.com/landscapeio/prospector), [pycodestyle](https://github.com/PyCQA/pycodestyle), [pyls](https://github.com/palantir/python-language-server), [pylint](https://www.pylint.org/) !!, [yapf](https://github.com/google/yapf) |
|
| Python | [autopep8](https://github.com/hhatto/autopep8), [black](https://github.com/ambv/black), [flake8](http://flake8.pycqa.org/en/latest/), [isort](https://github.com/timothycrosley/isort), [mypy](http://mypy-lang.org/), [prospector](http://github.com/landscapeio/prospector), [pycodestyle](https://github.com/PyCQA/pycodestyle), [pyls](https://github.com/palantir/python-language-server), [pylint](https://www.pylint.org/) !!, [yapf](https://github.com/google/yapf) |
|
||||||
| QML | [qmlfmt](https://github.com/jesperhh/qmlfmt), [qmllint](https://github.com/qt/qtdeclarative/tree/5.11/tools/qmllint) |
|
| QML | [qmlfmt](https://github.com/jesperhh/qmlfmt), [qmllint](https://github.com/qt/qtdeclarative/tree/5.11/tools/qmllint) |
|
||||||
| R | [lintr](https://github.com/jimhester/lintr) |
|
| R | [lintr](https://github.com/jimhester/lintr) |
|
||||||
| ReasonML | [merlin](https://github.com/the-lambda-church/merlin) see `:help ale-reasonml-ols` for configuration instructions, [ols](https://github.com/freebroccolo/ocaml-language-server), [refmt](https://github.com/reasonml/reason-cli) |
|
| ReasonML | [merlin](https://github.com/the-lambda-church/merlin) see `:help ale-reasonml-ols` for configuration instructions, [ols](https://github.com/freebroccolo/ocaml-language-server), [refmt](https://github.com/reasonml/reason-cli) |
|
||||||
|
@ -17,6 +17,11 @@ let s:default_registry = {
|
|||||||
\ 'suggested_filetypes': ['python'],
|
\ 'suggested_filetypes': ['python'],
|
||||||
\ 'description': 'Fix PEP8 issues with autopep8.',
|
\ 'description': 'Fix PEP8 issues with autopep8.',
|
||||||
\ },
|
\ },
|
||||||
|
\ 'black': {
|
||||||
|
\ 'function': 'ale#fixers#black#Fix',
|
||||||
|
\ 'suggested_filetypes': ['python'],
|
||||||
|
\ 'description': 'Fix PEP8 issues with black.',
|
||||||
|
\ },
|
||||||
\ 'prettier_standard': {
|
\ 'prettier_standard': {
|
||||||
\ 'function': 'ale#fixers#prettier_standard#Fix',
|
\ 'function': 'ale#fixers#prettier_standard#Fix',
|
||||||
\ 'suggested_filetypes': ['javascript'],
|
\ 'suggested_filetypes': ['javascript'],
|
||||||
|
26
autoload/ale/fixers/black.vim
Normal file
26
autoload/ale/fixers/black.vim
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
" Author: w0rp <devw0rp@gmail.com>
|
||||||
|
" Description: Fixing Python files with black.
|
||||||
|
"
|
||||||
|
call ale#Set('python_black_executable', 'black')
|
||||||
|
call ale#Set('python_black_use_global', 0)
|
||||||
|
call ale#Set('python_black_options', '')
|
||||||
|
|
||||||
|
function! ale#fixers#black#Fix(buffer) abort
|
||||||
|
let l:executable = ale#python#FindExecutable(
|
||||||
|
\ a:buffer,
|
||||||
|
\ 'python_black',
|
||||||
|
\ ['black'],
|
||||||
|
\)
|
||||||
|
|
||||||
|
if !executable(l:executable)
|
||||||
|
return 0
|
||||||
|
endif
|
||||||
|
|
||||||
|
let l:options = ale#Var(a:buffer, 'python_black_options')
|
||||||
|
|
||||||
|
return {
|
||||||
|
\ 'command': ale#Escape(l:executable)
|
||||||
|
\ . (!empty(l:options) ? ' ' . l:options : '')
|
||||||
|
\ . ' -',
|
||||||
|
\}
|
||||||
|
endfunction
|
@ -29,6 +29,33 @@ g:ale_python_autopep8_use_global *g:ale_python_autopep8_use_global*
|
|||||||
See |ale-integrations-local-executables|
|
See |ale-integrations-local-executables|
|
||||||
|
|
||||||
|
|
||||||
|
===============================================================================
|
||||||
|
black *ale-python-black*
|
||||||
|
|
||||||
|
g:ale_python_black_executable *g:ale_python_black_executable*
|
||||||
|
*b:ale_python_black_executable*
|
||||||
|
Type: |String|
|
||||||
|
Default: `'black'`
|
||||||
|
|
||||||
|
See |ale-integrations-local-executables|
|
||||||
|
|
||||||
|
autopep8
|
||||||
|
g:ale_python_black_options *g:ale_python_black_options*
|
||||||
|
*b:ale_python_black_options*
|
||||||
|
Type: |String|
|
||||||
|
Default: `''`
|
||||||
|
|
||||||
|
This variable can be set to pass extra options to black.
|
||||||
|
|
||||||
|
|
||||||
|
g:ale_python_black_use_global *g:ale_python_black_use_global*
|
||||||
|
*b:ale_python_black_use_global*
|
||||||
|
Type: |Number|
|
||||||
|
Default: `0`
|
||||||
|
|
||||||
|
See |ale-integrations-local-executables|
|
||||||
|
|
||||||
|
|
||||||
===============================================================================
|
===============================================================================
|
||||||
flake8 *ale-python-flake8*
|
flake8 *ale-python-flake8*
|
||||||
|
|
||||||
|
@ -179,6 +179,7 @@ CONTENTS *ale-contents*
|
|||||||
puppetlint..........................|ale-puppet-puppetlint|
|
puppetlint..........................|ale-puppet-puppetlint|
|
||||||
python................................|ale-python-options|
|
python................................|ale-python-options|
|
||||||
autopep8............................|ale-python-autopep8|
|
autopep8............................|ale-python-autopep8|
|
||||||
|
black...............................|ale-python-black|
|
||||||
flake8..............................|ale-python-flake8|
|
flake8..............................|ale-python-flake8|
|
||||||
isort...............................|ale-python-isort|
|
isort...............................|ale-python-isort|
|
||||||
mypy................................|ale-python-mypy|
|
mypy................................|ale-python-mypy|
|
||||||
@ -369,7 +370,7 @@ Notes:
|
|||||||
* proto: `protoc-gen-lint`
|
* proto: `protoc-gen-lint`
|
||||||
* Pug: `pug-lint`
|
* Pug: `pug-lint`
|
||||||
* Puppet: `puppet`, `puppet-lint`
|
* Puppet: `puppet`, `puppet-lint`
|
||||||
* Python: `autopep8`, `flake8`, `isort`, `mypy`, `prospector`, `pycodestyle`, `pyls`, `pylint`!!, `yapf`
|
* Python: `autopep8`, `black`, `flake8`, `isort`, `mypy`, `prospector`, `pycodestyle`, `pyls`, `pylint`!!, `yapf`
|
||||||
* QML: `qmlfmt`, `qmllint`
|
* QML: `qmlfmt`, `qmllint`
|
||||||
* R: `lintr`
|
* R: `lintr`
|
||||||
* ReasonML: `merlin`, `ols`, `refmt`
|
* ReasonML: `merlin`, `ols`, `refmt`
|
||||||
|
0
test/command_callback/python_paths/with_virtualenv/env/Scripts/black.exe
vendored
Executable file
0
test/command_callback/python_paths/with_virtualenv/env/Scripts/black.exe
vendored
Executable file
0
test/command_callback/python_paths/with_virtualenv/env/bin/black
vendored
Executable file
0
test/command_callback/python_paths/with_virtualenv/env/bin/black
vendored
Executable file
39
test/fixers/test_black_fixer_callback.vader
Normal file
39
test/fixers/test_black_fixer_callback.vader
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
Before:
|
||||||
|
Save g:ale_python_black_executable
|
||||||
|
Save g:ale_python_black_options
|
||||||
|
|
||||||
|
" Use an invalid global executable, so we don't match it.
|
||||||
|
let g:ale_python_black_executable = 'xxxinvalid'
|
||||||
|
let g:ale_python_black_options = ''
|
||||||
|
|
||||||
|
call ale#test#SetDirectory('/testplugin/test/fixers')
|
||||||
|
silent cd ..
|
||||||
|
silent cd command_callback
|
||||||
|
let g:dir = getcwd()
|
||||||
|
|
||||||
|
let b:bin_dir = has('win32') ? 'Scripts' : 'bin'
|
||||||
|
|
||||||
|
After:
|
||||||
|
Restore
|
||||||
|
|
||||||
|
unlet! b:bin_dir
|
||||||
|
|
||||||
|
call ale#test#RestoreDirectory()
|
||||||
|
|
||||||
|
Execute(The black callback should return the correct default values):
|
||||||
|
AssertEqual
|
||||||
|
\ 0,
|
||||||
|
\ ale#fixers#black#Fix(bufnr(''))
|
||||||
|
|
||||||
|
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
|
||||||
|
AssertEqual
|
||||||
|
\ {'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/black')) . ' -'},
|
||||||
|
\ ale#fixers#black#Fix(bufnr(''))
|
||||||
|
|
||||||
|
Execute(The black callback should include options):
|
||||||
|
let g:ale_python_black_options = '--some-option'
|
||||||
|
|
||||||
|
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
|
||||||
|
AssertEqual
|
||||||
|
\ {'command': ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/black')) . ' --some-option -' },
|
||||||
|
\ ale#fixers#black#Fix(bufnr(''))
|
Loading…
Reference in New Issue
Block a user