Fix #363 - Detect virtualenv executables and fix import paths for mypy. Use lint_file for mypy

3 files changed, 101 insertions, 13 deletions

diff --git a/test/command_callback/python_paths/with_virtualenv/env/bin/mypy b/test/command_callback/python_paths/with_virtualenv/env/bin/mypy
new file mode 100755
index 00000000..e69de29b
--- /dev/null
+++ b/test/command_callback/python_paths/with_virtualenv/env/bin/mypy
diff --git a/test/command_callback/test_mypy_command_callback.vader b/test/command_callback/test_mypy_command_callback.vader
new file mode 100644
index 00000000..ec82c879
--- /dev/null
+++ b/test/command_callback/test_mypy_command_callback.vader
@@ -0,0 +1,73 @@
+Before:
+  runtime ale_linters/python/mypy.vim
+  silent! execute 'cd /testplugin/test/command_callback'
+  let g:dir = getcwd()
+
+After:
+  silent execute 'cd ' . fnameescape(g:dir)
+  " Set the file to something else,
+  " or we'll cause issues when running other tests
+  silent file 'dummy.py'
+  unlet! g:dir
+
+  call ale#linter#Reset()
+  let g:ale_python_mypy_executable = 'mypy'
+  let g:ale_python_mypy_options = ''
+  let g:ale_python_mypy_use_global = 0
+
+Execute(The mypy callbacks should return the correct default values):
+  AssertEqual
+  \ 'mypy',
+  \ ale_linters#python#mypy#GetExecutable(bufnr(''))
+  AssertEqual
+  \ 'cd ' . g:dir . ' && mypy --show-column-numbers  %s',
+  \ ale_linters#python#mypy#GetCommand(bufnr(''))
+
+Execute(The mypy executable should be configurable, and escaped properly):
+  let g:ale_python_mypy_executable = 'executable with spaces'
+
+  AssertEqual
+  \ 'executable with spaces',
+  \ ale_linters#python#mypy#GetExecutable(bufnr(''))
+  AssertEqual
+  \ 'cd ' . g:dir . ' && executable\ with\ spaces --show-column-numbers  %s',
+  \ ale_linters#python#mypy#GetCommand(bufnr(''))
+
+Execute(The mypy command callback should let you set options):
+  let g:ale_python_mypy_options = '--some-option'
+
+  AssertEqual
+  \ 'cd ' . g:dir . ' && mypy --show-column-numbers --some-option %s',
+  \ ale_linters#python#mypy#GetCommand(bufnr(''))
+
+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')
+
+  AssertEqual
+  \ 'mypy',
+  \ ale_linters#python#mypy#GetExecutable(bufnr(''))
+  AssertEqual
+  \ 'cd ' . g:dir . '/python_paths/no_virtualenv/subdir && mypy --show-column-numbers  %s',
+  \ ale_linters#python#mypy#GetCommand(bufnr(''))
+
+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')
+
+  AssertEqual
+  \ g:dir . '/python_paths/with_virtualenv/env/bin/mypy',
+  \ ale_linters#python#mypy#GetExecutable(bufnr(''))
+  AssertEqual
+  \   'cd ' . g:dir . '/python_paths/with_virtualenv/subdir && '
+  \   . g:dir . '/python_paths/with_virtualenv/env/bin/mypy --show-column-numbers  %s',
+  \ ale_linters#python#mypy#GetCommand(bufnr(''))
+
+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')
+  let g:ale_python_mypy_use_global = 1
+
+  AssertEqual
+  \ 'mypy',
+  \ ale_linters#python#mypy#GetExecutable(bufnr(''))
+  AssertEqual
+  \ 'cd ' . g:dir . '/python_paths/with_virtualenv/subdir && mypy --show-column-numbers  %s',
+  \ ale_linters#python#mypy#GetCommand(bufnr(''))
diff --git a/test/handler/test_mypy_handler.vader b/test/handler/test_mypy_handler.vader
index e1b1562d..c949b1aa 100644
--- a/test/handler/test_mypy_handler.vader
+++ b/test/handler/test_mypy_handler.vader
@@ -3,30 +3,45 @@ Before:
 
 After:
   call ale#linter#Reset()
+  silent file something_else.py
 
 Execute(The mypy handler should parse lines correctly):
+  silent file foo/bar/__init__.py
+
   AssertEqual
   \ [
   \   {
-  \     'lnum': 4,
-  \     'col': 0,
-  \     'text': "No library stub file for module 'django.db'",
+  \     'lnum': 15,
+  \     'col': 3,
+  \     'text': 'Argument 1 to "somefunc" has incompatible type "int"; expected "str"',
   \     'type': 'E',
   \   },
   \   {
-  \     'lnum': 40,
-  \     'col': 5,
-  \     'text': "Some other problem",
-  \     'type': 'E',
+  \     'lnum': 72,
+  \     'col': 1,
+  \     'text': 'Some warning',
+  \     'type': 'W',
   \   },
   \ ],
-  \ ale_linters#python#mypy#Handle(347, [
-  \   "file.py:4: error: No library stub file for module 'django.db'",
-  \   'file.py:4: note: (Stub files are from https://github.com/python/typeshed)',
-  \   "file.py:40:5: error: Some other problem",
+  \ ale_linters#python#mypy#Handle(bufnr(''), [
+  \ 'foo/bar/baz.py: note: In class "SomeClass":',
+  \ 'foo/bar/baz.py:768:38: error: Cannot determine type of ''SOME_SYMBOL''',
+  \ 'foo/bar/baz.py: note: In class "AnotherClass":',
+  \ 'foo/bar/baz.py:821:38: error: Cannot determine type of ''SOME_SYMBOL''',
+  \ 'foo/bar/__init__.py:92: note: In module imported here:',
+  \ 'foo/bar/other.py: note: In class "YetAnotherClass":',
+  \ 'foo/bar/other.py:38:44: error: Cannot determine type of ''ANOTHER_SYMBOL''',
+  \ 'foo/bar/__init__.py: note: At top level:',
+  \ 'foo/bar/__init__.py:15:3: error: Argument 1 to "somefunc" has incompatible type "int"; expected "str"',
+  \ 'another_module/bar.py:14: note: In module imported here,',
+  \ 'another_module/__init__.py:16: note: ... from here,',
+  \ 'foo/bar/__init__.py:72:1: warning: Some warning',
   \ ])
 
 Execute(The mypy handler should handle Windows names with spaces):
+  " This test works on Unix, where this is seen as a single filename
+  silent file C:\\something\\with\ spaces.py
+
   AssertEqual
   \ [
   \   {
@@ -36,6 +51,6 @@ Execute(The mypy handler should handle Windows names with spaces):
   \     'type': 'E',
   \   },
   \ ],
-  \ ale_linters#python#mypy#Handle(347, [
-  \   "C:\something\with spaces.py:4: error: No library stub file for module 'django.db'",
+  \ ale_linters#python#mypy#Handle(bufnr(''), [
+  \   'C:\something\with spaces.py:4: error: No library stub file for module ''django.db''',
   \ ])