From 6cf39a5f4f8e2e0fbc36389992287d61c32afe55 Mon Sep 17 00:00:00 2001
From: John Isom <John.Isom2001@gmail.com>
Date: Sun, 2 Aug 2020 11:22:28 -0600
Subject: [PATCH] Fix auto indentation for if/case and else

---
 rc/filetype/crystal.kak | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/rc/filetype/crystal.kak b/rc/filetype/crystal.kak
index 74c283d8..9f1e7210 100644
--- a/rc/filetype/crystal.kak
+++ b/rc/filetype/crystal.kak
@@ -188,14 +188,16 @@ define-command -hidden crystal-trim-indent %{
 
 define-command -hidden crystal-indent-on-char %{
     evaluate-commands -no-hooks -draft -itersel %{
-        # align 'else/elsif' to 'if'
-        try %{ execute-keys -draft <a-x> <a-k> ^\h*(?:else|elsif)$ <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:if)                                                    <ret> <a-S> 1<a-&> }
-        # align 'else/when' to 'case'
-        try %{ execute-keys -draft <a-x> <a-k> ^\h*(?:else|when)$       <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:case)                                             <ret> <a-S> 1<a-&> }
+        # align 'else' to 'if/case'
+        try %{ execute-keys -draft <a-x> <a-k> ^\h*else$   <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:if|case)                                               <ret> <a-S> 1<a-&> }
+        # align 'elsif' to 'if'
+        try %{ execute-keys -draft <a-x> <a-k> ^\h*elsif$  <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:if)                                                    <ret> <a-S> 1<a-&> }
+        # align 'when' to 'case'
+        try %{ execute-keys -draft <a-x> <a-k> ^\h*when$   <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:case)                                                  <ret> <a-S> 1<a-&> }
         # align 'rescue' to 'begin/def'
-        try %{ execute-keys -draft <a-x> <a-k> ^\h*(?:rescue)$     <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:begin|def)                                             <ret> <a-S> 1<a-&> }
+        try %{ execute-keys -draft <a-x> <a-k> ^\h*rescue$ <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:begin|def)                                             <ret> <a-S> 1<a-&> }
         # align 'end' to opening structure
-        try %{ execute-keys -draft <a-x> <a-k> ^\h*(?:end)$        <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:begin|case|class|def|for|if|module|unless|until|while) <ret> <a-S> 1<a-&> }
+        try %{ execute-keys -draft <a-x> <a-k> ^\h*end$    <ret> <a-a>i <a-semicolon> <a-?> ^\h*(?:begin|case|class|def|for|if|module|unless|until|while) <ret> <a-S> 1<a-&> }
     }
 }