From 641511b8456f0f21c0c513a12f3a1113c7d30d17 Mon Sep 17 00:00:00 2001
From: Janis Hutz <development@janishutz.com>
Date: Thu, 15 May 2025 15:15:35 +0200
Subject: [PATCH] [Neotest] Clean up

---
 nvim/lua/plugins/testing/neotest.lua | 111 +++++++++++++--------------
 1 file changed, 54 insertions(+), 57 deletions(-)

diff --git a/nvim/lua/plugins/testing/neotest.lua b/nvim/lua/plugins/testing/neotest.lua
index e5907ea..b43f23e 100755
--- a/nvim/lua/plugins/testing/neotest.lua
+++ b/nvim/lua/plugins/testing/neotest.lua
@@ -1,70 +1,67 @@
--- plugins/neotest_config.lua
 return {
-	-- Load neotest
-	{
-		"nvim-neotest/neotest",
-		dependencies = {
-			-- For JavaScript, TypeScript (Vite)
-			"marilari88/neotest-vitest",
-			-- For Python
-			"nvim-neotest/neotest-python",
-			-- For C, C++, Rust
-			"orjangj/neotest-ctest",
-			"rouge8/neotest-rust",
-		},
-		config = function()
-			local neotest = require("neotest")
-			local keymap = vim.keymap.set
+    "nvim-neotest/neotest",
+    dependencies = {
+        -- For JavaScript, TypeScript (Vite)
+        "marilari88/neotest-vitest",
+        -- For Python
+        "nvim-neotest/neotest-python",
+        -- For C, C++, Rust
+        "orjangj/neotest-ctest",
+        "rouge8/neotest-rust",
+    },
+    config = function()
+        local neotest = require("neotest")
+        local keymap = vim.keymap.set
 
-			-- General setup for neotest
-			neotest.setup({
-				adapters = {
-					-- Vite Adapter for JavaScript/TypeScript
-					require("neotest-vitest"),
-					-- Python Adapter
-					require("neotest-python"),
-					-- C/C++ Adapter
-					require("neotest-ctest"),
-					-- Rust Adapter
-					require("neotest-rust"),
-				},
-			})
+        -- General setup for neotest
+        neotest.setup({
+            adapters = {
+                -- Vite Adapter for JavaScript/TypeScript
+                require("neotest-vitest"),
+                -- Python Adapter
+                require("neotest-python"),
+                -- C/C++ Adapter
+                require("neotest-ctest"),
+                -- Rust Adapter
+                require("neotest-rust"),
+                -- Java Adapter
+                -- require("neotest-java")
+            },
+        })
 
-			-- Keybinding Setup
-			local opts = { noremap = true, silent = true }
+        -- Keybinding Setup
+        local opts = { noremap = true, silent = true }
 
-			-- Run nearest test
-            opts.desc = "Run nearest test"
-			keymap("n", "<leader><leader>tr", '<cmd>lua require("neotest").run.run()<cr>', opts)
+        -- Run nearest test
+        opts.desc = "Run nearest test"
+        keymap("n", "<leader><leader>tr", '<cmd>lua require("neotest").run.run()<cr>', opts)
 
-			-- Run all tests in the current file
-            opts.desc = "Run all tests in current file"
-			keymap("n", "<leader><leader>tf", '<cmd>lua require("neotest").run.run(vim.fn.expand("%"))', opts)
+        -- Run all tests in the current file
+        opts.desc = "Run all tests in current file"
+        keymap("n", "<leader><leader>tf", '<cmd>lua require("neotest").run.run(vim.fn.expand("%"))<cr>', 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>lua require("neotest").run.stop()<cr>', opts)
 
-			-- Stop running tests
-            opts.desc = "Stop tests"
-			keymap("n", "<leader><leader>ts", "<cmd>Neotest stop<cr>", opts)
+        opts.desc = "Attach to nearest test"
+        keymap("n", "<leader><leader>ta", '<cmd>lua require("neotest").run.attach()<cr>', opts)
 
-            opts.desc = "Jump to next test"
-			keymap("n", "<leader><leader>tn", "<cmd>Neotest jump next<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)
+        opts.desc = "Jump to previous test"
+        keymap("n", "<leader><leader>tp", "<cmd>Neotest jump prev<cr>", opts)
 
-			-- Show test summary
-            opts.desc = "Show neotest test summary"
-			keymap("n", "<leader><leader>tv", "<cmd>Neotest summary<cr>", opts)
+        -- Show test summary
+        opts.desc = "Show neotest test summary"
+        keymap("n", "<leader><leader>tv", "<cmd>Neotest summary<cr>", opts)
 
-			-- Toggle the Neotest panel
-            opts.desc = "Show neotest output"
-			keymap("n", "<leader><leader>to", "<cmd>Neotest output<cr>", opts)
+        -- Toggle the Neotest panel
+        opts.desc = "Show neotest output"
+        keymap("n", "<leader><leader>to", "<cmd>Neotest output<cr>", opts)
 
-            opts.desc = "Show neotest output as panel"
-			keymap("n", "<leader><leader>tn", "<cmd>Neotest output-panel<cr>", opts)
-		end,
-	},
+        opts.desc = "Show neotest output as panel"
+        keymap("n", "<leader><leader>tn", "<cmd>Neotest output-panel<cr>", opts)
+    end,
 }