From cd53d313848d5ded4bf33bf480f11b676f381e22 Mon Sep 17 00:00:00 2001
From: John Isom <John.Isom2001@gmail.com>
Date: Mon, 27 Jul 2020 13:50:51 -0600
Subject: Fix indentation rule for java.kak

---
 rc/filetype/java.kak | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'rc/filetype/java.kak')

diff --git a/rc/filetype/java.kak b/rc/filetype/java.kak
index f6a77f82..a2b18fd1 100644
--- a/rc/filetype/java.kak
+++ b/rc/filetype/java.kak
@@ -56,6 +56,8 @@ define-command -hidden java-indent-on-new-line %~
         try %[ execute-keys -draft k<a-x> <a-k> ^\h*(case|default).*:$ <ret> j<a-gt> ]
         # indent after keywords
         try %[ execute-keys -draft <semicolon><a-F>)MB <a-k> \A(if|else|while|for|try|catch)\h*\(.*\)\h*\n\h*\n?\z <ret> s \A|.\z <ret> 1<a-&>1<a-space><a-gt> ]
+        # deindent closing brace(s) when after cursor
+        try %[ execute-keys -draft <a-x> <a-k>^\h*[})]+\h*$<ret> hm <a-S> 1<a-&> ]
     =
 ~
 
-- 
cgit v1.2.3


From e43981422e7068d3aa6e8a3d81e09e37a8fe2bc3 Mon Sep 17 00:00:00 2001
From: John Isom <John.Isom2001@gmail.com>
Date: Wed, 29 Jul 2020 17:02:50 -0600
Subject: Update deindentation in java.kak

---
 rc/filetype/java.kak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rc/filetype/java.kak')

diff --git a/rc/filetype/java.kak b/rc/filetype/java.kak
index a2b18fd1..12cb99a3 100644
--- a/rc/filetype/java.kak
+++ b/rc/filetype/java.kak
@@ -57,7 +57,7 @@ define-command -hidden java-indent-on-new-line %~
         # indent after keywords
         try %[ execute-keys -draft <semicolon><a-F>)MB <a-k> \A(if|else|while|for|try|catch)\h*\(.*\)\h*\n\h*\n?\z <ret> s \A|.\z <ret> 1<a-&>1<a-space><a-gt> ]
         # deindent closing brace(s) when after cursor
-        try %[ execute-keys -draft <a-x> <a-k>^\h*[})]+\h*$<ret> hm <a-S> 1<a-&> ]
+        try %[ execute-keys -draft <a-x> <a-k> ^\h*[})] <ret> gh / [})] <ret> m <a-S> 1<a-&> ]
     =
 ~
 
-- 
cgit v1.2.3