diff options
| author | w0rp <w0rp@users.noreply.github.com> | 2018-08-24 10:31:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 10:31:18 +0100 |
| commit | 1f26fc40134dd7ee6bc85702099af60421f234de (patch) | |
| tree | e44a20b91f29097c9451fd2d4f926d632f00196b | |
| parent | 707b539969df55d9372135d8b15771693699d5ac (diff) | |
| parent | f526fc68d11788bd45d1c78112168b855e923c04 (diff) | |
| download | ale-1f26fc40134dd7ee6bc85702099af60421f234de.zip | |
Merge pull request #1841 from dabbeg/fix-importjs-fixer
importjs fixer not reading correct executable variable name
| -rw-r--r-- | autoload/ale/fixers/importjs.vim | 4 | ||||
| -rw-r--r-- | test/fixers/test_importjs_fixer_callback.vader | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/autoload/ale/fixers/importjs.vim b/autoload/ale/fixers/importjs.vim index e8eedb12..50d3d74e 100644 --- a/autoload/ale/fixers/importjs.vim +++ b/autoload/ale/fixers/importjs.vim @@ -1,7 +1,7 @@ " Author: Jeff Willette <jrwillette88@gmail.com> " Description: Integration of importjs with ALE. -call ale#Set('js_importjs_executable', 'importjs') +call ale#Set('javascript_importjs_executable', 'importjs') function! ale#fixers#importjs#ProcessOutput(buffer, output) abort let l:result = ale#util#FuzzyJSONDecode(a:output, []) @@ -9,7 +9,7 @@ function! ale#fixers#importjs#ProcessOutput(buffer, output) abort endfunction function! ale#fixers#importjs#Fix(buffer) abort - let l:executable = ale#Var(a:buffer, 'js_importjs_executable') + let l:executable = ale#Var(a:buffer, 'javascript_importjs_executable') if !executable(l:executable) return 0 diff --git a/test/fixers/test_importjs_fixer_callback.vader b/test/fixers/test_importjs_fixer_callback.vader index c3e57f8b..53b87c2e 100644 --- a/test/fixers/test_importjs_fixer_callback.vader +++ b/test/fixers/test_importjs_fixer_callback.vader @@ -1,8 +1,8 @@ Before: - Save g:ale_js_importjs_executable + Save g:ale_javascript_importjs_executable " Use an invalid global executable, so we don't match it. - let g:ale_js_importjs_executable = 'xxxinvalid' + let g:ale_javascript_importjs_executable = 'xxxinvalid' call ale#test#SetDirectory('/testplugin/test/fixers') call ale#test#SetFilename('../javascript_files/test.js') @@ -18,12 +18,12 @@ Execute(The importjs callback should return 0 when the executable isn't executab \ ale#fixers#importjs#Fix(bufnr('')) Execute(The importjs callback should run the command when the executable test passes): - let g:ale_js_importjs_executable = has('win32') ? 'cmd' : 'echo' + let g:ale_javascript_importjs_executable = has('win32') ? 'cmd' : 'echo' AssertEqual \ { \ 'process_with': 'ale#fixers#importjs#ProcessOutput', - \ 'command': ale#Escape(g:ale_js_importjs_executable) . ' fix %s' + \ 'command': ale#Escape(g:ale_javascript_importjs_executable) . ' fix %s' \ }, \ ale#fixers#importjs#Fix(bufnr('')) |