Support both old (<0.7) and new Julia versions

Closes #1931
This commit is contained in:
Daniel Wennberg 2018-09-19 06:51:20 -07:00
parent b278927102
commit d50e603177
2 changed files with 3 additions and 3 deletions

View File

@ -6,7 +6,7 @@ call ale#Set('julia_executable', 'julia')
function! ale_linters#julia#languageserver#GetCommand(buffer) abort function! ale_linters#julia#languageserver#GetCommand(buffer) abort
let l:julia_executable = ale#Var(a:buffer, 'julia_executable') 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) return ale#Escape(l:julia_executable) . ' --startup-file=no --history-file=no -e ' . ale#Escape(l:cmd_string)
endfunction endfunction

View File

@ -12,7 +12,7 @@ Execute(The default executable path should be correct):
AssertLinter 'julia', AssertLinter 'julia',
\ ale#Escape('julia') . \ ale#Escape('julia') .
\' --startup-file=no --history-file=no -e ' . \' --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): Execute(The executable should be configurable):
let g:ale_julia_executable = 'julia-new' let g:ale_julia_executable = 'julia-new'
@ -20,7 +20,7 @@ Execute(The executable should be configurable):
AssertLinter 'julia-new', AssertLinter 'julia-new',
\ ale#Escape('julia-new') . \ ale#Escape('julia-new') .
\' --startup-file=no --history-file=no -e ' . \' --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): Execute(The project root should be detected correctly):
AssertLSPProject '' AssertLSPProject ''