From 58c15b02409b6daa5f800be211c0db7c113d00e3 Mon Sep 17 00:00:00 2001
From: Justin Frank <justinpfrank@protonmail.com>
Date: Fri, 8 Feb 2019 15:16:29 -0800
Subject: [PATCH] Indent and deindent c-family single line else properly

---
 rc/core/c-family.kak                      | 9 +++++++--
 test/indent/c-family/deindent-if-body/in  | 6 ++++++
 test/indent/c-family/deindent-if-body/out | 8 ++++++++
 test/indent/c-family/indent-if-body/in    | 4 ++++
 test/indent/c-family/indent-if-body/out   | 6 ++++++
 5 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/rc/core/c-family.kak b/rc/core/c-family.kak
index cc101984..1aee07a9 100644
--- a/rc/core/c-family.kak
+++ b/rc/core/c-family.kak
@@ -49,11 +49,16 @@ define-command -hidden c-family-indent-on-newline %< evaluate-commands -draft -i
     try %< execute-keys -draft k <a-x> s[a-zA-Z0-9_-]+:\h*$<ret> j <a-gt> >
     # indent after a statement not followed by an opening brace
     try %< execute-keys -draft k <a-x> s\)\h*(?://[^\n]+)?\n\z<ret> \
-                               <a-\;>mB <a-k>\A\b(if|else|for|while)\b<ret> <a-\;>j <a-gt> >
+                               <a-\;>mB <a-k>\A\b(if|for|while)\b<ret> <a-\;>j <a-gt> >
+    try %< execute-keys -draft k <a-x> s \belse\b\h*(?://[^\n]+)?\n\z<ret> \
+                               j <a-gt> >
     # deindent after a single line statement end
     try %< execute-keys -draft K <a-x> <a-k>\;\h*(//[^\n]+)?$<ret> \
                                K <a-x> s\)(\h+\w+)*\h*(//[^\n]+)?\n([^\n]*\n){2}\z<ret> \
-                               MB <a-k>\A\b(if|else|for|while)\b<ret> <a-S>1<a-&> >
+                               MB <a-k>\A\b(if|for|while)\b<ret> <a-S>1<a-&> >
+    try %< execute-keys -draft K <a-x> <a-k>\;\h*(//[^\n]+)?$<ret> \
+                               K <a-x> s \belse\b\h*(?://[^\n]+)?\n([^\n]*\n){2}\z<ret> \
+                               <a-S>1<a-&> >
     # align to the opening parenthesis or opening brace (whichever is first)
     # on a previous line if its followed by text on the same line
     try %< evaluate-commands -draft %<
diff --git a/test/indent/c-family/deindent-if-body/in b/test/indent/c-family/deindent-if-body/in
index 5b2cc138..71c9ed0d 100644
--- a/test/indent/c-family/deindent-if-body/in
+++ b/test/indent/c-family/deindent-if-body/in
@@ -8,3 +8,9 @@ if (bar(a, b,
 if (bar(a, b,
         c, d)) // comment
     foo();%( )
+
+else
+    bar();%( )
+
+else // comment
+    bar();%( )
diff --git a/test/indent/c-family/deindent-if-body/out b/test/indent/c-family/deindent-if-body/out
index 543b5aa1..f8d662a1 100644
--- a/test/indent/c-family/deindent-if-body/out
+++ b/test/indent/c-family/deindent-if-body/out
@@ -11,3 +11,11 @@ if (bar(a, b,
         c, d)) // comment
     foo();
 baz
+
+else
+    bar();
+baz
+
+else // comment
+    bar();
+baz
diff --git a/test/indent/c-family/indent-if-body/in b/test/indent/c-family/indent-if-body/in
index 0ac6763a..7ce06395 100644
--- a/test/indent/c-family/indent-if-body/in
+++ b/test/indent/c-family/indent-if-body/in
@@ -5,3 +5,7 @@ if (bar(a, b,
 
 if (bar(a, b,
         c, d)) // comment%( )
+
+else%( )
+
+else // comment%( )
diff --git a/test/indent/c-family/indent-if-body/out b/test/indent/c-family/indent-if-body/out
index 3b4b466f..c638be41 100644
--- a/test/indent/c-family/indent-if-body/out
+++ b/test/indent/c-family/indent-if-body/out
@@ -8,3 +8,9 @@ if (bar(a, b,
 if (bar(a, b,
         c, d)) // comment
     foo
+
+else
+    foo
+
+else // comment
+    foo