From f6e9d1066cd40f42006f38b6d9f82471a22dcb3e Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Tue, 15 Mar 2022 00:06:33 +0100
Subject: [PATCH] Adding a test runner

---
 nvim/nvim/config/new/init.lua                 |  1 +
 nvim/nvim/config/new/lua/plugins.lua          |  4 +++
 nvim/nvim/config/new/lua/tests.lua            | 30 +++++++++++++++++++
 .../config/new/lua/windows/colorcolumn.lua    |  2 +-
 .../nvim/config/new/lua/windows/which-key.lua |  1 -
 5 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 nvim/nvim/config/new/lua/tests.lua

diff --git a/nvim/nvim/config/new/init.lua b/nvim/nvim/config/new/init.lua
index 659f46e..dc70bf7 100644
--- a/nvim/nvim/config/new/init.lua
+++ b/nvim/nvim/config/new/init.lua
@@ -8,4 +8,5 @@ require "lsp"
 require "treesitter"
 require "utils"
 require "dap-config"
+require "tests"
 
diff --git a/nvim/nvim/config/new/lua/plugins.lua b/nvim/nvim/config/new/lua/plugins.lua
index 67c889f..cd9a149 100644
--- a/nvim/nvim/config/new/lua/plugins.lua
+++ b/nvim/nvim/config/new/lua/plugins.lua
@@ -95,10 +95,14 @@ return packer.startup(function(use)
 	use "numToStr/Comment.nvim"
 	use "JoosepAlviste/nvim-ts-context-commentstring"
 
+
 	use "mfussenegger/nvim-dap"
 	use { "theHamsta/nvim-dap-virtual-text", requires = { "nvim-treesitter/nvim-treesitter" }, config = function() require("nvim-dap-virtual-text").setup() end }
 
 
+	use { "rcarriga/vim-ultest", requires = {"vim-test/vim-test"}, run = ":UpdateRemotePlugins" }
+
+
 	use { "lukas-reineke/virt-column.nvim", config = function() require("virt-column").setup() end }
 	use "lukas-reineke/indent-blankline.nvim"
 	use "petertriho/nvim-scrollbar"
diff --git a/nvim/nvim/config/new/lua/tests.lua b/nvim/nvim/config/new/lua/tests.lua
new file mode 100644
index 0000000..893df95
--- /dev/null
+++ b/nvim/nvim/config/new/lua/tests.lua
@@ -0,0 +1,30 @@
+vim.g["test#csharp#runner"] = 'dotnettest'
+
+vim.g["ultest_pass_sign"] = ""
+vim.g["ultest_fail_sign"] = ""
+vim.g["ultest_running_sign"] = ""
+vim.g["ultest_not_run_sign"] = ""
+
+vim.cmd [[
+	augroup virtcolumn
+		autocmd!
+		autocmd FileType UltestSummary setl nolist
+	augroup end
+]]
+
+local wk = require("which-key")
+wk.register({
+	u = {
+		name = "Unit Tests",
+		r = { "<Plug>(ultest-run-nearest)", "Run nearest" },
+		o = { "<Plug>(ultest-output-show)", "Show test output" },
+		t = { "<Plug>(ultest-summary-toggle)", "Toggle the test window" },
+	},
+}, {
+	prefix = "<leader>",
+})
+
+wk.register({
+	["[u"] = { "<Plug>(ultest-prev-fail)", "Prev failing test" },
+	["]u"] = { "<Plug>(ultest-next-fail)", "Next failing test" },
+})
diff --git a/nvim/nvim/config/new/lua/windows/colorcolumn.lua b/nvim/nvim/config/new/lua/windows/colorcolumn.lua
index 5c9a3bb..5dda37a 100644
--- a/nvim/nvim/config/new/lua/windows/colorcolumn.lua
+++ b/nvim/nvim/config/new/lua/windows/colorcolumn.lua
@@ -10,7 +10,7 @@ end
 vim.cmd [[
 	augroup virtcolumn
 		autocmd!
-		autocmd FileType * if index(["netrw", "toggleterm"], &ft) == -1 | lua require("windows.colorcolumn").setup()
+		autocmd FileType * if index(["netrw", "toggleterm", "UltestSummary"], &ft) == -1 | lua require("windows.colorcolumn").setup()
 	augroup end
 ]]
 
diff --git a/nvim/nvim/config/new/lua/windows/which-key.lua b/nvim/nvim/config/new/lua/windows/which-key.lua
index a6fce4d..caf4816 100644
--- a/nvim/nvim/config/new/lua/windows/which-key.lua
+++ b/nvim/nvim/config/new/lua/windows/which-key.lua
@@ -19,7 +19,6 @@ wk.setup({
 wk.register({
 	gc = {
 		name = "Comment",
-		c = { "gc_", "Comment Line" },
 	},
 	ys = { name = "Add Surroundings" },
 	ds = { name = "Delete Surroundings" },