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

Merge pull request #1841 from dabbeg/fix-importjs-fixer

Browse source 
importjs fixer not reading correct executable variable name
This commit is contained in:
w0rp 2018-08-24 10:31:18 +01:00 committed by w0rp
parent 3c6af5f68d
commit 3530aa6861
No known key found for this signature in database
GPG key ID: 0FC1ECAA8C81CD83
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
autoload/ale/fixers/importjs.vim
View file

@ -1,7 +1,7 @@
" Author: Jeff Willette <jrwillette88@gmail.com> " Author: Jeff Willette <jrwillette88@gmail.com>
" Description: Integration of importjs with ALE. " 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 function! ale#fixers#importjs#ProcessOutput(buffer, output) abort
let l:result = ale#util#FuzzyJSONDecode(a:output, []) let l:result = ale#util#FuzzyJSONDecode(a:output, [])
@ -9,7 +9,7 @@ function! ale#fixers#importjs#ProcessOutput(buffer, output) abort
endfunction endfunction
function! ale#fixers#importjs#Fix(buffer) abort 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) if !executable(l:executable)
return 0 return 0

8
test/fixers/test_importjs_fixer_callback.vader
View file

@ -1,8 +1,8 @@
Before: Before:
Save g:ale_js_importjs_executable Save g:ale_javascript_importjs_executable
" Use an invalid global executable, so we don't match it. " 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#SetDirectory('/testplugin/test/fixers')
call ale#test#SetFilename('../javascript_files/test.js') 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('')) \ ale#fixers#importjs#Fix(bufnr(''))
Execute(The importjs callback should run the command when the executable test passes): 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 AssertEqual
\ { \ {
\ 'process_with': 'ale#fixers#importjs#ProcessOutput', \ '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('')) \ ale#fixers#importjs#Fix(bufnr(''))