aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHirokazu Hata <h.hata.ai.t@gmail.com>2020-06-13 15:25:43 +0900
committerGitHub <noreply@github.com>2020-06-13 15:25:43 +0900
commit9ec118cdc7ce6442bf8beba903ab395b2f60190f (patch)
tree41014acee738399a85599c9258d676eee1d2edb9
parent[docgen] Update README.md (diff)
parent[docgen] Update README.md (diff)
downloadnvim-lspconfig-9ec118cdc7ce6442bf8beba903ab395b2f60190f.tar
nvim-lspconfig-9ec118cdc7ce6442bf8beba903ab395b2f60190f.tar.gz
nvim-lspconfig-9ec118cdc7ce6442bf8beba903ab395b2f60190f.tar.bz2
nvim-lspconfig-9ec118cdc7ce6442bf8beba903ab395b2f60190f.tar.lz
nvim-lspconfig-9ec118cdc7ce6442bf8beba903ab395b2f60190f.tar.xz
nvim-lspconfig-9ec118cdc7ce6442bf8beba903ab395b2f60190f.tar.zst
nvim-lspconfig-9ec118cdc7ce6442bf8beba903ab395b2f60190f.zip
Merge pull request #270 from kdheepak/kd/patch-julials
-rw-r--r--README.md2
-rw-r--r--lua/nvim_lsp/julials.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index ffb5b9cb..b35c90f0 100644
--- a/README.md
+++ b/README.md
@@ -2535,7 +2535,7 @@ require'nvim_lsp'.julials.setup{}
Commands:
Default Values:
- cmd = { "julia", "--project=/home/runner/.cache/nvim/nvim_lsp/julials", "--startup-file=no", "--history-file=no", "-e", ' using Pkg;\n Pkg.instantiate()\n using LanguageServer; using SymbolServer;\n depot_path = get(ENV, "JULIA_DEPOT_PATH", "")\n project_path = pwd()\n # Make sure that we only load packages from this environment specifically.\n empty!(LOAD_PATH)\n push!(LOAD_PATH, "@")\n @info "Running language server" env=Base.load_path()[1] pwd() project_path depot_path\n server = LanguageServer.LanguageServerInstance(stdin, stdout, project_path, depot_path);\n server.runlinter = true;\n run(server);\n ' }
+ cmd = { "julia", "--project=/home/runner/.cache/nvim/nvim_lsp/julials", "--startup-file=no", "--history-file=no", "-e", ' using Pkg;\n Pkg.instantiate()\n using LanguageServer; using SymbolServer;\n depot_path = get(ENV, "JULIA_DEPOT_PATH", "")\n project_path = dirname(something(Base.current_project(pwd()), Base.load_path_expand(LOAD_PATH[2])))\n # Make sure that we only load packages from this environment specifically.\n empty!(LOAD_PATH)\n push!(LOAD_PATH, "@")\n @info "Running language server" env=Base.load_path()[1] pwd() project_path depot_path\n server = LanguageServer.LanguageServerInstance(stdin, stdout, project_path, depot_path);\n server.runlinter = true;\n run(server);\n ' }
filetypes = { "julia" }
root_dir = <function 1>
```
diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua
index 973ae306..6c30e8bd 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 = pwd()
+ project_path = dirname(something(Base.current_project(pwd()), Base.load_path_expand(LOAD_PATH[2])))
# Make sure that we only load packages from this environment specifically.
empty!(LOAD_PATH)
push!(LOAD_PATH, "@")