diff --git a/lazy-lock.json b/lazy-lock.json index 8d82e6a..692170f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -46,7 +46,7 @@ "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "06563ae0c9928a2df42aefe66f2aed2f2943e32e" }, "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, - "nvim-treesitter": { "branch": "master", "commit": "cf7baac35aa5c103b960bcb3f15c690a4aa5c6f1" }, + "nvim-treesitter": { "branch": "master", "commit": "c11d49cbefb3c22550747840843eb86ab4a3b267" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 72c1a94..673b95a 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -174,5 +174,5 @@ pcode.active_cpp_config = false pcode.active_java_config = { active = true, project = "gradle", -- gradle or maven - -- use_nvim_jdtls = false, -- mfussenegger/nvim-jdtls + use_nvim_jdtls = true, -- mfussenegger/nvim-jdtls } diff --git a/lua/plugins/java.lua b/lua/plugins/java.lua index fde5f9f..a42f7ec 100644 --- a/lua/plugins/java.lua +++ b/lua/plugins/java.lua @@ -17,164 +17,170 @@ end if pcode.active_java_config.active then M = { - -- { - -- "mfussenegger/nvim-jdtls", - -- ft = java_filetypes, - -- enable = pcode.active_java_config.use_nvim_jdtls or false, - -- opts = function() - -- return { - -- root_dir = require("jdtls.setup").find_root(root_markers), - -- project_name = function() - -- return vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") - -- end, - -- - -- -- Where are the config and workspace dirs for a project? - -- jdtls_config_dir = function(project_name) - -- return vim.fn.stdpath("cache") .. "/jdtls/" .. project_name .. "/config" - -- end, - -- jdtls_workspace_dir = function(project_name) - -- return vim.fn.stdpath("cache") .. "/jdtls/" .. project_name .. "/workspace" - -- end, - -- cmd = { vim.fn.exepath("jdtls") }, - -- full_cmd = function(opts) - -- local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") - -- local cmd = vim.deepcopy(opts.cmd) - -- if project_name then - -- vim.list_extend(cmd, { - -- "-configuration", - -- opts.jdtls_config_dir(project_name), - -- "-data", - -- opts.jdtls_workspace_dir(project_name), - -- }) - -- end - -- return cmd - -- end, - -- - -- -- These depend on nvim-dap, but can additionally be disabled by setting false here. - -- dap = { hotcodereplace = "auto", config_overrides = {} }, - -- dap_main = {}, - -- test = true, - -- settings = { - -- java = { - -- inlayHints = { - -- parameterNames = { - -- enabled = "all", - -- }, - -- }, - -- }, - -- }, - -- } - -- end, - -- config = function(_, opts) - -- local mason_registry = require("mason-registry") - -- local bundles = {} ---@type string[] - -- if opts.dap and mason_registry.is_installed("java-debug-adapter") then - -- local java_dbg_pkg = mason_registry.get_package("java-debug-adapter") - -- local java_dbg_path = java_dbg_pkg:get_install_path() - -- local jar_patterns = { - -- java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar", - -- } - -- -- java-test also depends on java-debug-adapter. - -- if opts.test and mason_registry.is_installed("java-test") then - -- local java_test_pkg = mason_registry.get_package("java-test") - -- local java_test_path = java_test_pkg:get_install_path() - -- vim.list_extend(jar_patterns, { - -- java_test_path .. "/extension/server/*.jar", - -- }) - -- end - -- for _, jar_pattern in ipairs(jar_patterns) do - -- for _, bundle in ipairs(vim.split(vim.fn.glob(jar_pattern), "\n")) do - -- table.insert(bundles, bundle) - -- end - -- end - -- end - -- - -- local function attach_jdtls() - -- local fname = vim.api.nvim_buf_get_name(0) - -- - -- -- Configuration can be augmented and overridden by opts.jdtls - -- local config = extend_or_override({ - -- cmd = opts.full_cmd(opts), - -- root_dir = require("jdtls.setup").find_root(root_markers), - -- init_options = { - -- bundles = bundles, - -- }, - -- settings = opts.settings, - -- -- enable CMP capabilities - -- capabilities = require("user.lsp.handlers").capabilities or nil, - -- }, opts.jdtls) - -- - -- -- Existing server will be reused if the root_dir matches. - -- require("jdtls").start_or_attach(config) - -- -- not need to require("jdtls.setup").add_commands(), start automatically adds commands - -- end - -- - -- vim.api.nvim_create_autocmd("FileType", { - -- pattern = java_filetypes, - -- callback = attach_jdtls, - -- }) - -- - -- -- Setup keymap and dap after the lsp is fully attached. - -- -- https://github.com/mfussenegger/nvim-jdtls#nvim-dap-configuration - -- -- https://neovim.io/doc/user/lsp.html#LspAttach - -- vim.api.nvim_create_autocmd("LspAttach", { - -- callback = function(args) - -- local client = vim.lsp.get_client_by_id(args.data.client_id) - -- if client and client.name == "jdtls" then - -- local wk = require("which-key") - -- wk.register({ - -- ["cx"] = { name = "+extract" }, - -- ["cxv"] = { require("jdtls").extract_variable_all, "Extract Variable" }, - -- ["cxc"] = { require("jdtls").extract_constant, "Extract Constant" }, - -- ["gs"] = { require("jdtls").super_implementation, "Goto Super" }, - -- ["co"] = { require("jdtls").organize_imports, "Organize Imports" }, - -- }, { mode = "n", buffer = args.buf }) - -- wk.register({ - -- ["c"] = { name = "+code" }, - -- ["cx"] = { name = "+extract" }, - -- ["cxm"] = { - -- [[lua require('jdtls').extract_method(true)]], - -- "Extract Method", - -- }, - -- ["cxv"] = { - -- [[lua require('jdtls').extract_variable_all(true)]], - -- "Extract Variable", - -- }, - -- ["cxc"] = { - -- [[lua require('jdtls').extract_constant(true)]], - -- "Extract Constant", - -- }, - -- }, { mode = "v", buffer = args.buf }) - -- - -- if opts.dap and mason_registry.is_installed("java-debug-adapter") then - -- -- custom init for Java debugger - -- require("jdtls").setup_dap(opts.dap) - -- require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main) - -- - -- -- Java Test require Java debugger to work - -- if opts.test and mason_registry.is_installed("java-test") then - -- -- custom keymaps for Java test runner (not yet compatible with neotest) - -- wk.register({ - -- ["t"] = { name = "+test" }, - -- ["tt"] = { require("jdtls.dap").test_class, "Run All Test" }, - -- ["tr"] = { require("jdtls.dap").test_nearest_method, "Run Nearest Test" }, - -- ["tT"] = { require("jdtls.dap").pick_test, "Run Test" }, - -- }, { mode = "n", buffer = args.buf }) - -- end - -- end - -- - -- -- User can set additional keymaps in opts.on_attach - -- if opts.on_attach then - -- opts.on_attach(args) - -- end - -- end - -- end, - -- }) - -- - -- -- Avoid race condition by calling attach the first time, since the autocmd won't fire. - -- attach_jdtls() - -- end, - -- }, + { + "mfussenegger/nvim-jdtls", + ft = java_filetypes, + enabled = pcode.active_java_config.use_nvim_jdtls or false, + opts = function() + return { + root_dir = require("jdtls.setup").find_root(root_markers), + project_name = function() + return vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") + end, + + -- Where are the config and workspace dirs for a project? + jdtls_config_dir = function(project_name) + return vim.fn.stdpath("cache") .. "/jdtls/" .. project_name .. "/config" + end, + jdtls_workspace_dir = function(project_name) + return vim.fn.stdpath("cache") .. "/jdtls/" .. project_name .. "/workspace" + end, + cmd = { vim.fn.exepath("jdtls") }, + full_cmd = function(opts) + local project_name = vim.fn.fnamemodify(vim.fn.getcwd(), ":p:h:t") + local cmd = vim.deepcopy(opts.cmd) + if project_name then + vim.list_extend(cmd, { + "-configuration", + opts.jdtls_config_dir(project_name), + "-data", + opts.jdtls_workspace_dir(project_name), + }) + end + return cmd + end, + + -- These depend on nvim-dap, but can additionally be disabled by setting false here. + dap = { hotcodereplace = "auto", config_overrides = {} }, + dap_main = {}, + test = true, + settings = { + java = { + inlayHints = { + parameterNames = { + enabled = "all", + }, + }, + }, + }, + } + end, + config = function(_, opts) + vim.opt_local.shiftwidth = 4 + vim.opt_local.tabstop = 4 + vim.opt_local.softtabstop = 4 + vim.opt_local.ts = 4 + vim.opt_local.expandtab = true + + local mason_registry = require("mason-registry") + local bundles = {} ---@type string[] + if opts.dap and mason_registry.is_installed("java-debug-adapter") then + local java_dbg_pkg = mason_registry.get_package("java-debug-adapter") + local java_dbg_path = java_dbg_pkg:get_install_path() + local jar_patterns = { + java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar", + } + -- java-test also depends on java-debug-adapter. + if opts.test and mason_registry.is_installed("java-test") then + local java_test_pkg = mason_registry.get_package("java-test") + local java_test_path = java_test_pkg:get_install_path() + vim.list_extend(jar_patterns, { + java_test_path .. "/extension/server/*.jar", + }) + end + for _, jar_pattern in ipairs(jar_patterns) do + for _, bundle in ipairs(vim.split(vim.fn.glob(jar_pattern), "\n")) do + table.insert(bundles, bundle) + end + end + end + + local function attach_jdtls() + local fname = vim.api.nvim_buf_get_name(0) + + -- Configuration can be augmented and overridden by opts.jdtls + local config = extend_or_override({ + cmd = opts.full_cmd(opts), + root_dir = require("jdtls.setup").find_root(root_markers), + init_options = { + bundles = bundles, + }, + settings = opts.settings, + -- enable CMP capabilities + capabilities = require("user.lsp.handlers").capabilities or nil, + }, opts.jdtls) + + -- Existing server will be reused if the root_dir matches. + require("jdtls").start_or_attach(config) + -- not need to require("jdtls.setup").add_commands(), start automatically adds commands + end + + vim.api.nvim_create_autocmd("FileType", { + pattern = java_filetypes, + callback = attach_jdtls, + }) + + -- Setup keymap and dap after the lsp is fully attached. + -- https://github.com/mfussenegger/nvim-jdtls#nvim-dap-configuration + -- https://neovim.io/doc/user/lsp.html#LspAttach + vim.api.nvim_create_autocmd("LspAttach", { + callback = function(args) + local client = vim.lsp.get_client_by_id(args.data.client_id) + if client and client.name == "jdtls" then + local wk = require("which-key") + wk.register({ + ["cx"] = { name = "+extract" }, + ["cxv"] = { require("jdtls").extract_variable_all, "Extract Variable" }, + ["cxc"] = { require("jdtls").extract_constant, "Extract Constant" }, + ["gs"] = { require("jdtls").super_implementation, "Goto Super" }, + ["co"] = { require("jdtls").organize_imports, "Organize Imports" }, + }, { mode = "n", buffer = args.buf }) + wk.register({ + ["c"] = { name = "+code" }, + ["cx"] = { name = "+extract" }, + ["cxm"] = { + [[lua require('jdtls').extract_method(true)]], + "Extract Method", + }, + ["cxv"] = { + [[lua require('jdtls').extract_variable_all(true)]], + "Extract Variable", + }, + ["cxc"] = { + [[lua require('jdtls').extract_constant(true)]], + "Extract Constant", + }, + }, { mode = "v", buffer = args.buf }) + + if opts.dap and mason_registry.is_installed("java-debug-adapter") then + -- custom init for Java debugger + require("jdtls").setup_dap(opts.dap) + require("jdtls.dap").setup_dap_main_class_configs(opts.dap_main) + + -- Java Test require Java debugger to work + if opts.test and mason_registry.is_installed("java-test") then + -- custom keymaps for Java test runner (not yet compatible with neotest) + wk.register({ + ["t"] = { name = "+test" }, + ["tt"] = { require("jdtls.dap").test_class, "Run All Test" }, + ["tr"] = { require("jdtls.dap").test_nearest_method, "Run Nearest Test" }, + ["tT"] = { require("jdtls.dap").pick_test, "Run Test" }, + }, { mode = "n", buffer = args.buf }) + end + end + + -- User can set additional keymaps in opts.on_attach + if opts.on_attach then + opts.on_attach(args) + end + end + end, + }) + + -- Avoid race condition by calling attach the first time, since the autocmd won't fire. + attach_jdtls() + end, + }, { "nvim-treesitter/nvim-treesitter", opts = function(_, opts) @@ -193,8 +199,9 @@ if pcode.active_java_config.active then "stevearc/conform.nvim", event = "VeryLazy", opts = function(_, opts) - local package = "google-java-format" - require("user.utils.mason").try_install(package) + local package = "lsp_fmt" + require("user.utils.mason").try_install("java-debug-adapter") + require("user.utils.mason").try_install("java-test") opts.formatters_by_ft.java = { package } end, }, @@ -243,21 +250,4 @@ if pcode.active_java_config.active then } end --- if pcode.active_java_config.use_nvim_jdtls then --- table.insert(M, { --- "neovim/nvim-lspconfig", --- enabled = pcode.active_java_config.use_nvim_jdtls or false, --- opts = { --- -- make sure mason installs the server --- servers = { --- jdtls = {}, --- }, --- setup = { --- jdtls = function() --- return true -- avoid duplicate servers --- end, --- }, --- }, --- }) --- end return M diff --git a/lua/plugins/themes/_globalvar.lua b/lua/plugins/themes/_globalvar.lua index c5bed85..710b1a0 100644 --- a/lua/plugins/themes/_globalvar.lua +++ b/lua/plugins/themes/_globalvar.lua @@ -110,11 +110,11 @@ if pcode.active_cpp_config then pcode.nvim_dap = true end -- run if java config true --- if pcode.active_java_config.active then --- table.insert(pcode.treesitter_ensure_installed, "java") --- table.insert(pcode.mason_ensure_installed, "jdtls") --- table.insert(pcode.null_ls_ensure_installed, "google_java_format") --- table.insert(pcode.dap_ensure_installed, "javadbg") --- table.insert(pcode.unregister_lsp, "jdtls") --- end +if pcode.active_java_config.active and pcode.active_java_config.use_nvim_jdtls then + -- table.insert(pcode.treesitter_ensure_installed, "java") + -- table.insert(pcode.mason_ensure_installed, "jdtls") + -- table.insert(pcode.null_ls_ensure_installed, "google_java_format") + -- table.insert(pcode.dap_ensure_installed, "javadbg") + table.insert(pcode.unregister_lsp, "jdtls") +end return {}