Merge branch 'master' into sridhars

1 files changed, 4 insertions, 14 deletions

diff --git a/ale_linters/javascript/flow_ls.vim b/ale_linters/javascript/flow_ls.vim
index 20fc2217..75377183 100644
--- a/ale_linters/javascript/flow_ls.vim
+++ b/ale_linters/javascript/flow_ls.vim
@@ -6,18 +6,6 @@ call ale#Set('javascript_flow_ls_use_global',
 \    get(g:, 'ale_use_global_executables', 0)
 \)
 
-function! ale_linters#javascript#flow_ls#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'javascript_flow_ls', [
-    \   'node_modules/.bin/flow',
-    \])
-endfunction
-
-function! ale_linters#javascript#flow_ls#GetCommand(buffer) abort
-    let l:executable = ale_linters#javascript#flow_ls#GetExecutable(a:buffer)
-
-    return ale#Escape(l:executable) . ' lsp --from ale-lsp'
-endfunction
-
 function! ale_linters#javascript#flow_ls#FindProjectRoot(buffer) abort
     let l:flow_config = ale#path#FindNearestFile(a:buffer, '.flowconfig')
 
@@ -31,8 +19,10 @@ endfunction
 call ale#linter#Define('javascript', {
 \   'name': 'flow-language-server',
 \   'lsp': 'stdio',
-\   'executable_callback': 'ale_linters#javascript#flow_ls#GetExecutable',
-\   'command_callback': 'ale_linters#javascript#flow_ls#GetCommand',
+\   'executable_callback': ale#node#FindExecutableFunc('javascript_flow_ls', [
+\       'node_modules/.bin/flow',
+\   ]),
+\   'command': '%e lsp --from ale-lsp',
 \   'project_root_callback': 'ale_linters#javascript#flow_ls#FindProjectRoot',
 \   'language': 'javascript',
 \})