tests(comment): fix

lua/gopher/comment.lua

@@ -7,33 +7,39 @@ local ts = require "gopher._utils.ts"
 local log = require "gopher._utils.log"
 local comment = {}
 
+---@param name string
+---@return string
+---@private
+local function template(name)
+  return "// " .. (name or "") .. " "
+end
+
 ---@param bufnr integer
 ---@return string
 ---@private
 local function generate(bufnr)
-  local cmt = "// "
+  local sok, sres = pcall(ts.get_struct_under_cursor, bufnr)
-
+  vim.print(sok, sres)
-  local ok, res = pcall(ts.get_struct_under_cursor, bufnr)
+  if sok then
-  if ok then
+    return template(sres.name)
-    return cmt .. res.name .. " "
   end
 
-  ok, res = pcall(ts.get_func_under_cursor, bufnr)
+  local fok, fres = pcall(ts.get_func_under_cursor, bufnr)
-  if ok then
+  if fok then
-    return cmt .. res.name .. " "
+    return template(fres.name)
   end
 
-  ok, res = pcall(ts.get_interface_under_cursor, bufnr)
+  local iok, ires = pcall(ts.get_interface_under_cursor, bufnr)
-  if ok then
+  if iok then
-    return cmt .. res.name .. " "
+    return template(ires.name)
   end
 
-  ok, res = pcall(ts.get_package_under_cursor, bufnr)
+  local pok, pres = pcall(ts.get_package_under_cursor, bufnr)
-  if ok then
+  if pok then
-    return cmt .. "Package " .. res.name .. " provides "
+    return "// Package " .. pres.name .. " provides "
   end
 
-  return cmt
+  return "// "
 end
 
 function comment.comment()

spec/fixtures/comment/struct_input.go

@@ -1,3 +1,3 @@
 package main
 
-type CommentStruct struct {}
+type CommentStruct struct{}

spec/fixtures/comment/struct_output.go

@@ -1,4 +1,4 @@
 package main
 
 // CommentStruct 
-type CommentStruct struct {}
+type CommentStruct struct{}

spec/integration/comment_test.lua

@@ -21,6 +21,9 @@ local function do_the_test(fixture, pos)
   child.cmd "write"
 
   t.eq(t.readfile(tmp), fixtures.output)
+
+  -- without it all other(not even from this module) tests are falling
+  t.deletefile(tmp)
 end
 
 T["comment"] = MiniTest.new_set {}
@@ -37,11 +40,11 @@ T["comment"]["should add comment to function"] = function()
 end
 
 T["comment"]["should add comment to method"] = function()
-  do_the_test("func", { 5, 1 })
+  do_the_test("method", { 5, 1 })
 end
 
 T["comment"]["should add comment to interface"] = function()
-  do_the_test("interface", { 3, 1 })
+  do_the_test("interface", { 3, 6 })
 end
 
 T["comment"]["otherwise should add // above cursor"] = function()

spec/testutils.lua

@@ -31,6 +31,11 @@ function testutils.writefile(fpath, contents)
   vim.fn.writefile(vim.split(contents, "\n"), fpath)
 end
 
+---@param fpath string
+function testutils.deletefile(fpath)
+  vim.fn.delete(fpath)
+end
+
 ---@param fixture string
 ---@return {input: string, output: string}
 function testutils.get_fixtures(fixture)