diff --git a/ftplugin/java.lua b/ftplugin/java.lua index ae78c26..9e8fa02 100644 --- a/ftplugin/java.lua +++ b/ftplugin/java.lua @@ -70,7 +70,10 @@ vim.list_extend(bundles, vim.split(vim.fn.glob(mason_path .. "packages/java-test vim.list_extend( bundles, vim.split( - vim.fn.glob(mason_path .. "packages/java-debug-adapter/extension/server/com.microsoft.java.debug.plugin-*.jar"), + vim.fn.glob( + vim.fn.stdpath("data") + .. "/lazy/java-debug/com.microsoft.java.debug.plugin/target/com.microsoft.java.debug.plugin-*.jar" + ), "\n" ) ) diff --git a/lazy-lock.json b/lazy-lock.json index 0a9a4a4..4b857c5 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -18,6 +18,7 @@ "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, "gitsigns.nvim": { "branch": "main", "commit": "0b04035bb7b3c83e999b9676e2fb46fd0aa9f910" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, + "java-debug": { "branch": "main", "commit": "37d4e66c5717179b1487ff72fcbc8622b31a3648" }, "lazy.nvim": { "branch": "main", "commit": "4ea9fe060042f345960ad0c01aa7bca91405e10a" }, "lsp-progress.nvim": { "branch": "main", "commit": "55a04895ea20c365b670051a3128265d43bdfa3d" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, @@ -47,7 +48,7 @@ "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-scrollview": { "branch": "main", "commit": "fd334e5ad0c616987d1b9114890a59c97165cf83" }, "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, - "nvim-treesitter": { "branch": "master", "commit": "122b4d3db1616c1f1305b847c5ed2217c4c329f1" }, + "nvim-treesitter": { "branch": "master", "commit": "55d5772a6c514bd19cd4587352799b0783798c04" }, "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/plugins/java.lua b/lua/plugins/java.lua index 17e2a78..2f5faf2 100644 --- a/lua/plugins/java.lua +++ b/lua/plugins/java.lua @@ -1,4 +1,9 @@ local M = {} + +local str_buld = "./mvnw clean install" +if vim.fn.has("win32") then + str_buld = "mvnw.cmd clean install" +end if pcode.active_java_config.active then M = { { @@ -46,62 +51,68 @@ if pcode.active_java_config.active then { "TS", function() require("neotest").run.stop() end, desc = "Stop" }, }, }, - -- { - -- "mfussenegger/nvim-dap", - -- event = "BufReadPre", - -- dependencies = { - -- "rcarriga/nvim-dap-ui", - -- "theHamsta/nvim-dap-virtual-text", - -- "nvim-neotest/nvim-nio", - -- "williamboman/mason.nvim", - -- "jay-babu/mason-nvim-dap.nvim", - -- }, - -- config = function() - -- require("user.dapui") - -- local dap = require("dap") - -- local util = require("jdtls.util") - -- dap.adapters.java = function(callback) - -- util.execute_command({ command = "vscode.java.startDebugSession" }, function(err0, port) - -- if err0 ~= nil then - -- return - -- end - -- callback({ type = "server", host = "127.0.0.1", port = port }) - -- end) - -- end - -- dap.configurations.java = { - -- { - -- type = "java", - -- request = "launch", - -- name = "Debug Java", - -- program = "${file}", - -- args = {}, - -- cwd = vim.fn.getcwd(), - -- stopOnEntry = false, - -- console = "integratedTerminal", - -- internalConsoleOptions = "neverOpen", - -- sourceMaps = true, - -- outDir = "${workspaceFolder}/out", - -- }, - -- } - -- end, - -- keys = { - -- { "d", "", desc = "  Debug" }, - -- { "dt", "lua require'dap'.toggle_breakpoint()", desc = "Toggle Breakpoint" }, - -- { "db", "lua require'dap'.step_back()", desc = "Step Back" }, - -- { "dc", "lua require'dap'.continue()", desc = "Continue" }, - -- { "dC", "lua require'dap'.run_to_cursor()", desc = "Run To Cursor" }, - -- { "dd", "lua require'dap'.disconnect()", desc = "Disconnect" }, - -- { "dg", "lua require'dap'.session()", desc = "Get Session" }, - -- { "di", "lua require'dap'.step_into()", desc = "Step Into" }, - -- { "do", "lua require'dap'.step_over()", desc = "Step Over" }, - -- { "du", "lua require'dap'.step_out()", desc = "Step Out" }, - -- { "dp", "lua require'dap'.pause()", desc = "Pause" }, - -- { "dr", "lua require'dap'.repl.toggle()", desc = "Toggle Repl" }, - -- { "ds", "lua require'dap'.continue()", desc = "Start" }, - -- { "dq", "lua require'dap'.close()", desc = "Quit" }, - -- { "dU", "lua require'dapui'.toggle({reset = true})", desc = "Toggle UI" }, - -- }, - -- }, + { + "mfussenegger/nvim-dap", + event = "BufReadPre", + dependencies = { + "rcarriga/nvim-dap-ui", + "theHamsta/nvim-dap-virtual-text", + "nvim-neotest/nvim-nio", + "williamboman/mason.nvim", + "jay-babu/mason-nvim-dap.nvim", + { + "https://github.com/microsoft/java-debug", + version = "0.x", + build = str_buld, + config = function() end, + }, + }, + config = function() + require("user.dapui") + local dap = require("dap") + local util = require("jdtls.util") + dap.adapters.java = function(callback) + util.execute_command({ command = "vscode.java.startDebugSession" }, function(err0, port) + if err0 ~= nil then + return + end + callback({ type = "server", host = "127.0.0.1", port = port }) + end) + end + dap.configurations.java = { + { + type = "java", + request = "launch", + name = "Debug Java", + program = "${file}", + args = {}, + cwd = vim.fn.getcwd(), + stopOnEntry = false, + console = "integratedTerminal", + internalConsoleOptions = "neverOpen", + sourceMaps = true, + outDir = "${workspaceFolder}/out", + }, + } + end, + keys = { + { "d", "", desc = "  Debug" }, + { "dt", "lua require'dap'.toggle_breakpoint()", desc = "Toggle Breakpoint" }, + { "db", "lua require'dap'.step_back()", desc = "Step Back" }, + { "dc", "lua require'dap'.continue()", desc = "Continue" }, + { "dC", "lua require'dap'.run_to_cursor()", desc = "Run To Cursor" }, + { "dd", "lua require'dap'.disconnect()", desc = "Disconnect" }, + { "dg", "lua require'dap'.session()", desc = "Get Session" }, + { "di", "lua require'dap'.step_into()", desc = "Step Into" }, + { "do", "lua require'dap'.step_over()", desc = "Step Over" }, + { "du", "lua require'dap'.step_out()", desc = "Step Out" }, + { "dp", "lua require'dap'.pause()", desc = "Pause" }, + { "dr", "lua require'dap'.repl.toggle()", desc = "Toggle Repl" }, + { "ds", "lua require'dap'.continue()", desc = "Start" }, + { "dq", "lua require'dap'.close()", desc = "Quit" }, + { "dU", "lua require'dapui'.toggle({reset = true})", desc = "Toggle UI" }, + }, + }, } end return M