Merge remote-tracking branch 'arrufat/go-new-line-comment'

1 files changed, 9 insertions, 1 deletions

diff --git a/rc/filetype/go.kak b/rc/filetype/go.kak
index 4f8407cd..923eebaa 100644
--- a/rc/filetype/go.kak
+++ b/rc/filetype/go.kak
@@ -135,7 +135,15 @@ define-command -hidden go-indent-on-closing-curly-brace %[
 define-command -hidden go-insert-comment-on-new-line %[
     evaluate-commands -no-hooks -draft -itersel %[
         # copy // comments prefix and following white spaces
-        try %{ execute-keys -draft <semicolon><c-s>kx s ^\h*\K/{2,}\h* <ret> y<c-o>P<esc> }
+        try %{
+            execute-keys -draft <semicolon><c-s>kx s ^\h*\K/{2,}\h* <ret> y<c-o>P<esc>
+            # check for empty comments and delete them
+            try %{
+                execute-keys kx<a-K>^\h*//+\h*$<ret>
+            } catch %{
+                execute-keys Jx_d
+            }
+        }
     ]
 ]