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

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

@@ -6,18 +6,10 @@ local dotnet_utils = require("neotest-vstest.dotnet_utils")
 local M = {}
 
 function M.get_vstest_path()
-  local path_to_search = vim.g.neotest_vstest.sdk_path
+  local path_to_search = vim.g.neotest_vstest and vim.g.neotest_vstest.sdk_path
 
   if not path_to_search then
-    local process = nio.process.run({
-      cmd = "dotnet",
-      args = { "--info" },
-    })
-
-    logger.debug(
-      "neotest-vstest: starting process to detect dotnet sdk path "
-        .. tostring(process and process.pid or 0)
-    )
+    local process = vim.system({ "dotnet", "--info" })
 
     local default_sdk_path
     if vim.fn.has("win32") then
@@ -26,35 +18,22 @@ function M.get_vstest_path()
       default_sdk_path = "/usr/local/share/dotnet/sdk/"
     end
 
-    if not process then
+    local obj = process:wait()
+
+    local out = obj.stdout
+    local info = dotnet_utils.parse_dotnet_info(out or "")
+    if info.sdk_path then
+      path_to_search = info.sdk_path
+      logger.info(string.format("neotest-vstest: detected sdk path: %s", path_to_search))
+    else
       path_to_search = default_sdk_path
       local log_string = string.format(
         "neotest-vstest: failed to detect sdk path. falling back to %s",
-        default_sdk_path
+        path_to_search
       )
-
       logger.info(log_string)
       nio.scheduler()
       vim.notify_once(log_string)
-    else
-      local out = process.stdout.read()
-      local info = dotnet_utils.parse_dotnet_info(out or "")
-      if info.sdk_path then
-        path_to_search = info.sdk_path
-        logger.info(
-          string.format("neotest-vstest: detected sdk path: %s", vim.g.neotest_vstest.sdk_path)
-        )
-      else
-        path_to_search = default_sdk_path
-        local log_string = string.format(
-          "neotest-vstest: failed to detect sdk path. falling back to %s",
-          path_to_search
-        )
-        logger.info(log_string)
-        nio.scheduler()
-        vim.notify_once(log_string)
-      end
-      process.close()
     end
   end
 
@@ -76,7 +55,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)

lua/neotest-vstest/vstest/init.lua

@@ -22,7 +22,7 @@ function Client:new(project)
   logger.info("neotest-vstest: Creating new (vstest) client for: " .. vim.inspect(project))
   local findSettings = function()
     local settings = nil
-    if vim.g.neotest_vstest.find_settings then
+    if vim.g.neotest_vstest and vim.g.neotest_vstest.find_settings then
       settings = vim.g.neotest_vstest.find_settings(project.proj_dir)
     end
     if settings ~= nil then

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
                     ()