From 02e625e8fb942121ba76448a33408890eadb4f07 Mon Sep 17 00:00:00 2001
From: Dmitry Matveyev <greenfork.lists@yandex.com>
Date: Sun, 6 Jun 2021 00:30:50 +0600
Subject: [PATCH] Remove electric behavior for end keyword

Correctly indentint on "end" keyword seems very hard,
it is simpler to remove it. And we already insert "end"
in ruby-insert-on-new-line hook, so the removal shouldn't
hurt too much.
---
 rc/filetype/ruby.kak                                        | 1 -
 .../4086-ruby-deindenting-other-lines-than-keywords/cmd     | 1 +
 .../4086-ruby-deindenting-other-lines-than-keywords/in      | 6 ++++++
 .../4086-ruby-deindenting-other-lines-than-keywords/out     | 6 ++++++
 .../4086-ruby-deindenting-other-lines-than-keywords/rc      | 3 +++
 5 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 test/regression/4086-ruby-deindenting-other-lines-than-keywords/cmd
 create mode 100644 test/regression/4086-ruby-deindenting-other-lines-than-keywords/in
 create mode 100644 test/regression/4086-ruby-deindenting-other-lines-than-keywords/out
 create mode 100644 test/regression/4086-ruby-deindenting-other-lines-than-keywords/rc

diff --git a/rc/filetype/ruby.kak b/rc/filetype/ruby.kak
index 8c6dea3f..00adaa68 100644
--- a/rc/filetype/ruby.kak
+++ b/rc/filetype/ruby.kak
@@ -156,7 +156,6 @@ define-command -hidden ruby-indent-on-char %{
         try %{ execute-keys -draft <a-x> <a-k> ^ \h * (elsif)  $ <ret> <a-a> i <a-semicolon> <a-?> ^ \h * (if)                                                    <ret> <a-S> 1<a-&> }
         try %{ execute-keys -draft <a-x> <a-k> ^ \h * (when)   $ <ret> <a-a> i <a-semicolon> <a-?> ^ \h * (case)                                                  <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-&> }
-        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-&> }
     }
 }
 
diff --git a/test/regression/4086-ruby-deindenting-other-lines-than-keywords/cmd b/test/regression/4086-ruby-deindenting-other-lines-than-keywords/cmd
new file mode 100644
index 00000000..af092ecb
--- /dev/null
+++ b/test/regression/4086-ruby-deindenting-other-lines-than-keywords/cmd
@@ -0,0 +1 @@
+c<space><space>end
diff --git a/test/regression/4086-ruby-deindenting-other-lines-than-keywords/in b/test/regression/4086-ruby-deindenting-other-lines-than-keywords/in
new file mode 100644
index 00000000..115984bf
--- /dev/null
+++ b/test/regression/4086-ruby-deindenting-other-lines-than-keywords/in
@@ -0,0 +1,6 @@
+class MyClass
+  def method
+%( )
+
+  expression
+end
diff --git a/test/regression/4086-ruby-deindenting-other-lines-than-keywords/out b/test/regression/4086-ruby-deindenting-other-lines-than-keywords/out
new file mode 100644
index 00000000..52988874
--- /dev/null
+++ b/test/regression/4086-ruby-deindenting-other-lines-than-keywords/out
@@ -0,0 +1,6 @@
+class MyClass
+  def method
+  end
+
+  expression
+end
diff --git a/test/regression/4086-ruby-deindenting-other-lines-than-keywords/rc b/test/regression/4086-ruby-deindenting-other-lines-than-keywords/rc
new file mode 100644
index 00000000..934f7e83
--- /dev/null
+++ b/test/regression/4086-ruby-deindenting-other-lines-than-keywords/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/ruby.kak"
+set buffer filetype ruby