fix: runspec for dir/file did not properly detect go package (#110)

fredrikaverpil · Jul 11, 2024 · c9c5e33 · c9c5e33
1 parent 5ac25f5
commit c9c5e33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lua/neotest-golang/runspec_dir.lua b/lua/neotest-golang/runspec_dir.lua
@@ -29,8 +29,12 @@ function M.build(pos)
   local package_name = "./..."
   for _, golist_item in ipairs(golist_data) do
     if pos.path == golist_item.Dir then
-      package_name = golist_item.ImportPath
-      break
+      if golist_item.Name == "main" then
+        -- do nothing, keep ./...
+      else
+        package_name = golist_item.ImportPath
+        break
+      end
     end
   end
 

diff --git a/lua/neotest-golang/runspec_file.lua b/lua/neotest-golang/runspec_file.lua
@@ -28,9 +28,14 @@ function M.build(pos, tree)
   -- find the go package that corresponds to the pos.path
   local package_name = "./..."
   local pos_path_filename = vim.fn.fnamemodify(pos.path, ":t")
+  local pos_path_foldername = vim.fn.fnamemodify(pos.path, ":h")
+
   for _, golist_item in ipairs(golist_data) do
     if golist_item.TestGoFiles ~= nil then
-      if vim.tbl_contains(golist_item.TestGoFiles, pos_path_filename) then
+      if
+        pos_path_foldername == golist_item.Dir
+        and vim.tbl_contains(golist_item.TestGoFiles, pos_path_filename)
+      then
         package_name = golist_item.ImportPath
         break
       end