From 7ed2303648bf83bb081d9bd863660ebf2344ce47 Mon Sep 17 00:00:00 2001 From: srdusr Date: Wed, 24 Sep 2025 04:19:28 +0200 Subject: Squashed 'common/config/nvim/' changes from 2a8020a..966d12a 966d12a Update/Overhaul git-subtree-dir: common/config/nvim git-subtree-split: 966d12ac730c83da90d60ab24eae539b2ea69441 --- lua/plugins/neotest.lua | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) mode change 100644 => 100755 lua/plugins/neotest.lua (limited to 'lua/plugins/neotest.lua') diff --git a/lua/plugins/neotest.lua b/lua/plugins/neotest.lua old mode 100644 new mode 100755 index aa73899..1034d33 --- a/lua/plugins/neotest.lua +++ b/lua/plugins/neotest.lua @@ -1,11 +1,38 @@ -require("neotest").setup({ - adapters = { - require("neotest-python")({ +local M = {} + +function M.setup() + local ok, neotest = pcall(require, "neotest") + if not ok or not neotest then + return false + end + + -- Safely require adapters + local python_ok, python_adapter = pcall(require, "neotest-python") + local plenary_ok, plenary_adapter = pcall(require, "neotest-plenary") + local vim_test_ok, vim_test_adapter = pcall(require, "neotest-vim-test") + + local adapters = {} + if python_ok and python_adapter then + table.insert(adapters, python_adapter({ dap = { justMyCode = false }, - }), - require("neotest-plenary"), - require("neotest-vim-test")({ + })) + end + + if plenary_ok and plenary_adapter then + table.insert(adapters, plenary_adapter) + end + + if vim_test_ok and vim_test_adapter then + table.insert(adapters, vim_test_adapter({ ignore_file_types = { "python", "vim", "lua" }, - }), - }, -}) + })) + end + + neotest.setup({ + adapters = adapters, + }) + + return true +end + +return M -- cgit v1.2.3