Simplify the code for most linters and tests with closures

2 files changed, 10 insertions, 26 deletions

diff --git a/ale_linters/less/lessc.vim b/ale_linters/less/lessc.vim
index 5fd9a383..37600649 100755
--- a/ale_linters/less/lessc.vim
+++ b/ale_linters/less/lessc.vim
@@ -5,21 +5,10 @@ call ale#Set('less_lessc_executable', 'lessc')
 call ale#Set('less_lessc_options', '')
 call ale#Set('less_lessc_use_global', get(g:, 'ale_use_global_executables', 0))
 
-function! ale_linters#less#lessc#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'less_lessc', [
-    \   'node_modules/.bin/lessc',
-    \])
-endfunction
-
 function! ale_linters#less#lessc#GetCommand(buffer) abort
-    let l:executable = ale_linters#less#lessc#GetExecutable(a:buffer)
-    let l:dir = expand('#' . a:buffer . ':p:h')
-    let l:options = ale#Var(a:buffer, 'less_lessc_options')
-
-    return ale#Escape(l:executable)
-    \   . ' --no-color --lint'
-    \   . ' --include-path=' . ale#Escape(l:dir)
-    \   . (!empty(l:options) ? ' ' . l:options : '')
+    return '%e --no-color --lint'
+    \   . ' --include-path=' . ale#Escape(expand('#' . a:buffer . ':p:h'))
+    \   . ale#Pad(ale#Var(a:buffer, 'less_lessc_options'))
     \   . ' -'
 endfunction
 
@@ -49,7 +38,9 @@ endfunction
 
 call ale#linter#Define('less', {
 \   'name': 'lessc',
-\   'executable_callback': 'ale_linters#less#lessc#GetExecutable',
+\   'executable_callback': ale#node#FindExecutableFunc('less_lessc', [
+\       'node_modules/.bin/lessc',
+\   ]),
 \   'command_callback': 'ale_linters#less#lessc#GetCommand',
 \   'callback': 'ale_linters#less#lessc#Handle',
 \   'output_stream': 'stderr',
diff --git a/ale_linters/less/stylelint.vim b/ale_linters/less/stylelint.vim
index 8e16a098..479808c2 100644
--- a/ale_linters/less/stylelint.vim
+++ b/ale_linters/less/stylelint.vim
@@ -4,24 +4,17 @@ call ale#Set('less_stylelint_executable', 'stylelint')
 call ale#Set('less_stylelint_options', '')
 call ale#Set('less_stylelint_use_global', get(g:, 'ale_use_global_executables', 0))
 
-function! ale_linters#less#stylelint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'less_stylelint', [
-    \   'node_modules/.bin/stylelint',
-    \])
-endfunction
-
 function! ale_linters#less#stylelint#GetCommand(buffer) abort
-    let l:executable = ale_linters#less#stylelint#GetExecutable(a:buffer)
     let l:options = ale#Var(a:buffer, 'less_stylelint_options')
 
-    return ale#Escape(l:executable)
-    \   . (!empty(l:options) ? ' ' . l:options : '')
-    \   . ' --stdin-filename %s'
+    return '%e' . ale#Pad(l:options) . ' --stdin-filename %s'
 endfunction
 
 call ale#linter#Define('less', {
 \   'name': 'stylelint',
-\   'executable_callback': 'ale_linters#less#stylelint#GetExecutable',
+\   'executable_callback': ale#node#FindExecutableFunc('less_stylelint', [
+\       'node_modules/.bin/stylelint',
+\   ]),
 \   'command_callback': 'ale_linters#less#stylelint#GetCommand',
 \   'callback': 'ale#handlers#css#HandleStyleLintFormat',
 \})