Skip to content

Commit 13cf060

Browse files
committed
use lombok from jdtls distribution
1 parent 5bfabd7 commit 13cf060

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

lua/java-core/ls/servers/jdtls/init.lua

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ function M.get_config(opts)
2626
-- pick the OS at runtime because mason.nvim does that for me at the
2727
-- installation
2828
local jdtls_root = mason.get_shared_path('jdtls')
29-
local lombok_root = mason.get_shared_path('lombok-nightly')
3029

3130
local jdtls_config = path.join(jdtls_root, 'config')
32-
local lombok_path = path.join(lombok_root, 'lombok.jar')
31+
local lombok_path = path.join(jdtls_root, 'lombok.jar')
3332
local equinox_launcher =
3433
path.join(jdtls_root, 'plugins', 'org.eclipse.equinox.launcher.jar')
3534
local plugin_paths = plugins.get_plugin_paths(opts.jdtls_plugins)
@@ -65,21 +64,6 @@ function M.get_config(opts)
6564
utils.get_workspace_path(),
6665
}
6766

68-
if opts.use_mason_jdk then
69-
local jdk = mason_reg.get_package('openjdk-17')
70-
71-
if jdk:is_installed() then
72-
local java_home =
73-
vim.fn.glob('$MASON/packages/jdk-17*')
74-
local java_bin = path.join(java_home, '/bin')
75-
76-
base_config.cmd_env = {
77-
['PATH'] = vim.fn.getenv('PATH') .. ':' .. java_bin,
78-
['JAVA_HOME'] = java_home,
79-
}
80-
end
81-
end
82-
8367
---@diagnostic disable-next-line: assign-type-mismatch
8468
base_config.root_dir = M.get_root_finder(opts.root_markers)
8569
base_config.init_options.bundles = plugin_paths

0 commit comments

Comments
 (0)