Merge branch 'master' into sridhars

1 files changed, 2 insertions, 10 deletions

diff --git a/ale_linters/fortran/language_server.vim b/ale_linters/fortran/language_server.vim
index fd763fcf..4e5f5dc4 100644
--- a/ale_linters/fortran/language_server.vim
+++ b/ale_linters/fortran/language_server.vim
@@ -4,14 +4,6 @@
 call ale#Set('fortran_language_server_executable', 'fortls')
 call ale#Set('fortran_language_server_use_global', get(g:, 'ale_use_global_executables', 0))
 
-function! ale_linters#fortran#language_server#GetExecutable(buffer) abort
-    return ale#Var(a:buffer, 'fortran_language_server_executable')
-endfunction
-
-function! ale_linters#fortran#language_server#GetCommand(buffer) abort
-    return ale#Escape(ale_linters#fortran#language_server#GetExecutable(a:buffer))
-endfunction
-
 function! ale_linters#fortran#language_server#GetProjectRoot(buffer) abort
     let l:fortls_file = ale#path#FindNearestFile(a:buffer, '.fortls')
 
@@ -21,7 +13,7 @@ endfunction
 call ale#linter#Define('fortran', {
 \   'name': 'language_server',
 \   'lsp': 'stdio',
-\   'executable_callback': 'ale_linters#fortran#language_server#GetExecutable',
-\   'command_callback': 'ale_linters#fortran#language_server#GetCommand',
+\   'executable_callback': ale#VarFunc('fortran_language_server_executable'),
+\   'command': '%e',
 \   'project_root_callback': 'ale_linters#fortran#language_server#GetProjectRoot',
 \})