♻️ refactor(nvim): add neotest-adapters to their lang extras

.config/nvim/lazyvim.json

@@ -43,6 +43,7 @@
     "plugins.extras.lang.git",
     "plugins.extras.lang.markdown-extended",
     "plugins.extras.lang.python-extended",
+    "plugins.extras.lang.rust-extended",
     "plugins.extras.lang.web.css",
     "plugins.extras.lang.web.html",
     "plugins.extras.lang.web.typescript-extended",
@@ -50,6 +51,7 @@
     "plugins.extras.linting.shellcheck",
     "plugins.extras.lsp.actions-preview",
     "plugins.extras.lsp.compiler",
+    "plugins.extras.lsp.file-operations",
     "plugins.extras.lsp.garbage-day",
     "plugins.extras.lsp.glance",
     "plugins.extras.lsp.inc-rename",

.config/nvim/lua/plugins/extras/lang/bash.lua

@@ -22,6 +22,18 @@ return {
       vim.list_extend(opts.ensure_installed, { "bash-language-server" })
     end,
   },
+  {
+    "nvim-neotest/neotest",
+    optional = true,
+    dependencies = {
+      "rcasia/neotest-bash",
+    },
+    opts = {
+      adapters = {
+        ["neotest-haskell"] = {},
+      },
+    },
+  },
   {
     "luckasRanarison/nvim-devdocs",
     optional = true,

.config/nvim/lua/plugins/extras/lang/haskell.lua

@@ -15,10 +15,9 @@ return {
       { "nvim-telescope/telescope.nvim", optional = true },
     },
     config = function()
-      local ok, telescope = pcall(require, "telescope")
+      require("lazyvim.util").on_load("telescope.nvim", function()
-      if ok then
+        require("telescope").load_extension("ht")
-        telescope.load_extension("ht")
+      end)
-      end
     end,
   },
   {
@@ -44,9 +43,7 @@ return {
   {
     "nvim-neotest/neotest",
     optional = true,
-    dependencies = {
+    dependencies = { "mrcjkb/neotest-haskell" },
-      { "mrcjkb/neotest-haskell" },
-    },
     opts = {
       adapters = {
         ["neotest-haskell"] = {},
@@ -64,14 +61,11 @@ return {
   {
     "luc-tielen/telescope_hoogle",
     ft = { "haskell", "lhaskell", "cabal", "cabalproject" },
-    dependencies = {
+    dependencies = { "nvim-telescope/telescope.nvim" },
-      { "nvim-telescope/telescope.nvim" },
-    },
     config = function()
-      local ok, telescope = pcall(require, "telescope")
+      require("lazyvim.util").on_load("telescope.nvim", function()
-      if ok then
+        require("telescope").load_extension("hoogle")
-        telescope.load_extension("hoogle")
+      end)
-      end
     end,
   },
   -- Make sure lspconfig doesn't start hls,

.config/nvim/lua/plugins/extras/lang/omnisharp-extended.lua

@@ -0,0 +1,15 @@
+return {
+  { import = "lazyvim.plugins.extras.lang.omnisharp" },
+  {
+    "nvim-neotest/neotest",
+    optiona = true,
+    dependencies = {
+      "Issafalcon/neotest-dotnet",
+    },
+    opts = {
+      adapters = {
+        ["neotest-dotnet"] = {},
+      },
+    },
+  },
+}

.config/nvim/lua/plugins/extras/lang/web/php.lua

@@ -44,6 +44,18 @@ return {
       }
     end,
   },
+  {
+    "nvim-neotest/neotest",
+    optional = true,
+    dependencies = {
+      "olimorris/neotest-phpunit",
+    },
+    opts = {
+      adapters = {
+        ["neotest-phpunit"] = {},
+      },
+    },
+  },
   {
     "luckasRanarison/nvim-devdocs",
     optional = true,

.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua

@@ -74,6 +74,35 @@ return {
       code_lens = "all",
     },
   },
+  {
+    "nvim-neotest/neotest",
+    optional = true,
+    dependencies = {
+      "nvim-neotest/neotest-jest",
+      "adrigzr/neotest-mocha",
+      "marilari88/neotest-vitest",
+    },
+    opts = {
+      adapters = {
+        ["neotest-jest"] = {
+          jestCommand = "npm test --",
+          jestConfigFile = "custom.jest.config.ts",
+          env = { CI = true },
+          cwd = function()
+            return vim.fn.getcwd()
+          end,
+        },
+        ["neotest-mocha"] = {
+          command = "npm test --",
+          env = { CI = true },
+          cwd = function(path)
+            return vim.fn.getcwd()
+          end,
+        },
+        ["neotest-vitest"] = {},
+      },
+    },
+  },
   {
     "luckasRanarison/nvim-devdocs",
     optional = true,

.config/nvim/lua/plugins/extras/test/jest-test.lua

@@ -1,19 +0,0 @@
-return {
-  "nvim-neotest/neotest",
-  dependencies = {
-    "haydenmeade/neotest-jest",
-  },
-  opts = function(_, opts)
-    table.insert(
-      opts.adapters,
-      require("neotest-jest")({
-        jestCommand = "npm test --",
-        jestConfigFile = "custom.jest.config.ts",
-        env = { CI = true },
-        cwd = function()
-          return vim.fn.getcwd()
-        end,
-      })
-    )
-  end,
-}

.config/nvim/lua/plugins/extras/test/mocha-test.lua

@@ -1,18 +0,0 @@
-return {
-  "nvim-neotest/neotest",
-  dependencies = {
-    "adrigzr/neotest-mocha",
-  },
-  opts = function(_, opts)
-    table.insert(
-      opts.adapters,
-      require("neotest-mocha")({
-        command = "npm test --",
-        env = { CI = true },
-        cwd = function(path)
-          return vim.fn.getcwd()
-        end,
-      })
-    )
-  end,
-}

.config/nvim/lua/plugins/extras/test/python-test.lua

@@ -1,9 +0,0 @@
-return {
-  "nvim-neotest/neotest",
-  dependencies = {
-    "nvim-neotest/neotest-python",
-  },
-  opts = function(_, opts)
-    table.insert(opts.adapters, require("neotest-python"))
-  end,
-}

.config/nvim/lua/plugins/extras/test/rust-test.lua

@@ -1,9 +0,0 @@
-return {
-  "nvim-neotest/neotest",
-  dependencies = {
-    "rouge8/neotest-rust",
-  },
-  opts = function(_, opts)
-    table.insert(opts.adapters, require("neotest-rust"))
-  end,
-}

.config/nvim/lua/plugins/extras/test/vitest-test.lua

@@ -1,9 +0,0 @@
-return {
-  "nvim-neotest/neotest",
-  dependencies = {
-    "marilari88/neotest-vitest",
-  },
-  opts = function(_, opts)
-    table.insert(opts.adapters, require("neotest-vitest"))
-  end,
-}