diff options
| author | Alessandro Pezzoni <alessandro.pezzoni@anaplan.com> | 2022-08-28 23:06:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-29 06:06:29 +0800 |
| commit | 5efc9c7aec80a20cef93ad21875eece678c72314 (patch) | |
| tree | 5340c5c0b2ce9370136d9c6c4b0e562607d6b1f6 /lua | |
| parent | fix: lspstop should close the client by given client (#2101) (diff) | |
| download | nvim-lspconfig-5efc9c7aec80a20cef93ad21875eece678c72314.tar nvim-lspconfig-5efc9c7aec80a20cef93ad21875eece678c72314.tar.gz nvim-lspconfig-5efc9c7aec80a20cef93ad21875eece678c72314.tar.bz2 nvim-lspconfig-5efc9c7aec80a20cef93ad21875eece678c72314.tar.lz nvim-lspconfig-5efc9c7aec80a20cef93ad21875eece678c72314.tar.xz nvim-lspconfig-5efc9c7aec80a20cef93ad21875eece678c72314.tar.zst nvim-lspconfig-5efc9c7aec80a20cef93ad21875eece678c72314.zip | |
fix(vdmj): update default path (#2102)
* fix(vdmj): use path from config to determine latest version
* fix(vdmj): update default path
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lspconfig/server_configurations/vdmj.lua | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lua/lspconfig/server_configurations/vdmj.lua b/lua/lspconfig/server_configurations/vdmj.lua index 9699b936..90dca2d8 100644 --- a/lua/lspconfig/server_configurations/vdmj.lua +++ b/lua/lspconfig/server_configurations/vdmj.lua @@ -1,6 +1,13 @@ local util = require 'lspconfig.util' -local mavenrepo = util.path.join(vim.env.HOME, '.m2', 'repository', 'com', 'fujitsu') +local function get_default_mavenrepo() + local repo = util.path.join(vim.env.HOME, '.m2', 'repository', 'dk', 'au', 'ece', 'vdmj') + if util.path.exists(repo) then + return repo + else + return util.path.join(vim.env.HOME, '.m2', 'repository', 'com', 'fujitsu') + end +end local function get_jar_path(config, package, version) return util.path.join(config.options.mavenrepo, package, version, package .. '-' .. version .. '.jar') @@ -44,8 +51,7 @@ return { java = vim.env.JAVA_HOME and util.path.join(vim.env.JAVA_HOME, 'bin', 'java') or 'java', java_opts = { '-Xmx3000m', '-Xss1m' }, annotation_paths = {}, - mavenrepo = mavenrepo, - version = get_latest_installed_version(mavenrepo), + mavenrepo = get_default_mavenrepo(), logfile = util.path.join(vim.fn.stdpath 'cache', 'vdm-lsp.log'), debugger_port = -1, high_precision = false, @@ -80,7 +86,7 @@ by neovim. java = '$JAVA_HOME/bin/java', java_opts = { '-Xmx3000m', '-Xss1m' }, annotation_paths = {}, - mavenrepo = '$HOME/.m2/repository/com/fujitsu', + mavenrepo = '$HOME/.m2/repository/dk/au/ece/vdmj', version = 'The latest version installed in `mavenrepo`', logfile = "path.join(vim.fn.stdpath 'cache', 'vdm-lsp.log')", debugger_port = -1, |