feat: replace fast_parse (#42)

* feat: replace fast_parse

* fix: directory filtering (#43)

Author: Nsidorenco

lua/neotest-vstest/init.lua

@@ -105,6 +105,8 @@ local function create_adapter(config)
     local dotnet_utils = require("neotest-vstest.dotnet_utils")
     local client_discovery = require("neotest-vstest.client")
 
+    logger.trace("neotest-vstest: checking if file is test file: " .. file_path)
+
     local isDotnetFile = (vim.endswith(file_path, ".csproj") or vim.endswith(file_path, ".fsproj"))
       or (vim.endswith(file_path, ".cs") or vim.endswith(file_path, ".fs"))
 
@@ -127,50 +129,42 @@ local function create_adapter(config)
 
   function DotnetNeotestAdapter.filter_dir(name, rel_path, root)
     local dotnet_utils = require("neotest-vstest.dotnet_utils")
+    local logger = require("neotest.logging")
+    logger.trace("neotest-vstest: filtering dir", name, rel_path, root)
 
     if name == "bin" or name == "obj" then
       return false
     end
 
-    local project_dir
-
     -- Filter out directories that are not part of the solution (if there is a solution)
     local fullpath = vim.fs.joinpath(root, rel_path)
     if solution_dir then
-      project_dir = vim.fs.root(fullpath, function(path, _)
+      local solution_info = dotnet_utils.get_solution_info(solution)
+      local project_files = vim.fs.find(function(path, _)
         return path:match("%.[cf]sproj$")
-      end)
-    else
-      for dir in vim.fs.parents(fullpath) do
-        for filename in vim.fs.dir(dir) do
-          if filename:match("%.[cf]sproj$") then
-            project_dir = dir
-            break
+      end, {
+        upward = false,
+        type = "file",
+        path = fullpath,
+        limit = math.huge,
+      })
+
+      return vim
+        .iter(solution_info and solution_info.projects or {})
+        :map(function(proj)
+          return proj.proj_file
+        end)
+        :any(function(proj_file)
+          for _, file in ipairs(project_files) do
+            if vim.fs.normalize(proj_file) == vim.fs.normalize(file) then
+              return true
+            end
           end
-        end
-        if vim.fs.normalize(dir) == vim.fs.normalize(root) then
-          break
-        end
-      end
-    end
-
-    -- We cannot determine if the file is a test file without a project directory.
-    -- Keep searching the child by not filtering it out
-    if not project_dir then
+          return false
+        end)
+    else
       return true
     end
-
-    local solution_info = dotnet_utils.get_solution_info(solution)
-
-    local found = vim.iter(solution_info and solution_info.projects or {}):any(function(project)
-      return vim.fs.normalize(project.proj_dir) == vim.fs.normalize(project_dir)
-    end)
-
-    if solution_info and not found then
-      return false
-    end
-
-    return true
   end
 
   local function get_match_type(captured_nodes)
@@ -403,7 +397,7 @@ local function create_adapter(config)
       local lang_tree =
         vim.treesitter.get_string_parser(content, filetype, { injections = { [filetype] = "" } })
 
-      local root = lib.treesitter.fast_parse(lang_tree):root()
+      local root = lang_tree:parse(false)[1]:root()
 
       local query = lib.treesitter.normalise_query(
         filetype,

lua/neotest-vstest/mtp/client.lua

@@ -150,7 +150,7 @@ function M.discovery_tests(dll_path)
   local tests = {}
 
   local on_update = function(err, result, ctx)
-    if result.changes then
+    if result.changes and result.changes ~= vim.NIL then
       for _, test in ipairs(result.changes) do
         tests[#tests + 1] = test.node
       end
@@ -225,7 +225,7 @@ function M.run_tests(dll_path, nodes)
   local output_stream = nio.control.queue()
 
   local on_update = function(_, result)
-    if result.changes then
+    if result.changes and result.changes ~= vim.NIL then
       nio.run(function()
         for _, test in ipairs(result.changes) do
           local test_result = run_results[test.node.uid]
@@ -307,10 +307,12 @@ function M.debug_tests(dll_path, nodes)
   local done_event = nio.control.event()
 
   local on_update = function(_, result)
-    for _, test in ipairs(result.changes) do
-      local test_result = parseTestResult(test)
-      if test_result then
-        run_results[test.node.uid] = test_result
+    if result.changes and result.changes ~= vim.NIL then
+      for _, test in ipairs(result.changes) do
+        local test_result = parseTestResult(test)
+        if test_result then
+          run_results[test.node.uid] = test_result
+        end
       end
     end
   end

spec/root_detection_spec.lua

@@ -1,6 +1,6 @@
 describe("Test root detection", function()
   -- increase nio.test timeout
-  vim.env.PLENARY_TEST_TIMEOUT = 20000
+  vim.env.PLENARY_TEST_TIMEOUT = 80000
   -- add test_discovery script and treesitter parsers installed with luarocks
   vim.opt.runtimepath:append(vim.fn.getcwd())
   vim.opt.runtimepath:append(vim.fn.expand("~/.luarocks/lib/lua/5.1/"))

spec/test_detection_spec.lua

@@ -1,6 +1,6 @@
 describe("Test test detection", function()
   -- increase nio.test timeout
-  vim.env.PLENARY_TEST_TIMEOUT = 40000
+  vim.env.PLENARY_TEST_TIMEOUT = 80000
   -- add test_discovery script and treesitter parsers installed with luarocks
   vim.opt.runtimepath:append(vim.fn.getcwd())
   vim.opt.runtimepath:append(vim.fn.expand("~/.luarocks/lib/lua/5.1/"))