aboutsummaryrefslogtreecommitdiffstats
path: root/lua/nvim-lsp-installer
diff options
context:
space:
mode:
authorWilliam Boman <william@redwill.se>2022-06-09 14:35:06 +0200
committerGitHub <noreply@github.com>2022-06-09 14:35:06 +0200
commitdc67c5feda1043cbfacd9bed8ffd9ac29de49075 (patch)
treec8e218ff7fa266365a34a4aced72f6e5988b13d9 /lua/nvim-lsp-installer
parentfeat: add svlangserver (#762) (diff)
downloadmason-dc67c5feda1043cbfacd9bed8ffd9ac29de49075.tar
mason-dc67c5feda1043cbfacd9bed8ffd9ac29de49075.tar.gz
mason-dc67c5feda1043cbfacd9bed8ffd9ac29de49075.tar.bz2
mason-dc67c5feda1043cbfacd9bed8ffd9ac29de49075.tar.lz
mason-dc67c5feda1043cbfacd9bed8ffd9ac29de49075.tar.xz
mason-dc67c5feda1043cbfacd9bed8ffd9ac29de49075.tar.zst
mason-dc67c5feda1043cbfacd9bed8ffd9ac29de49075.zip
feat(health): use stderr for java version, also check for JAVA_HOME (#765)
Diffstat (limited to 'lua/nvim-lsp-installer')
-rw-r--r--lua/nvim-lsp-installer/health/init.lua12
1 files changed, 11 insertions, 1 deletions
diff --git a/lua/nvim-lsp-installer/health/init.lua b/lua/nvim-lsp-installer/health/init.lua
index ff74f7a7..909c91cb 100644
--- a/lua/nvim-lsp-installer/health/init.lua
+++ b/lua/nvim-lsp-installer/health/init.lua
@@ -205,7 +205,17 @@ function M.check()
check { cmd = "python3", args = { "--version" }, name = "python3", relaxed = true },
check { cmd = "python3", args = { "-m", "pip", "--version" }, name = "pip3", relaxed = true },
check { cmd = "javac", args = { "-version" }, name = "javac", relaxed = true },
- check { cmd = "java", args = { "-version" }, name = "java", relaxed = true },
+ check { cmd = "java", args = { "-version" }, name = "java", use_stderr = true, relaxed = true },
+ when(
+ vim.env.JAVA_HOME,
+ check {
+ cmd = ("%s/bin/java"):format(vim.env.JAVA_HOME),
+ args = { "-version" },
+ name = "JAVA_HOME",
+ use_stderr = true,
+ relaxed = true,
+ }
+ ),
check { cmd = "julia", args = { "--version" }, name = "julia", relaxed = true },
check { cmd = "wget", args = { "--version" }, name = "wget" },
-- wget is used interchangeably with curl, but with higher priority, so we mark curl as relaxed