From 94ab56d123c07b0318583ac10d45706a1729e58f Mon Sep 17 00:00:00 2001
From: John Isom <John.Isom2001@gmail.com>
Date: Tue, 28 Jul 2020 14:18:09 -0600
Subject: Fix indentation rule for php.kak

---
 rc/filetype/php.kak | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/rc/filetype/php.kak b/rc/filetype/php.kak
index e296b4fa..6ecd8728 100644
--- a/rc/filetype/php.kak
+++ b/rc/filetype/php.kak
@@ -23,7 +23,7 @@ hook -group php-highlight global WinSetOption filetype=php %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/php-file }
 }
 
-provide-module php %(
+provide-module php %§
 require-module html
 
 # Highlighters
@@ -93,7 +93,9 @@ define-command -hidden php-indent-on-new-line %<
         try %_ execute-keys -draft k <a-x> <a-k> ^\h*[[{]|[[{]$ <ret> j <a-gt> _
         # append " * " on lines starting a multiline /** or /* comment
     	try %{ execute-keys -draft k <a-x> s ^\h*/[*][* ]? <ret> j gi i <space>*<space> }
+    	# deindent closer token(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 70e68e3064a46583cfda7ab666cb5878636088e9 Mon Sep 17 00:00:00 2001
From: John Isom <John.Isom2001@gmail.com>
Date: Tue, 28 Jul 2020 16:07:03 -0600
Subject: Update deindenting in php.kak

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

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

diff --git a/rc/filetype/php.kak b/rc/filetype/php.kak
index 6ecd8728..9b43bb68 100644
--- a/rc/filetype/php.kak
+++ b/rc/filetype/php.kak
@@ -94,7 +94,7 @@ define-command -hidden php-indent-on-new-line %<
         # append " * " on lines starting a multiline /** or /* comment
     	try %{ execute-keys -draft k <a-x> s ^\h*/[*][* ]? <ret> j gi i <space>*<space> }
     	# deindent closer token(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*[})]+\h*(?://.*)?$<ret> <a-/> [})] <ret> m <a-S> 1<a-&> _
     >
 >
 
-- 
cgit v1.2.3


From b87b1bd32d5ea65dccc5bf22149e394ef84cf31a Mon Sep 17 00:00:00 2001
From: John Isom <John.Isom2001@gmail.com>
Date: Tue, 28 Jul 2020 20:49:17 -0600
Subject: Update deindenting in php.kak

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

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

diff --git a/rc/filetype/php.kak b/rc/filetype/php.kak
index 9b43bb68..3c922e78 100644
--- a/rc/filetype/php.kak
+++ b/rc/filetype/php.kak
@@ -94,7 +94,7 @@ define-command -hidden php-indent-on-new-line %<
         # append " * " on lines starting a multiline /** or /* comment
     	try %{ execute-keys -draft k <a-x> s ^\h*/[*][* ]? <ret> j gi i <space>*<space> }
     	# deindent closer token(s) when after cursor
-    	try %_ execute-keys -draft <a-x> <a-k>^\h*[})]+\h*(?://.*)?$<ret> <a-/> [})] <ret> m <a-S> 1<a-&> _
+    	try %_ execute-keys -draft <a-x> <a-k>^\h*[})]+\h*(?://.*)?$<ret> \; <a-/> [})] <ret> m <a-S> 1<a-&> _
     >
 >
 
-- 
cgit v1.2.3


From a5a3ce9e1bd264088c2afd99d3acfb3e031ead38 Mon Sep 17 00:00:00 2001
From: John Isom <John.Isom2001@gmail.com>
Date: Tue, 28 Jul 2020 20:49:42 -0600
Subject: Fix already-existing error in php.kak

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

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

diff --git a/rc/filetype/php.kak b/rc/filetype/php.kak
index 3c922e78..075b0eb8 100644
--- a/rc/filetype/php.kak
+++ b/rc/filetype/php.kak
@@ -77,7 +77,7 @@ define-command -hidden php-trim-indent %{
 define-command -hidden php-indent-on-char %<
     evaluate-commands -draft -itersel %<
         # align closer token to its opener when alone on a line
-        try %/ execute-keys -draft <a-h> <a-k> ^\h+[]}]$ <ret> m s \A|.\z <ret> 1<a-&> /
+        try %/ execute-keys -draft <a-h> <a-k> ^\h+[\]}]$ <ret> m s \A|.\z <ret> 1<a-&> /
     >
 >
 
-- 
cgit v1.2.3


From 9d4e33c775c160d7965a7aab89a2bc043c2a5b72 Mon Sep 17 00:00:00 2001
From: John Isom <John.Isom2001@gmail.com>
Date: Wed, 29 Jul 2020 09:40:58 -0600
Subject: Clean up my previous updates

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

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

diff --git a/rc/filetype/php.kak b/rc/filetype/php.kak
index 075b0eb8..770a4b60 100644
--- a/rc/filetype/php.kak
+++ b/rc/filetype/php.kak
@@ -94,7 +94,7 @@ define-command -hidden php-indent-on-new-line %<
         # append " * " on lines starting a multiline /** or /* comment
     	try %{ execute-keys -draft k <a-x> s ^\h*/[*][* ]? <ret> j gi i <space>*<space> }
     	# deindent closer token(s) when after cursor
-    	try %_ execute-keys -draft <a-x> <a-k>^\h*[})]+\h*(?://.*)?$<ret> \; <a-/> [})] <ret> m <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