Merge pull request #1533 from inducer/master

flake8: Move to the buffer's directory before running flake8 command

2 files changed, 21 insertions, 10 deletions

diff --git a/ale_linters/python/flake8.vim b/ale_linters/python/flake8.vim
index 4de4daff..4ed41935 100644
--- a/ale_linters/python/flake8.vim
+++ b/ale_linters/python/flake8.vim
@@ -39,6 +39,7 @@ function! ale_linters#python#flake8#VersionCheck(buffer) abort
 endfunction
 
 function! ale_linters#python#flake8#GetCommand(buffer, version_output) abort
+    let l:cd_string = ale#path#BufferCdString(a:buffer)
     let l:executable = ale_linters#python#flake8#GetExecutable(a:buffer)
     let l:version = ale#semver#GetVersion(l:executable, a:version_output)
 
@@ -50,7 +51,8 @@ function! ale_linters#python#flake8#GetCommand(buffer, version_output) abort
 
     let l:options = ale#Var(a:buffer, 'python_flake8_options')
 
-    return ale#Escape(l:executable)
+    return l:cd_string
+    \   . ale#Escape(l:executable)
     \   . (!empty(l:options) ? ' ' . l:options : '')
     \   . ' --format=default'
     \   . l:display_name_args . ' -'
diff --git a/test/command_callback/test_flake8_command_callback.vader b/test/command_callback/test_flake8_command_callback.vader
index 1784b81f..6297bd3f 100644
--- a/test/command_callback/test_flake8_command_callback.vader
+++ b/test/command_callback/test_flake8_command_callback.vader
@@ -33,20 +33,23 @@ Execute(The flake8 callbacks should return the correct default values):
   \ ale#Escape('flake8') . ' --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ ale#Escape('flake8') . ' --format=default --stdin-display-name %s -',
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('flake8') . ' --format=default --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.0'])
 
   " Try with older versions.
   call ale#semver#ResetVersionCache()
   AssertEqual
-  \ ale#Escape('flake8') . ' --format=default -',
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('flake8') . ' --format=default -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])
 
 Execute(The flake8 command callback should let you set options):
   let g:ale_python_flake8_options = '--some-option'
 
   AssertEqual
-  \ ale#Escape('flake8')
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('flake8')
   \   . ' --some-option --format=default'
   \   . ' --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.4'])
@@ -54,7 +57,8 @@ Execute(The flake8 command callback should let you set options):
   call ale#semver#ResetVersionCache()
 
   AssertEqual
-  \ ale#Escape('flake8')
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('flake8')
   \   . ' --some-option --format=default -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])
 
@@ -68,7 +72,8 @@ Execute(You should be able to set a custom executable and it should be escaped):
   \ ale#Escape('executable with spaces') . ' --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ ale#Escape('executable with spaces')
+  \ ale#path#BufferCdString(bufnr(''))
+  \   .  ale#Escape('executable with spaces')
   \   . ' --format=default'
   \   . ' --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.0'])
@@ -87,7 +92,8 @@ Execute(The flake8 callbacks should detect virtualenv directories):
   \ ale#Escape(b:executable) . ' --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ ale#Escape(b:executable)
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape(b:executable)
   \   . ' --format=default --stdin-display-name %s -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['3.0.0'])
 
@@ -140,7 +146,8 @@ Execute(Using `python -m flake8` should be supported for running flake8):
   \ ale#Escape('python') . ' -m flake8 --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ ale#Escape('python') . ' -m flake8 --some-option --format=default -',
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('python') . ' -m flake8 --some-option --format=default -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])
 
   call ale#semver#ResetVersionCache()
@@ -155,7 +162,8 @@ Execute(Using `python -m flake8` should be supported for running flake8):
   \ ale#Escape('python') . ' -m flake8 --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ ale#Escape('python') . '   -m flake8 --some-option --format=default -',
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('python') . '   -m flake8 --some-option --format=default -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])
 
 Execute(Using `python2 -m flake8` should be supported with the old args option):
@@ -177,5 +185,6 @@ Execute(Using `python2 -m flake8` should be supported with the old args option):
   \ ale#Escape('python2') . ' -m flake8 --version',
   \ ale_linters#python#flake8#VersionCheck(bufnr(''))
   AssertEqual
-  \ ale#Escape('python2') . ' -m flake8 --format=default -',
+  \ ale#path#BufferCdString(bufnr(''))
+  \   . ale#Escape('python2') . ' -m flake8 --format=default -',
   \ ale_linters#python#flake8#GetCommand(bufnr(''), ['2.9.9'])