#1277 Try to get eslint_d to run the right version of eslint

This commit is contained in:
w0rp 2018-04-13 20:49:03 +01:00
parent a0aa9aa9b7
commit 56c7957a75
No known key found for this signature in database
GPG Key ID: 0FC1ECAA8C81CD83

View File

@ -41,8 +41,19 @@ function! ale#handlers#eslint#GetCommand(buffer) abort
let l:executable = ale#handlers#eslint#GetExecutable(a:buffer) let l:executable = ale#handlers#eslint#GetExecutable(a:buffer)
let l:options = ale#Var(a:buffer, 'javascript_eslint_options') let l:options = ale#Var(a:buffer, 'javascript_eslint_options')
let l:cd_string = ''
return ale#node#Executable(a:buffer, l:executable) " Change directory to where `node_modules` is, if running eslint_d.
" eslint_d looks up which eslint version to use based on the CWD.
if l:executable =~# 'eslint_d'
let l:node_modules_dir = ale#path#FindNearestDirectory(a:buffer, 'node_modules')
if !empty(l:node_modules_dir)
let l:cd_string = ale#path#CdString(l:node_modules_dir)
endif
endif
return l:cd_string . ale#node#Executable(a:buffer, l:executable)
\ . (!empty(l:options) ? ' ' . l:options : '') \ . (!empty(l:options) ? ' ' . l:options : '')
\ . ' -f unix --stdin --stdin-filename %s' \ . ' -f unix --stdin --stdin-filename %s'
endfunction endfunction