marc/ale
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1937 from danielwe/master

Browse source 
Support both old (<0.7) and new Julia versions
This commit is contained in:
w0rp 2018-09-19 15:40:10 +01:00 committed by GitHub
commit 9d50a06d48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ale_linters/julia/languageserver.vim
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

4
test/command_callback/test_julia_languageserver_callbacks.vader
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 ''