From aac1f22b1de3874dea1b42aa103fc15f6bba9bd3 Mon Sep 17 00:00:00 2001
From: Janis Hutz <info@janishutz.com>
Date: Fri, 21 Feb 2025 13:20:03 +0100
Subject: [PATCH] Finish up testing prep

---
 nvim/lua/plugins/lspconfig.lua | 59 ++++++++++++++++++++++------------
 nvim/lua/plugins/neotest.lua   | 33 ++++++++++---------
 2 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua
index 64bc0e2..32cb0c5 100755
--- a/nvim/lua/plugins/lspconfig.lua
+++ b/nvim/lua/plugins/lspconfig.lua
@@ -5,9 +5,11 @@ return {
     dependencies = {
         "hrsh7th/cmp-nvim-lsp",
         { "antosha417/nvim-lsp-file-operations", config = true },
-        "mfussenegger/nvim-jdtls",
+        -- "mfussenegger/nvim-jdtls",
+        "nvim-java/nvim-java"
     },
     config = function()
+        require('java').setup()
         -- import lspconfig plugin
         local lspconfig = require("lspconfig")
 
@@ -64,6 +66,41 @@ return {
             opts.desc = "Restart LSP"
             keymap.set("n", "<leader>rs", ":LspRestart<CR>", opts)
 
+            -- Keybinds for testing, refactoring, java specific
+            opts.desc = "Java profiling"
+            keymap.set("n", "<leader>jp", ":JavaProfile<CR>", opts)
+
+            opts.desc = "Java Refactor: Extract Variable (create variable from cursor)"
+            keymap.set("n", "<leader>jev", ":JavaExtractVariable<CR>", opts)
+
+            opts.desc = "Java Refactor: Extract Variable all occurrences (create variable from cursor)"
+            keymap.set("n", "<leader>jea", ":JavaExtractVariableAllOccurrence<CR>", opts)
+
+            opts.desc = "Java Refactor: Extract Const (create const from cursor)"
+            keymap.set("n", "<leader>jec", ":JavaExtractConst<CR>", opts)
+
+            opts.desc = "Java Refactor: Extract Method (create method from cursor)"
+            keymap.set("n", "<leader>jev", ":JavaExtractMethod<CR>", opts)
+
+            opts.desc = "Java Refactor: Extract Field (create field from cursor)"
+            keymap.set("n", "<leader>jev", ":JavaExtractField<CR>", opts)
+
+            -- Java testing, Debugging
+            opts.desc = "Java Testing: Run test class in buffer"
+            keymap.set("n", "<leader>jtc", ":JavaTestRunCurrentClass<CR>", opts)
+
+            opts.desc = "Java Testing: Debug test class in buffer"
+            keymap.set("n", "<leader>jdc", ":JavaTestDebugCurrentClass<CR>", opts)
+
+            opts.desc = "Java Testing: Run current method in buffer"
+            keymap.set("n", "<leader>jtm", ":JavaTestRunCurrentMethod<CR>", opts)
+
+            opts.desc = "Java Testing: Debug current method in buffer"
+            keymap.set("n", "<leader>jdm", ":JavaTestDebugCurrentMethod<CR>", opts)
+
+            opts.desc = "Java Testing: View last report"
+            keymap.set("n", "<leader>jtv", ":JavaTestViewLastReport<CR>", opts)
+
             vim.opt.signcolumn = "yes" -- reserve space for diagnostics
         end
 
@@ -130,26 +167,6 @@ return {
             on_attach = on_attach,
         })
 
-        -- lspconfig.ts_ls.setup({
-        --     capabilities = capabilities,
-        --     on_attach = on_attach,
-        -- })
-
-        -- local mason_registry = require('mason-registry')
-        -- local vue_language_server_path = mason_registry.get_package('vue-language-server'):get_install_path() .. '/node_modules/@vue/language-server'
-        --
-        -- lspconfig.volar.setup({
-        --     capabilities = capabilities,
-        --     on_attach = on_attach,
-        --     -- cmd = { "vue-language-server", "--stdio" },
-        --     filetypes = { "vue" },
-        --     -- settings = {
-        --     --     typescript = {
-        --     --         tsdk = '/usr/lib/node_modules/typescript/lib'
-        --     --     }
-        --     -- }
-        -- })
-
         lspconfig.jdtls.setup({
             capabilities = capabilities,
             on_attach = on_attach,
diff --git a/nvim/lua/plugins/neotest.lua b/nvim/lua/plugins/neotest.lua
index dd40ef5..8724978 100755
--- a/nvim/lua/plugins/neotest.lua
+++ b/nvim/lua/plugins/neotest.lua
@@ -11,8 +11,6 @@ return {
 			-- For C, C++, Rust
 			"orjangj/neotest-ctest",
 			"rouge8/neotest-rust",
-            --For Java
-            "rcasia/neotest-java"
 		},
 		config = function()
 			local neotest = require("neotest")
@@ -29,41 +27,44 @@ return {
 					require("neotest-ctest"),
 					-- Rust Adapter
 					require("neotest-rust"),
-                    -- Java Adapter
-                    require("neotest-java"),
 				},
 			})
 
 			-- Keybinding Setup
 			local opts = { noremap = true, silent = true }
 
-			-- Base Keybind for testing, starting with <leader><leader>t
-			keymap("n", "<leader><leader>t", "<cmd>Neotest<cr>", opts) -- Open neotest panel
-
 			-- Run nearest test
-			keymap("n", "<leader><leader>tn", "<cmd>Neotest run nearest<cr>", opts)
+            opts.desc = "Run nearest test"
+			keymap("n", "<leader><leader>tr", require("neotest").run.run(), opts)
 
 			-- Run all tests in the current file
-			keymap("n", "<leader><leader>tf", "<cmd>Neotest run file<cr>", opts)
+            opts.desc = "Run all tests in current file"
+			keymap("n", "<leader><leader>tf", require("neotest").run.run(vim.fn.expand("%")), opts)
 
 			-- Run all tests in the entire project
+            opts.desc = "Run all tests in project"
 			keymap("n", "<leader><leader>ta", "<cmd>Neotest run<cr>", opts)
 
 			-- Stop running tests
+            opts.desc = "Stop tests"
 			keymap("n", "<leader><leader>ts", "<cmd>Neotest stop<cr>", opts)
 
-			-- Jump to next test failure
-			keymap("n", "<leader><leader>tj", "<cmd>Neotest jump to failure<cr>", opts)
+            opts.desc = "Jump to next test"
+			keymap("n", "<leader><leader>tn", "<cmd>Neotest jump next<cr>", opts)
+
+            opts.desc = "Jump to previous test"
+			keymap("n", "<leader><leader>tp", "<cmd>Neotest jump prev<cr>", opts)
 
 			-- Show test summary
-			keymap("n", "<leader><leader>tsm", "<cmd>Neotest summary<cr>", opts)
+            opts.desc = "Show neotest test summary"
+			keymap("n", "<leader><leader>tv", "<cmd>Neotest summary<cr>", opts)
 
 			-- Toggle the Neotest panel
-			keymap("n", "<leader><leader>tt", "<cmd>Neotest toggle panel<cr>", opts)
+            opts.desc = "Show neotest output"
+			keymap("n", "<leader><leader>to", "<cmd>Neotest output<cr>", opts)
 
-			-- Additional useful keybindings
-			keymap("n", "<leader><leader>tp", "<cmd>Neotest prev<cr>", opts) -- Jump to previous test failure
-			keymap("n", "<leader><leader>tnx", "<cmd>Neotest run ext<cr>", opts) -- Run test using external runner (useful for custom test setups)
+            opts.desc = "Show neotest output as panel"
+			keymap("n", "<leader><leader>tn", "<cmd>Neotest output-panel<cr>", opts)
 		end,
 	},
 }