Simplify the code for most linters and tests with closures

3 files changed, 12 insertions, 33 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',
 \})
diff --git a/ale_linters/javascript/jscs.vim b/ale_linters/javascript/jscs.vim
index 60044037..a38766a6 100644
--- a/ale_linters/javascript/jscs.vim
+++ b/ale_linters/javascript/jscs.vim
@@ -4,12 +4,6 @@
 call ale#Set('javascript_jscs_executable', 'jscs')
 call ale#Set('javascript_jscs_use_global', get(g:, 'ale_use_global_executables', 0))
 
-function! ale_linters#javascript#jscs#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'javascript_jscs', [
-    \   'node_modules/.bin/jscs',
-    \])
-endfunction
-
 function! ale_linters#javascript#jscs#GetCommand(buffer) abort
     " Search for a local JShint config locaation, and default to a global one.
     let l:jscs_config = ale#path#ResolveLocalPath(
@@ -18,8 +12,7 @@ function! ale_linters#javascript#jscs#GetCommand(buffer) abort
     \   get(g:, 'ale_jscs_config_loc', '')
     \)
 
-    let l:command = ale#Escape(ale_linters#javascript#jscs#GetExecutable(a:buffer))
-    let l:command .= ' --reporter inline --no-colors'
+    let l:command = '%e --reporter inline --no-colors'
 
     if !empty(l:jscs_config)
         let l:command .= ' --config ' . ale#Escape(l:jscs_config)
@@ -60,8 +53,9 @@ endfunction
 
 call ale#linter#Define('javascript', {
 \   'name': 'jscs',
-\   'executable_callback': 'ale_linters#javascript#jscs#GetExecutable',
+\   'executable_callback': ale#node#FindExecutableFunc('javascript_jscs', [
+\       'node_modules/.bin/jscs',
+\   ]),
 \   'command_callback': 'ale_linters#javascript#jscs#GetCommand',
 \   'callback': 'ale_linters#javascript#jscs#Handle',
 \})
-
diff --git a/ale_linters/javascript/jshint.vim b/ale_linters/javascript/jshint.vim
index 2e9bb9fd..83909fa4 100644
--- a/ale_linters/javascript/jshint.vim
+++ b/ale_linters/javascript/jshint.vim
@@ -4,12 +4,6 @@
 call ale#Set('javascript_jshint_executable', 'jshint')
 call ale#Set('javascript_jshint_use_global', get(g:, 'ale_use_global_executables', 0))
 
-function! ale_linters#javascript#jshint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'javascript_jshint', [
-    \   'node_modules/.bin/jshint',
-    \])
-endfunction
-
 function! ale_linters#javascript#jshint#GetCommand(buffer) abort
     " Search for a local JShint config locaation, and default to a global one.
     let l:jshint_config = ale#path#ResolveLocalPath(
@@ -18,8 +12,7 @@ function! ale_linters#javascript#jshint#GetCommand(buffer) abort
     \   get(g:, 'ale_jshint_config_loc', '')
     \)
 
-    let l:command = ale#Escape(ale_linters#javascript#jshint#GetExecutable(a:buffer))
-    let l:command .= ' --reporter unix --extract auto'
+    let l:command = '%e --reporter unix --extract auto'
 
     if !empty(l:jshint_config)
         let l:command .= ' --config ' . ale#Escape(l:jshint_config)
@@ -32,7 +25,9 @@ endfunction
 
 call ale#linter#Define('javascript', {
 \   'name': 'jshint',
-\   'executable_callback': 'ale_linters#javascript#jshint#GetExecutable',
+\   'executable_callback': ale#node#FindExecutableFunc('javascript_jshint', [
+\       'node_modules/.bin/jshint',
+\   ]),
 \   'command_callback': 'ale_linters#javascript#jshint#GetCommand',
 \   'callback': 'ale#handlers#unix#HandleAsError',
 \})