vim/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix julia escaping + minor edits

Browse Source
This commit is contained in:
Bartolomeo Stellato 2018-09-07 14:13:44 -04:00
parent f64f0bb48c
commit 68ac4d1095
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ale_linters/julia/languageserver.vim
View File

@ -6,7 +6,8 @@ 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')
return ale#Escape(l:julia_executable . " --startup-file=no --history-file=no -e 'using LanguageServer; server = LanguageServer.LanguageServerInstance(STDIN, STDOUT, false); server.runlinter = true; run(server);'") let l:cmd_string = 'using LanguageServer; server = LanguageServer.LanguageServerInstance(STDIN, STDOUT, false); server.runlinter = true; run(server);'
return l:julia_executable . ' --startup-file=no --history-file=no -e ' . ale#Escape(l:cmd_string)
endfunction endfunction
call ale#linter#Define('julia', { call ale#linter#Define('julia', {

7
autoload/ale/julia.vim
View File

@ -2,19 +2,16 @@
" Description: Functions for integrating with Julia tools " Description: Functions for integrating with Julia tools
" Find the nearest dir contining a git project as julia project " Find the nearest dir contining a git project as julia project
let g:__ale_julia_project_filenames = ['REQUIRE'] let s:__ale_julia_project_filenames = ['REQUIRE']
function! ale#julia#FindProjectRoot(buffer) abort function! ale#julia#FindProjectRoot(buffer) abort
for l:project_filename in g:__ale_julia_project_filenames for l:project_filename in s:__ale_julia_project_filenames
let l:full_path = ale#path#FindNearestFile(a:buffer, l:project_filename) let l:full_path = ale#path#FindNearestFile(a:buffer, l:project_filename)
if !empty(l:full_path) if !empty(l:full_path)
let l:path = fnamemodify(l:full_path, ':p:h') let l:path = fnamemodify(l:full_path, ':p:h')
return l:path return l:path
endif endif
endfor endfor
return '' return ''
endfunction endfunction

4
test/command_callback/test_julia_languageserver_callbacks.vader
View File

@ -5,12 +5,12 @@ After:
call ale#assert#TearDownLinterTest() call ale#assert#TearDownLinterTest()
Execute(The default executable path should be correct): Execute(The default executable path should be correct):
AssertLinter 'julia', ale#Escape("julia" . " --startup-file=no --history-file=no -e 'using LanguageServer; server = LanguageServer.LanguageServerInstance(STDIN, STDOUT, false); server.runlinter = true; run(server);'") AssertLinter 'julia', "julia --startup-file=no --history-file=no -e 'using LanguageServer; server = LanguageServer.LanguageServerInstance(STDIN, 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'
AssertLinter 'julia-new', ale#Escape("julia-new" . " --startup-file=no --history-file=no -e 'using LanguageServer; server = LanguageServer.LanguageServerInstance(STDIN, STDOUT, false); server.runlinter = true; run(server);'") AssertLinter 'julia-new', "julia-new --startup-file=no --history-file=no -e 'using LanguageServer; server = LanguageServer.LanguageServerInstance(STDIN, 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 ''