From ba94ffeb8cdf2d549b26a715a16539b3f79031e8 Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Mon, 1 Jun 2020 18:34:36 -0600 Subject: Fix julials configuration --- lua/nvim_lsp/julials.lua | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'lua') diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua index 947fdea1..b821c283 100644 --- a/lua/nvim_lsp/julials.lua +++ b/lua/nvim_lsp/julials.lua @@ -5,10 +5,18 @@ configs.julials = { default_config = { cmd = { "julia", "--project", "--startup-file=no", "--history-file=no", "-e", [[ - using LanguageServer; using Pkg; - server = LanguageServer.LanguageServerInstance(stdin, stdout, false, dirname(Pkg.Types.Context().env.project_file)); - server.runlinter = true; run(server); + Pkg.instantiate() + using LanguageServer; using SymbolServer; + depot_path = get(ENV, "JULIA_DEPOT_PATH", "") + project_path = dirname(Pkg.Types.Context().env.project_file) + # Make sure that we only load packages from this environment specifically. + empty!(LOAD_PATH) + push!(LOAD_PATH, "@") + @info "Running language server" env=Base.load_path()[1] pwd() project_path depot_path + server = LanguageServer.LanguageServerInstance(stdin, stdout, project_path, depot_path); + server.runlinter = true; + run(server); ]] }; filetypes = {'julia'}; @@ -22,7 +30,7 @@ configs.julials = { https://github.com/julia-vscode/julia-vscode `LanguageServer.jl` can be installed via `:LspInstall julials` or by yourself the `julia` and `Pkg`: ```sh -julia -e 'using Pkg; Pkg.add("LanguageServer")' +julia -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' ``` ]]; }; @@ -30,7 +38,7 @@ julia -e 'using Pkg; Pkg.add("LanguageServer")' configs.julials.install = function() local script = [[ - julia -e 'using Pkg; Pkg.add("LanguageServer")' + julia -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' ]] util.sh(script, vim.loop.os_homedir()) @@ -38,7 +46,7 @@ end configs.julials.install_info = function() local script = [[ - julia -e 'using LanguageServer' + julia -e 'using LanguageServer; using SymbolServer' ]] local status = pcall(vim.fn.system, script) -- cgit v1.2.3-70-g09d2 From 763afe406f00791870683226665144924c18759d Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Mon, 8 Jun 2020 00:30:08 -0600 Subject: Use Base.active_project() instead --- lua/nvim_lsp/julials.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua index b821c283..f202a7e0 100644 --- a/lua/nvim_lsp/julials.lua +++ b/lua/nvim_lsp/julials.lua @@ -1,6 +1,8 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' +print(vim.fn.expand(':p:h')) + configs.julials = { default_config = { cmd = { @@ -9,7 +11,7 @@ configs.julials = { Pkg.instantiate() using LanguageServer; using SymbolServer; depot_path = get(ENV, "JULIA_DEPOT_PATH", "") - project_path = dirname(Pkg.Types.Context().env.project_file) + project_path = Base.active_project() # Make sure that we only load packages from this environment specifically. empty!(LOAD_PATH) push!(LOAD_PATH, "@") -- cgit v1.2.3-70-g09d2 From 9bdfcaa06667f7fbcd0cbb47299be23dc7e255b7 Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Mon, 8 Jun 2020 00:50:14 -0600 Subject: Use current folder as Julia project --- lua/nvim_lsp/JuliaProject.toml | 10 ++++++++++ lua/nvim_lsp/julials.lua | 10 +++++----- 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 lua/nvim_lsp/JuliaProject.toml (limited to 'lua') diff --git a/lua/nvim_lsp/JuliaProject.toml b/lua/nvim_lsp/JuliaProject.toml new file mode 100644 index 00000000..300d526c --- /dev/null +++ b/lua/nvim_lsp/JuliaProject.toml @@ -0,0 +1,10 @@ +[deps] +CSTParser = "00ebfdb7-1f24-5e51-bd34-a7502290713f" +DocumentFormat = "ffa9a821-9c82-50df-894e-fbcef3ed31cd" +FilePathsBase = "48062228-2e41-5def-b9a4-89aafe57970f" +JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" +LanguageServer = "2b0e0bc5-e4fd-59b4-8912-456d1b03d8d7" +StaticLint = "b3cc710f-9c33-5bdb-a03d-a94903873e97" +SymbolServer = "cf896787-08d5-524d-9de7-132aaa0cb996" +Tokenize = "0796e94c-ce3b-5d07-9a54-7f471281c624" +URIParser = "30578b45-9adc-5946-b283-645ec420af67" diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua index f202a7e0..14569aa1 100644 --- a/lua/nvim_lsp/julials.lua +++ b/lua/nvim_lsp/julials.lua @@ -1,12 +1,12 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -print(vim.fn.expand(':p:h')) +current_directory = debug.getinfo(1).short_src:match("(.*[/\\])") configs.julials = { default_config = { cmd = { - "julia", "--project", "--startup-file=no", "--history-file=no", "-e", [[ + "julia", "--project=" .. current_directory, "--startup-file=no", "--history-file=no", "-e", [[ using Pkg; Pkg.instantiate() using LanguageServer; using SymbolServer; @@ -32,7 +32,7 @@ configs.julials = { https://github.com/julia-vscode/julia-vscode `LanguageServer.jl` can be installed via `:LspInstall julials` or by yourself the `julia` and `Pkg`: ```sh -julia -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' +julia --project=/path/to/nvim_lsp/lua/nvim_lsp -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' ``` ]]; }; @@ -40,7 +40,7 @@ julia -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' configs.julials.install = function() local script = [[ - julia -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' + julia --project=]] .. current_directory .. [[ -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' ]] util.sh(script, vim.loop.os_homedir()) @@ -48,7 +48,7 @@ end configs.julials.install_info = function() local script = [[ - julia -e 'using LanguageServer; using SymbolServer' + julia --project=]] .. current_directory .. [[ -e 'using LanguageServer; using SymbolServer' ]] local status = pcall(vim.fn.system, script) -- cgit v1.2.3-70-g09d2 From 1a6dab943c2e4639d689f71f21a62a856ef70b3c Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Mon, 8 Jun 2020 11:09:27 -0600 Subject: Remove need for JuliaProject.toml --- lua/nvim_lsp/JuliaProject.toml | 10 ---------- lua/nvim_lsp/julials.lua | 12 +++++++----- 2 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 lua/nvim_lsp/JuliaProject.toml (limited to 'lua') diff --git a/lua/nvim_lsp/JuliaProject.toml b/lua/nvim_lsp/JuliaProject.toml deleted file mode 100644 index 300d526c..00000000 --- a/lua/nvim_lsp/JuliaProject.toml +++ /dev/null @@ -1,10 +0,0 @@ -[deps] -CSTParser = "00ebfdb7-1f24-5e51-bd34-a7502290713f" -DocumentFormat = "ffa9a821-9c82-50df-894e-fbcef3ed31cd" -FilePathsBase = "48062228-2e41-5def-b9a4-89aafe57970f" -JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" -LanguageServer = "2b0e0bc5-e4fd-59b4-8912-456d1b03d8d7" -StaticLint = "b3cc710f-9c33-5bdb-a03d-a94903873e97" -SymbolServer = "cf896787-08d5-524d-9de7-132aaa0cb996" -Tokenize = "0796e94c-ce3b-5d07-9a54-7f471281c624" -URIParser = "30578b45-9adc-5946-b283-645ec420af67" diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua index 14569aa1..55ace9c0 100644 --- a/lua/nvim_lsp/julials.lua +++ b/lua/nvim_lsp/julials.lua @@ -1,12 +1,12 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -current_directory = debug.getinfo(1).short_src:match("(.*[/\\])") +environment_directory = util.path.join(util.base_install_dir, "julials") configs.julials = { default_config = { cmd = { - "julia", "--project=" .. current_directory, "--startup-file=no", "--history-file=no", "-e", [[ + "julia", "--project=" .. environment_directory, "--startup-file=no", "--history-file=no", "-e", [[ using Pkg; Pkg.instantiate() using LanguageServer; using SymbolServer; @@ -32,15 +32,17 @@ configs.julials = { https://github.com/julia-vscode/julia-vscode `LanguageServer.jl` can be installed via `:LspInstall julials` or by yourself the `julia` and `Pkg`: ```sh -julia --project=/path/to/nvim_lsp/lua/nvim_lsp -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' +julia --project=~/.cache/nvim/nvim_lsp/julials -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' ``` ]]; }; } configs.julials.install = function() + local script = [[ - julia --project=]] .. current_directory .. [[ -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' + julia -e 'mkdir(]] .. environment_directory .. [[)' + julia --project=]] .. environment_directory .. [[ -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' ]] util.sh(script, vim.loop.os_homedir()) @@ -48,7 +50,7 @@ end configs.julials.install_info = function() local script = [[ - julia --project=]] .. current_directory .. [[ -e 'using LanguageServer; using SymbolServer' + julia --project=]] .. environment_directory .. [[ -e 'using LanguageServer; using SymbolServer' ]] local status = pcall(vim.fn.system, script) -- cgit v1.2.3-70-g09d2 From 0b9357a517e35ec0bb6e39c6d18e0c76dd27b02f Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Mon, 8 Jun 2020 11:36:28 -0600 Subject: Fix typo --- lua/nvim_lsp/julials.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua index 55ace9c0..d50d5160 100644 --- a/lua/nvim_lsp/julials.lua +++ b/lua/nvim_lsp/julials.lua @@ -41,7 +41,7 @@ julia --project=~/.cache/nvim/nvim_lsp/julials -e 'using Pkg; Pkg.add("LanguageS configs.julials.install = function() local script = [[ - julia -e 'mkdir(]] .. environment_directory .. [[)' + julia -e 'mkdir("]] .. environment_directory .. [[")' julia --project=]] .. environment_directory .. [[ -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' ]] -- cgit v1.2.3-70-g09d2 From fe5a44c323626a796a41023664e6b597e6858f6c Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Mon, 8 Jun 2020 11:40:53 -0600 Subject: Fix docstring --- lua/nvim_lsp/julials.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua index d50d5160..6db0ee47 100644 --- a/lua/nvim_lsp/julials.lua +++ b/lua/nvim_lsp/julials.lua @@ -32,7 +32,7 @@ configs.julials = { https://github.com/julia-vscode/julia-vscode `LanguageServer.jl` can be installed via `:LspInstall julials` or by yourself the `julia` and `Pkg`: ```sh -julia --project=~/.cache/nvim/nvim_lsp/julials -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' +julia --project=]] .. environment_directory .. [[ -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' ``` ]]; }; -- cgit v1.2.3-70-g09d2 From 32a7135282e5a55cc061c96530a005723b787836 Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Mon, 8 Jun 2020 11:44:05 -0600 Subject: Remove unnecessary mkdir --- lua/nvim_lsp/julials.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'lua') diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua index 6db0ee47..bed493ed 100644 --- a/lua/nvim_lsp/julials.lua +++ b/lua/nvim_lsp/julials.lua @@ -41,7 +41,6 @@ julia --project=]] .. environment_directory .. [[ -e 'using Pkg; Pkg.add("Langua configs.julials.install = function() local script = [[ - julia -e 'mkdir("]] .. environment_directory .. [[")' julia --project=]] .. environment_directory .. [[ -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' ]] -- cgit v1.2.3-70-g09d2 From d5e6364676e1cca42f51e3ff2df2108bfc3c2249 Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Mon, 8 Jun 2020 12:29:50 -0600 Subject: Fix project_path --- lua/nvim_lsp/julials.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua index bed493ed..32923d03 100644 --- a/lua/nvim_lsp/julials.lua +++ b/lua/nvim_lsp/julials.lua @@ -11,7 +11,7 @@ configs.julials = { Pkg.instantiate() using LanguageServer; using SymbolServer; depot_path = get(ENV, "JULIA_DEPOT_PATH", "") - project_path = Base.active_project() + project_path = pwd() # Make sure that we only load packages from this environment specifically. empty!(LOAD_PATH) push!(LOAD_PATH, "@") -- cgit v1.2.3-70-g09d2 From cf6840b16388a5ec33958eeb5d6a40326773435f Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Mon, 8 Jun 2020 21:31:03 -0600 Subject: Fix docstring --- lua/nvim_lsp/julials.lua | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lua') diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua index 32923d03..1272bc5c 100644 --- a/lua/nvim_lsp/julials.lua +++ b/lua/nvim_lsp/julials.lua @@ -33,6 +33,10 @@ https://github.com/julia-vscode/julia-vscode `LanguageServer.jl` can be installed via `:LspInstall julials` or by yourself the `julia` and `Pkg`: ```sh julia --project=]] .. environment_directory .. [[ -e 'using Pkg; Pkg.add("LanguageServer"); Pkg.add("SymbolServer")' +``` +If you want to install the LanguageServer manually, you will have to ensure that the Julia environment is stored in this location: +```vim +:lua print(require'nvim_lsp'.util.path.join(require'nvim_lsp'.util.base_install_dir, "julials")) ``` ]]; }; -- cgit v1.2.3-70-g09d2