Simplify the code for most linters and tests with closures

2 files changed, 8 insertions, 25 deletions

diff --git a/ale_linters/yaml/swaglint.vim b/ale_linters/yaml/swaglint.vim
index 4a22c70f..7362536e 100644
--- a/ale_linters/yaml/swaglint.vim
+++ b/ale_linters/yaml/swaglint.vim
@@ -4,17 +4,6 @@
 call ale#Set('yaml_swaglint_executable', 'swaglint')
 call ale#Set('yaml_swaglint_use_global', get(g:, 'ale_use_global_executables', 0))
 
-function! ale_linters#yaml#swaglint#GetExecutable(buffer) abort
-    return ale#node#FindExecutable(a:buffer, 'yaml_swaglint', [
-    \   'node_modules/.bin/swaglint',
-    \])
-endfunction
-
-function! ale_linters#yaml#swaglint#GetCommand(buffer) abort
-    return ale_linters#yaml#swaglint#GetExecutable(a:buffer)
-    \    . ' -r compact --stdin'
-endfunction
-
 function! ale_linters#yaml#swaglint#Handle(buffer, lines) abort
     let l:pattern = ': \([^\s]\+\) @ \(\d\+\):\(\d\+\) - \(.\+\)$'
     let l:output = []
@@ -43,7 +32,9 @@ endfunction
 
 call ale#linter#Define('yaml', {
 \   'name': 'swaglint',
-\   'executable_callback': 'ale_linters#yaml#swaglint#GetExecutable',
-\   'command_callback': 'ale_linters#yaml#swaglint#GetCommand',
+\   'executable_callback': ale#node#FindExecutableFunc('yaml_swaglint', [
+\       'node_modules/.bin/swaglint',
+\   ]),
+\   'command': '%e -r compact --stdin',
 \   'callback': 'ale_linters#yaml#swaglint#Handle',
 \})
diff --git a/ale_linters/yaml/yamllint.vim b/ale_linters/yaml/yamllint.vim
index f100667e..9d2cc7c2 100644
--- a/ale_linters/yaml/yamllint.vim
+++ b/ale_linters/yaml/yamllint.vim
@@ -1,18 +1,10 @@
 " Author: KabbAmine <amine.kabb@gmail.com>
 
-let g:ale_yaml_yamllint_executable =
-\   get(g:, 'ale_yaml_yamllint_executable', 'yamllint')
-
-let g:ale_yaml_yamllint_options =
-\   get(g:, 'ale_yaml_yamllint_options', '')
-
-function! ale_linters#yaml#yamllint#GetExecutable(buffer) abort
-    return ale#Var(a:buffer, 'yaml_yamllint_executable')
-endfunction
+call ale#Set('yaml_yamllint_executable', 'yamllint')
+call ale#Set('yaml_yamllint_options', '')
 
 function! ale_linters#yaml#yamllint#GetCommand(buffer) abort
-    return ale_linters#yaml#yamllint#GetExecutable(a:buffer)
-    \   . ' ' . ale#Var(a:buffer, 'yaml_yamllint_options')
+    return '%e' . ale#Pad(ale#Var(a:buffer, 'yaml_yamllint_options'))
     \   . ' -f parsable %t'
 endfunction
 
@@ -52,7 +44,7 @@ endfunction
 
 call ale#linter#Define('yaml', {
 \   'name': 'yamllint',
-\   'executable_callback': 'ale_linters#yaml#yamllint#GetExecutable',
+\   'executable_callback': ale#VarFunc('yaml_yamllint_executable'),
 \   'command_callback': 'ale_linters#yaml#yamllint#GetCommand',
 \   'callback': 'ale_linters#yaml#yamllint#Handle',
 \})