marc/ale
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mypy: Pass user options before any others (#3582)

Browse source 
This enables us to use a custom `python` exe as the "mypy" executable
and pass `-m mypy` in `mypy_options`
This commit is contained in:
Daniel Leong 2021-02-11 15:29:23 -05:00 committed by GitHub
parent 3b184f88d3
commit 8cb9f5ef51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ale_linters/python/mypy.vim
View file

@ -43,12 +43,14 @@ function! ale_linters#python#mypy#GetCommand(buffer) abort
\ ? ' run mypy' \ ? ' run mypy'
\ : '' \ : ''
let l:options = ale#Var(a:buffer, 'python_mypy_options')
" We have to always switch to an explicit directory for a command so " We have to always switch to an explicit directory for a command so
" we can know with certainty the base path for the 'filename' keys below. " we can know with certainty the base path for the 'filename' keys below.
return ale#path#CdString(l:dir) return ale#path#CdString(l:dir)
\ . ale#Escape(l:executable) . l:exec_args \ . ale#Escape(l:executable) . l:exec_args
\ . ' --show-column-numbers ' \ . (len(l:options) ? (' ' . l:options) : '')
\ . ale#Var(a:buffer, 'python_mypy_options') \ . ' --show-column-numbers'
\ . ' --shadow-file %s %t %s' \ . ' --shadow-file %s %t %s'
endfunction endfunction

33
test/command_callback/test_mypy_command_callback.vader
View file

@ -13,24 +13,25 @@ After:
Execute(The mypy callbacks should return the correct default values): Execute(The mypy callbacks should return the correct default values):
AssertLinter 'mypy', AssertLinter 'mypy',
\ ale#path#CdString(g:dir) . ale#Escape('mypy') \ ale#path#CdString(g:dir) . ale#Escape('mypy')
\ . ' --show-column-numbers ' \ . ' --show-column-numbers'
\ . '--shadow-file %s %t %s' \ . ' --shadow-file %s %t %s'
Execute(The mypy executable should be configurable, and escaped properly): Execute(The mypy executable should be configurable, and escaped properly):
let g:ale_python_mypy_executable = 'executable with spaces' let g:ale_python_mypy_executable = 'executable with spaces'
AssertLinter 'executable with spaces', AssertLinter 'executable with spaces',
\ ale#path#CdString(g:dir) . ale#Escape('executable with spaces') \ ale#path#CdString(g:dir) . ale#Escape('executable with spaces')
\ . ' --show-column-numbers ' \ . ' --show-column-numbers'
\ . '--shadow-file %s %t %s' \ . ' --shadow-file %s %t %s'
Execute(The mypy command callback should let you set options): Execute(The mypy command callback should let you set options):
let g:ale_python_mypy_options = '--some-option' let g:ale_python_mypy_options = '--some-option'
AssertLinter 'mypy', AssertLinter 'mypy',
\ ale#path#CdString(g:dir) . ale#Escape('mypy') \ ale#path#CdString(g:dir) . ale#Escape('mypy')
\ . ' --show-column-numbers --some-option ' \ . ' --some-option'
\ . '--shadow-file %s %t %s' \ . ' --show-column-numbers'
\ . ' --shadow-file %s %t %s'
Execute(The mypy command should switch directories to the detected project root): Execute(The mypy command should switch directories to the detected project root):
silent execute 'file ' . fnameescape(g:dir . '/python_paths/no_virtualenv/subdir/foo/bar.py') silent execute 'file ' . fnameescape(g:dir . '/python_paths/no_virtualenv/subdir/foo/bar.py')
@ -38,8 +39,8 @@ Execute(The mypy command should switch directories to the detected project root)
AssertLinter 'mypy', AssertLinter 'mypy',
\ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir')) \ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/no_virtualenv/subdir'))
\ . ale#Escape('mypy') \ . ale#Escape('mypy')
\ . ' --show-column-numbers ' \ . ' --show-column-numbers'
\ . '--shadow-file %s %t %s' \ . ' --shadow-file %s %t %s'
Execute(The mypy callbacks should detect virtualenv directories and switch to the project root): Execute(The mypy callbacks should detect virtualenv directories and switch to the project root):
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
@ -49,8 +50,8 @@ Execute(The mypy callbacks should detect virtualenv directories and switch to th
AssertLinter b:executable, AssertLinter b:executable,
\ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir')) \ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir'))
\ . ale#Escape(b:executable) \ . ale#Escape(b:executable)
\ . ' --show-column-numbers ' \ . ' --show-column-numbers'
\ . '--shadow-file %s %t %s' \ . ' --shadow-file %s %t %s'
Execute(The mypy callbacks should cd to directory containing mypy.ini if found): Execute(The mypy callbacks should cd to directory containing mypy.ini if found):
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py') silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_mypy_ini_and_pytest_ini/tests/testsubfolder/my_tests.py')
@ -58,8 +59,8 @@ Execute(The mypy callbacks should cd to directory containing mypy.ini if found):
AssertLinter 'mypy', AssertLinter 'mypy',
\ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/with_mypy_ini_and_pytest_ini')) \ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/with_mypy_ini_and_pytest_ini'))
\ . ale#Escape('mypy') \ . ale#Escape('mypy')
\ . ' --show-column-numbers ' \ . ' --show-column-numbers'
\ . '--shadow-file %s %t %s' \ . ' --shadow-file %s %t %s'
Execute(You should able able to use the global mypy instead): Execute(You should able able to use the global mypy instead):
silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py') silent execute 'file ' . fnameescape(g:dir . '/python_paths/with_virtualenv/subdir/foo/bar.py')
@ -68,8 +69,8 @@ Execute(You should able able to use the global mypy instead):
AssertLinter 'mypy', AssertLinter 'mypy',
\ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir')) \ ale#path#CdString(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir'))
\ . ale#Escape('mypy') \ . ale#Escape('mypy')
\ . ' --show-column-numbers ' \ . ' --show-column-numbers'
\ . '--shadow-file %s %t %s' \ . ' --shadow-file %s %t %s'
Execute(Setting executable to 'pipenv' appends 'run mypy'): Execute(Setting executable to 'pipenv' appends 'run mypy'):
let g:ale_python_mypy_executable = 'path/to/pipenv' let g:ale_python_mypy_executable = 'path/to/pipenv'
@ -77,7 +78,7 @@ Execute(Setting executable to 'pipenv' appends 'run mypy'):
AssertLinter 'path/to/pipenv', AssertLinter 'path/to/pipenv',
\ ale#path#CdString(expand('#' . bufnr('') . ':p:h')) \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
\ . ale#Escape('path/to/pipenv') . ' run mypy' \ . ale#Escape('path/to/pipenv') . ' run mypy'
\ . ' --show-column-numbers --shadow-file %s %t %s' \ . ' --show-column-numbers --shadow-file %s %t %s'
Execute(Pipenv is detected when python_mypy_auto_pipenv is set): Execute(Pipenv is detected when python_mypy_auto_pipenv is set):
let g:ale_python_mypy_auto_pipenv = 1 let g:ale_python_mypy_auto_pipenv = 1
@ -85,4 +86,4 @@ Execute(Pipenv is detected when python_mypy_auto_pipenv is set):
AssertLinter 'pipenv', AssertLinter 'pipenv',
\ ale#path#CdString(expand('#' . bufnr('') . ':p:h')) \ ale#path#CdString(expand('#' . bufnr('') . ':p:h'))
\ . ale#Escape('pipenv') . ' run mypy --show-column-numbers --shadow-file %s %t %s' \ . ale#Escape('pipenv') . ' run mypy --show-column-numbers --shadow-file %s %t %s'