Skip to content

Commit 5f564e6

Browse files
committed
Fixing bug when custom setting selector is used
1 parent 3a65ef4 commit 5f564e6

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

lua/neotest-vstest/vstest/init.lua

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,23 @@ end
2020
---@param project DotnetProjectInfo
2121
function Client:new(project)
2222
logger.info("neotest-vstest: Creating new (vstest) client for: " .. vim.inspect(project))
23-
local settingsSelector = vim.g.neotest_vstest_find_settings
24-
or vstest_client.find_runsettings_for_project
23+
local findSettings = function()
24+
local settings = nil
25+
if vim.g.neotest_vstest_find_settings then
26+
settings = vim.g.neotest_vstest_find_settings(project.proj_dir)
27+
end
28+
if settings ~= nil then
29+
return settings
30+
else
31+
return vstest_client.find_runsettings_for_project(project.proj_dir)
32+
end
33+
end
2534
local client = {
2635
project = project,
2736
test_cases = {},
2837
last_discovered = 0,
2938
test_runner = cli_wrapper.create_test_runner(project),
30-
settings = vim.g.neotest_vstest_find_settings and vim.g.neotest_vstest_find_settings(
31-
project.proj_dir
32-
) or settingsSelector(project.proj_dir),
39+
settings = findSettings(),
3340
}
3441
setmetatable(client, self)
3542

0 commit comments

Comments
 (0)