summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw0rp <devw0rp@gmail.com>2018-02-04 13:16:44 +0000
committerw0rp <devw0rp@gmail.com>2018-02-04 13:16:44 +0000
commit0f822b063cb9553c9e00bc63d0184ba8577e6248 (patch)
tree5480af676cac50895a4db538efba4adbfded0c08
parent31e0f48d62fdc5e9b3c4a0da1fc51ed94d9b335b (diff)
downloadale-0f822b063cb9553c9e00bc63d0184ba8577e6248.zip
Fix #1330 - Find isort configs better by changing the working directory
-rw-r--r--autoload/ale/fixers/isort.vim8
-rw-r--r--test/fixers/test_isort_fixer_callback.vader5
2 files changed, 6 insertions, 7 deletions
diff --git a/autoload/ale/fixers/isort.vim b/autoload/ale/fixers/isort.vim
index 00d968f4..b6318221 100644
--- a/autoload/ale/fixers/isort.vim
+++ b/autoload/ale/fixers/isort.vim
@@ -15,12 +15,8 @@ function! ale#fixers#isort#Fix(buffer) abort
return 0
endif
- let l:config = ale#path#FindNearestFile(a:buffer, '.isort.cfg')
- let l:config_options = !empty(l:config)
- \ ? ' --settings-path ' . ale#Escape(l:config)
- \ : ''
-
return {
- \ 'command': ale#Escape(l:executable) . l:config_options . ' -',
+ \ 'command': ale#path#BufferCdString(a:buffer)
+ \ . ale#Escape(l:executable) . ' -',
\}
endfunction
diff --git a/test/fixers/test_isort_fixer_callback.vader b/test/fixers/test_isort_fixer_callback.vader
index 503057bb..7c2b515f 100644
--- a/test/fixers/test_isort_fixer_callback.vader
+++ b/test/fixers/test_isort_fixer_callback.vader
@@ -25,5 +25,8 @@ Execute(The isort callback should return the correct default values):
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 . '/isort')) . ' -' },
+ \ {
+ \ 'command': 'cd ' . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/subdir/foo')) . ' && '
+ \ . ale#Escape(ale#path#Simplify(g:dir . '/python_paths/with_virtualenv/env/' . b:bin_dir . '/isort')) . ' -',
+ \ },
\ ale#fixers#isort#Fix(bufnr(''))