From 18d4c40f0889a2afa6c98af95af62c41c9bd8e55 Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Thu, 15 Jun 2023 17:41:46 +1000
Subject: [PATCH] Fix c-family closing brace indent behaviour on some corner
 cases

---
 rc/filetype/c-family.kak                      | 19 +++++++++++--------
 .../{close-struct => close-block}/cmd         |  0
 test/indent/c-family/close-block/in           | 12 ++++++++++++
 test/indent/c-family/close-block/out          | 16 ++++++++++++++++
 .../c-family/{close-struct => close-block}/rc |  0
 test/indent/c-family/close-struct/in          |  3 ---
 test/indent/c-family/close-struct/out         |  4 ----
 .../c-family/deindent-if-closing-brace/in     |  4 ++++
 .../c-family/deindent-if-closing-brace/out    |  5 +++++
 9 files changed, 48 insertions(+), 15 deletions(-)
 rename test/indent/c-family/{close-struct => close-block}/cmd (100%)
 create mode 100644 test/indent/c-family/close-block/in
 create mode 100644 test/indent/c-family/close-block/out
 rename test/indent/c-family/{close-struct => close-block}/rc (100%)
 delete mode 100644 test/indent/c-family/close-struct/in
 delete mode 100644 test/indent/c-family/close-struct/out

diff --git a/rc/filetype/c-family.kak b/rc/filetype/c-family.kak
index 3682d323..e7c440ba 100644
--- a/rc/filetype/c-family.kak
+++ b/rc/filetype/c-family.kak
@@ -122,14 +122,17 @@ define-command -hidden c-family-indent-on-opening-curly-brace %[
 ]
 
 define-command -hidden c-family-indent-on-closing-curly-brace %[
-    # align to opening curly brace when alone on a line
-    try %[
-        # in case open curly brace follows a closing paren, align indent with opening paren
-        execute-keys -itersel -draft <a-h><a-:><a-k>^\h+\}$<ret>hm <a-F>)M <a-k> \A\(.*\)\h\{.*\}\z <ret> <a-S>1<a-&>
-    ] catch %[
-        # otherwise align with open curly brace
-        execute-keys -itersel -draft <a-h><a-:><a-k>^\h+\}$<ret>hm<a-S>1<a-&>
-    ] catch %[]
+    evaluate-commands -draft -itersel -verbatim try %[
+        # check if alone on the line and select to opening curly brace
+        execute-keys <a-h><a-:><a-k>^\h+\}$<ret>hm
+        try %[
+            # in case open curly brace follows a closing paren, extend to opening paren
+            execute-keys -draft <a-f>) <a-k> \A\)\h+\{\z <ret>
+            execute-keys <a-F>)M
+        ]
+        # align to selection start
+        execute-keys <a-S>1<a-&>
+    ]
 ]
 
 define-command -hidden c-family-insert-on-closing-curly-brace %[
diff --git a/test/indent/c-family/close-struct/cmd b/test/indent/c-family/close-block/cmd
similarity index 100%
rename from test/indent/c-family/close-struct/cmd
rename to test/indent/c-family/close-block/cmd
diff --git a/test/indent/c-family/close-block/in b/test/indent/c-family/close-block/in
new file mode 100644
index 00000000..bc0901e8
--- /dev/null
+++ b/test/indent/c-family/close-block/in
@@ -0,0 +1,12 @@
+struct A
+{
+    int i%(;)
+
+if (true) {
+    if (true) {
+        foo%(;)
+    bar%(;)
+
+    foo(bar) {}
+{
+    baz%(;)
diff --git a/test/indent/c-family/close-block/out b/test/indent/c-family/close-block/out
new file mode 100644
index 00000000..b207dfd6
--- /dev/null
+++ b/test/indent/c-family/close-block/out
@@ -0,0 +1,16 @@
+struct A
+{
+    int i;
+};
+
+if (true) {
+    if (true) {
+        foo;
+    }
+    bar;
+}
+
+    foo(bar) {}
+{
+    baz;
+}
diff --git a/test/indent/c-family/close-struct/rc b/test/indent/c-family/close-block/rc
similarity index 100%
rename from test/indent/c-family/close-struct/rc
rename to test/indent/c-family/close-block/rc
diff --git a/test/indent/c-family/close-struct/in b/test/indent/c-family/close-struct/in
deleted file mode 100644
index 149f2a22..00000000
--- a/test/indent/c-family/close-struct/in
+++ /dev/null
@@ -1,3 +0,0 @@
-struct A
-{
-    int i%(;)
diff --git a/test/indent/c-family/close-struct/out b/test/indent/c-family/close-struct/out
deleted file mode 100644
index 67c4f51a..00000000
--- a/test/indent/c-family/close-struct/out
+++ /dev/null
@@ -1,4 +0,0 @@
-struct A
-{
-    int i;
-};
diff --git a/test/indent/c-family/deindent-if-closing-brace/in b/test/indent/c-family/deindent-if-closing-brace/in
index 5ac38a34..f200dda6 100644
--- a/test/indent/c-family/deindent-if-closing-brace/in
+++ b/test/indent/c-family/deindent-if-closing-brace/in
@@ -13,3 +13,7 @@ if (1) {
 
   if (1) {
          bar()%( )}
+
+        foo(bar) {}
+    {
+        baz%( )}
diff --git a/test/indent/c-family/deindent-if-closing-brace/out b/test/indent/c-family/deindent-if-closing-brace/out
index d46b84cf..edd7dfa3 100644
--- a/test/indent/c-family/deindent-if-closing-brace/out
+++ b/test/indent/c-family/deindent-if-closing-brace/out
@@ -19,3 +19,8 @@ if (1) {
   if (1) {
          bar()
   }
+
+        foo(bar) {}
+    {
+        baz
+    }