Support both old (<0.7) and new Julia versions

Closes #1931
dense-analysis · Sep 19, 2018 · d50e603 · d50e603
1 parent b278927
commit d50e603
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ale_linters/julia/languageserver.vim b/ale_linters/julia/languageserver.vim
@@ -6,7 +6,7 @@ call ale#Set('julia_executable', 'julia')
 
 function! ale_linters#julia#languageserver#GetCommand(buffer) abort
     let l:julia_executable = ale#Var(a:buffer, 'julia_executable')
-    let l:cmd_string = 'using LanguageServer; server = LanguageServer.LanguageServerInstance(stdin, stdout, false); server.runlinter = true; run(server);'
+    let l:cmd_string = 'using LanguageServer; server = LanguageServer.LanguageServerInstance(isdefined(Base, :stdin) ? stdin : STDIN, isdefined(Base, :stdout) ? stdout : STDOUT, false); server.runlinter = true; run(server);'
 
     return ale#Escape(l:julia_executable) . ' --startup-file=no --history-file=no -e ' . ale#Escape(l:cmd_string)
 endfunction

diff --git a/test/command_callback/test_julia_languageserver_callbacks.vader b/test/command_callback/test_julia_languageserver_callbacks.vader
@@ -12,15 +12,15 @@ Execute(The default executable path should be correct):
   AssertLinter 'julia',
   \ ale#Escape('julia') .
   \' --startup-file=no --history-file=no -e ' .
-  \ ale#Escape('using LanguageServer; server = LanguageServer.LanguageServerInstance(stdin, stdout, false); server.runlinter = true; run(server);')
+  \ ale#Escape('using LanguageServer; server = LanguageServer.LanguageServerInstance(isdefined(Base, :stdin) ? stdin : STDIN, isdefined(Base, :stdout) ? stdout : STDOUT, false); server.runlinter = true; run(server);')
 
 Execute(The executable should be configurable):
   let g:ale_julia_executable = 'julia-new'
 
   AssertLinter 'julia-new',
   \ ale#Escape('julia-new') .
   \' --startup-file=no --history-file=no -e ' .
-  \ ale#Escape('using LanguageServer; server = LanguageServer.LanguageServerInstance(stdin, stdout, false); server.runlinter = true; run(server);')
+  \ ale#Escape('using LanguageServer; server = LanguageServer.LanguageServerInstance(isdefined(Base, :stdin) ? stdin : STDIN, isdefined(Base, :stdout) ? stdout : STDOUT, false); server.runlinter = true; run(server);')
 
 Execute(The project root should be detected correctly):
   AssertLSPProject ''