fix: empty struct returns being erroneously wrapped in parens (#17)

Author: ZacharyThompson

lua/auto-fix-return/fix.lua

@@ -136,6 +136,7 @@ function M.build_fixed_definition(line, cursor_col)
         or curr_word:find("chan$") ~= nil
         or curr_word:find("^func")
         or curr_word:find("^interface")
+        or curr_word:find("^struct")
       )
     then
       -- Peek ahead to find the next non-space character

lua/test/declaration_test_spec.lua

@@ -1099,6 +1099,31 @@ describe("test functions with body defined", function()
       eq("{", char)
     end)
   end)
+
+  describe(
+    "when a struct with a space between the struct keyword and the braces with cursor at the end of the braces",
+    function()
+      local winid = 0
+      before_each(function()
+        winid = utils.set_test_window_value("func Foo() struct {}| {}")
+        vim.cmd("AutoFixReturn")
+      end)
+
+      after_each(function()
+        utils.cleanup_test(winid)
+      end)
+
+      it("should not add parentheses around the return type", function()
+        local lines = utils.get_win_lines(winid)
+        eq("func Foo() struct {} {}", lines[1])
+      end)
+
+      it("should not touch the cursor", function()
+        local char = utils.get_cursor_char(winid)
+        eq("}", char)
+      end)
+    end
+  )
 end)
 
 describe("test functions without a body defined", function()
@@ -1834,6 +1859,31 @@ describe("test functions without a body defined", function()
       end)
     end
   )
+
+  describe(
+    "when a struct with a space between the struct keyword and the braces with cursor at the end of the braces",
+    function()
+      local winid = 0
+      before_each(function()
+        winid = utils.set_test_window_value("func Foo() struct {}|")
+        vim.cmd("AutoFixReturn")
+      end)
+
+      after_each(function()
+        utils.cleanup_test(winid)
+      end)
+
+      it("should not add parentheses around the return type", function()
+        local lines = utils.get_win_lines(winid)
+        eq("func Foo() struct {}", lines[1])
+      end)
+
+      it("should not touch the cursor", function()
+        local char = utils.get_cursor_char(winid)
+        eq("}", char)
+      end)
+    end
+  )
 end)
 
 describe("test methods with body defined", function()

lua/test/interface_test_spec.lua

@@ -1152,4 +1152,38 @@ describe("test interface method declarations", function()
       end)
     end
   )
+
+  describe(
+    "when a struct return with space between struct keyword and braces is started",
+    function()
+      local winid = 0
+      before_each(function()
+        winid = utils.set_test_window_value({
+          "type Foo interface {",
+          "  Bar() struct {}|",
+          "}",
+        })
+        vim.cmd("AutoFixReturn")
+      end)
+
+      after_each(function()
+        utils.cleanup_test(winid)
+      end)
+
+      it("should not add parentheses around the return type", function()
+        local lines = utils.get_win_lines(winid)
+        local expected = {
+          "type Foo interface {",
+          "  Bar() struct {}",
+          "}",
+        }
+        eq(expected, lines)
+      end)
+
+      it("should not touch the cursor", function()
+        local char = utils.get_cursor_char(winid)
+        eq("}", char)
+      end)
+    end
+  )
 end)