diff --git a/init.lua b/init.lua index 88bfd335..4600e47b 100644 --- a/init.lua +++ b/init.lua @@ -668,14 +668,14 @@ local servers = { }, }, }, - cucumber_language_server = { - cucumber = { - -- features = { "**/lctest/**/*.feature" }, - -- glue = { - -- "**/lctest/**/stepdef/**/*.java", - -- } - } - }, + -- cucumber_language_server = { + -- cucumber = { + -- features = { "**/lctest/**/*.feature" }, + -- glue = { + -- "**/lctest/**/stepdef/**/*.java", + -- } + -- } + -- }, lua_ls = { Lua = { workspace = { checkThirdParty = false }, diff --git a/lua/custom/plugins/nvim-jdtls.lua b/lua/custom/plugins/nvim-jdtls.lua index 63e9f969..07a58036 100644 --- a/lua/custom/plugins/nvim-jdtls.lua +++ b/lua/custom/plugins/nvim-jdtls.lua @@ -23,13 +23,9 @@ return { local java_dbg_pkg = mason_registry.get_package("java-debug-adapter") local java_dbg_path = java_dbg_pkg:get_install_path() - local vscode_java_test_path = home .. "/.config/nvim/vscode-java-test" - local jar_patterns = { - java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar", - -- enable java test, and disable vscode_java_test when version of com.microsoft.java.test.plugin-*.jar is 0.40.0 or higher java_test_path .. "/extension/server/*.jar", - --vscode_java_test_path .. "/*.jar" + java_dbg_path .. "/extension/server/com.microsoft.java.debug.plugin-*.jar", } local bundles = {} @@ -76,33 +72,18 @@ return { profile = "Nykredit", }, }, - autobuild = { - enabled = true - }, maven = { downloadSources = true, }, rename = { enabled = true }, - import = { - maven = { - enabled = true, - }, - }, inlayHints = { parameterNames = { enabled = "all", -- literals, all, none }, }, - server = { - launchMode = "Hybrid" - }, configuration = { - updateBuildConfiguration = "automatic", - maven = { - userSettings = nil, - }, runtimes = { { name = "JavaSE-1.8", @@ -123,11 +104,6 @@ return { -- }, } }, - project = { - referencedLibraries = { - { home .. "/.sdkman/candidates/java/8/lib/tools.jar" } - } - } }, } diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua index ee539614..9dc59046 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/kickstart/plugins/debug.lua @@ -45,10 +45,11 @@ return { } -- Basic debugging keymaps, feel free to change to your liking! - vim.keymap.set('n', '', dap.continue, { desc = 'Debug: Start/Continue' }) vim.keymap.set('n', '', dap.step_into, { desc = 'Debug: Step Into' }) vim.keymap.set('n', '', dap.step_over, { desc = 'Debug: Step Over' }) vim.keymap.set('n', '', dap.step_out, { desc = 'Debug: Step Out' }) + vim.keymap.set('n', '', dap.continue, { desc = 'Debug: Start/Continue' }) + vim.keymap.set('n', '', dap.repl.toggle, { desc = 'Debug: Toggle Repl' }) vim.keymap.set('n', 'b', dap.toggle_breakpoint, { desc = 'Debug: Toggle Breakpoint' }) vim.keymap.set('n', 'B', function() dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ')