Simplify the code for most linters and tests with closures

2 files changed, 8 insertions, 17 deletions

diff --git a/ale_linters/glsl/glslang.vim b/ale_linters/glsl/glslang.vim
index d494df0e..d55a5e7c 100644
--- a/ale_linters/glsl/glslang.vim
+++ b/ale_linters/glsl/glslang.vim
@@ -4,17 +4,11 @@
 " TODO: Once https://github.com/KhronosGroup/glslang/pull/1047 is accepted,
 " we can use stdin.
 
-let g:ale_glsl_glslang_executable =
-\ get(g:, 'ale_glsl_glslang_executable', 'glslangValidator')
-
-let g:ale_glsl_glslang_options = get(g:, 'ale_glsl_glslang_options', '')
-
-function! ale_linters#glsl#glslang#GetExecutable(buffer) abort
-    return ale#Var(a:buffer, 'glsl_glslang_executable')
-endfunction
+call ale#Set('glsl_glslang_executable', 'glslangValidator')
+call ale#Set('glsl_glslang_options', '')
 
 function! ale_linters#glsl#glslang#GetCommand(buffer) abort
-    return ale#Escape(ale_linters#glsl#glslang#GetExecutable(a:buffer))
+    return '%e'
     \   . ale#Pad(ale#Var(a:buffer, 'glsl_glslang_options'))
     \   . ' -C %t'
 endfunction
@@ -40,7 +34,7 @@ endfunction
 
 call ale#linter#Define('glsl', {
 \   'name': 'glslang',
-\   'executable_callback': 'ale_linters#glsl#glslang#GetExecutable',
+\   'executable_callback': ale#VarFunc('glsl_glslang_executable'),
 \   'command_callback': 'ale_linters#glsl#glslang#GetCommand',
 \   'callback': 'ale_linters#glsl#glslang#Handle',
 \})
diff --git a/ale_linters/glsl/glslls.vim b/ale_linters/glsl/glslls.vim
index 77e30f9c..8c6d9bd9 100644
--- a/ale_linters/glsl/glslls.vim
+++ b/ale_linters/glsl/glslls.vim
@@ -4,18 +4,15 @@
 call ale#Set('glsl_glslls_executable', 'glslls')
 call ale#Set('glsl_glslls_logfile', '')
 
-function! ale_linters#glsl#glslls#GetExecutable(buffer) abort
-    return ale#Var(a:buffer, 'glsl_glslls_executable')
-endfunction
-
 function! ale_linters#glsl#glslls#GetCommand(buffer) abort
-    let l:executable = ale_linters#glsl#glslls#GetExecutable(a:buffer)
     let l:logfile = ale#Var(a:buffer, 'glsl_glslls_logfile')
     let l:logfile_args = ''
+
     if l:logfile isnot# ''
         let l:logfile_args = ' --verbose -l ' . l:logfile
     endif
-    return ale#Escape(l:executable) . l:logfile_args . ' --stdin'
+
+    return '%e' . l:logfile_args . ' --stdin'
 endfunction
 
 function! ale_linters#glsl#glslls#GetProjectRoot(buffer) abort
@@ -27,7 +24,7 @@ endfunction
 call ale#linter#Define('glsl', {
 \   'name': 'glslls',
 \   'lsp': 'stdio',
-\   'executable_callback': 'ale_linters#glsl#glslls#GetExecutable',
+\   'executable_callback': ale#VarFunc('glsl_glslls_executable'),
 \   'command_callback': 'ale_linters#glsl#glslls#GetCommand',
 \   'project_root_callback': 'ale_linters#glsl#glslls#GetProjectRoot',
 \})