Fix invalid insertion of ; after } closing some functions

Function taking a parameter with a struct tag on the last line
before the opening { were wrongly treated as structs. Add some
additional regex logic to try to catch those cases.

Fixes #4136

rc/filetype/c-family.kak

@@ -134,7 +134,7 @@ define-command -hidden c-family-indent-on-closing-curly-brace %[
 
 define-command -hidden c-family-insert-on-closing-curly-brace %[
     # add a semicolon after a closing brace if part of a class, union or struct definition
-    try %[ execute-keys -itersel -draft hm<a-x>B<a-x><a-k>\A\h*(class|struct|union|enum)<ret> '<a-;>;i;<esc>' ]
+    try %[ execute-keys -itersel -draft hm<a-x>B<a-x> <a-K>\A[^\n]+\)\h*(\{|$)<ret> <a-k>\A\h*(class|struct|union|enum)<ret> '<a-;>;i;<esc>' ]
 ]
 
 define-command -hidden c-family-insert-on-newline %[ evaluate-commands -itersel -draft %[

test/indent/c-family/close-function-with-struct-param/cmd

@@ -0,0 +1 @@
+c<ret>}<esc>

test/indent/c-family/close-function-with-struct-param/in

@@ -0,0 +1,8 @@
+void f(int i,
+       struct S s)
+{
+%( )
+
+void g(int i,
+       struct S s) {
+%( )

test/indent/c-family/close-function-with-struct-param/out

@@ -0,0 +1,10 @@
+void f(int i,
+       struct S s)
+{
+
+}
+
+void g(int i,
+       struct S s) {
+
+}

test/indent/c-family/close-function-with-struct-param/rc

@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
+set buffer filetype cpp