Merge branch 'main' into feat/unified_options_table

Author: Nsidorenco

lua/neotest-vstest/health.lua

@@ -4,14 +4,14 @@ M.check = function()
 
   vim.health.info("checking for dependencies...")
 
-  local has_nio = pcall(require("nio"))
+  local has_nio, nio = pcall(require, "nio")
   if not has_nio then
     vim.health.error("nio is not installed. Please install nio to use neotest-vstest.")
   else
     vim.health.ok("nio is installed.")
   end
 
-  local has_neotest = pcall(require("neotest"))
+  local has_neotest = pcall(require, "neotest")
   if not has_neotest then
     vim.health.error("neotest is not installed. Please install neotest to use neotest-vstest.")
   else
@@ -21,16 +21,20 @@ M.check = function()
   vim.health.info("Checking neotest-vstest configuration...")
 
   vim.health.info("Checking for vstest.console.dll...")
-  local cli_wrapper = require("neotest-vstest.vstest.cli_wrapper")
-  local vstest_path = cli_wrapper.get_vstest_path()
+  if has_nio then
+    nio.run(function()
+      local cli_wrapper = require("neotest-vstest.vstest.cli_wrapper")
+      local vstest_path = cli_wrapper.get_vstest_path()
 
-  -- make sure setup function parameters are ok
-  if not vstest_path then
-    vim.health.error(
-      "Could not determine location of vstest.console.dll. Please set vim.g.neotest_vstest.sdk_path to the dotnet sdk path."
-    )
-  else
-    vim.health.ok("Found vstest.console.dll at: " .. vstest_path)
+      -- make sure setup function parameters are ok
+      if not vstest_path then
+        vim.health.error(
+          "Could not determine location of vstest.console.dll. Please set vim.g.neotest_vstest.sdk_path to the dotnet sdk path."
+        )
+      else
+        vim.health.ok("Found vstest.console.dll at: " .. vstest_path)
+      end
+    end)
   end
 end
 return M

lua/neotest-vstest/init.lua

@@ -584,16 +584,7 @@ local DotnetNeotestAdapter = create_adapter()
 
 ---@param opts neotest-vstest.Config
 local function apply_user_settings(_, opts)
-  if opts then
-    vim.g.neotest_vstest.sdk_path = opts.sdk_path or vim.g.neotest_vstest.sdk_path
-    vim.g.neotest_vstest.build_opts = opts.build_opts or vim.g.neotest_vstest.build_opts
-    vim.g.neotest_vstest.dap_settings = opts.dap_settings or vim.g.neotest_vstest.dap_settings
-    vim.g.neotest_vstest.solution_selector = opts.solution_selector
-      or vim.g.neotest_vstest.solution_selector
-    vim.g.neotest_vstest.find_settings = opts.settings_selector
-      or vim.g.neotest_vstest.find_settings
-    vim.g.neotest_vstest.timeout_ms = opts.timeout_ms or vim.g.neotest_vstest.timeout_ms
-  end
+  vim.g.neotest_vstest = vim.tbl_deep_extend("force", vim.g.neotest_vstest or {}, opts or {})
   return create_adapter(opts)
 end
 

lua/neotest-vstest/vstest/cli_wrapper.lua

@@ -76,7 +76,7 @@ end
 ---@return { execute: fun(content: string), stop: fun() }
 function M.create_test_runner(project)
   local test_discovery_script = get_script("run_tests.fsx")
-  local testhost_dll = get_vstest_path()
+  local testhost_dll = M.get_vstest_path()
 
   logger.debug("neotest-vstest: found discovery script: " .. test_discovery_script)
   logger.debug("neotest-vstest: found testhost dll: " .. testhost_dll)

scripts/run_tests.fsx

@@ -239,7 +239,7 @@ module TestDiscovery =
                 do
                     Console.WriteLine($"spawned test process with pid: {pid}")
                     use pidWriter = new StreamWriter(pidFile, append = false)
-                    pidWriter.WriteLine(pid)
+                    pidWriter.Write(pid)
 
                 while not (cts.Token.IsCancellationRequested || File.Exists(attachedFile)) do
                     ()