diff --git a/autoload/ale/julia.vim b/autoload/ale/julia.vim index f17c6596..c544b1fa 100644 --- a/autoload/ale/julia.vim +++ b/autoload/ale/julia.vim @@ -1,8 +1,8 @@ " Author: Bartolomeo Stellato bartolomeo.stellato@gmail.com " Description: Functions for integrating with Julia tools -" Find the nearest dir contining a git project as julia project -let s:__ale_julia_project_filenames = ['REQUIRE'] +" Find the nearest dir containing a julia project +let s:__ale_julia_project_filenames = ['REQUIRE', 'Manifest.toml', 'Project.toml'] function! ale#julia#FindProjectRoot(buffer) abort for l:project_filename in s:__ale_julia_project_filenames diff --git a/doc/ale-julia.txt b/doc/ale-julia.txt index 3795c8ef..c65a4f52 100644 --- a/doc/ale-julia.txt +++ b/doc/ale-julia.txt @@ -1,14 +1,14 @@ =============================================================================== -ALE Julia Integration *ale-julia-options* +ALE Julia Integration *ale-julia-options* =============================================================================== -languageserver *ale-julia-languageserver* +languageserver *ale-julia-languageserver* To enable Julia LSP linter you need to install the LanguageServer.jl package within julia. -g:ale_julia_executable *g:ale_julia_executable* - *b:ale_julia_executable* +g:ale_julia_executable *g:ale_julia_executable* + *b:ale_julia_executable* Type: String Default: 'julia' diff --git a/doc/ale.txt b/doc/ale.txt index 2c018a10..931006b8 100644 --- a/doc/ale.txt +++ b/doc/ale.txt @@ -144,6 +144,8 @@ CONTENTS *ale-contents* jsonlint............................|ale-json-jsonlint| jq..................................|ale-json-jq| prettier............................|ale-json-prettier| + julia.................................|ale-julia-options| + languageserver......................|ale-julia-languageserver| kotlin................................|ale-kotlin-options| kotlinc.............................|ale-kotlin-kotlinc| ktlint..............................|ale-kotlin-ktlint| diff --git a/test/command_callback/test_julia_languageserver_callbacks.vader b/test/command_callback/test_julia_languageserver_callbacks.vader index 7f5edc40..5b377e46 100644 --- a/test/command_callback/test_julia_languageserver_callbacks.vader +++ b/test/command_callback/test_julia_languageserver_callbacks.vader @@ -5,12 +5,18 @@ After: call ale#assert#TearDownLinterTest() Execute(The default executable path should be correct): - AssertLinter 'julia', "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 ' . + \ ale#Escape('using LanguageServer; server = LanguageServer.LanguageServerInstance(STDIN, STDOUT, false); server.runlinter = true; run(server);') Execute(The executable should be configurable): let g:ale_julia_executable = 'julia-new' - 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);'" + AssertLinter 'julia-new', + \'julia-new' . + \' --startup-file=no --history-file=no -e ' . + \ ale#Escape('using LanguageServer; server = LanguageServer.LanguageServerInstance(STDIN, STDOUT, false); server.runlinter = true; run(server);') Execute(The project root should be detected correctly): AssertLSPProject ''