From 5b99ef3197f4216fc8d04d08e2b026af732d7e98 Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Fri, 9 Sep 2016 15:23:06 +0200
Subject: [PATCH 1/4] disable hooks

---
 rc/base/ruby.kak | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rc/base/ruby.kak b/rc/base/ruby.kak
index e6f7fab9..7abc7e83 100644
--- a/rc/base/ruby.kak
+++ b/rc/base/ruby.kak
@@ -107,7 +107,7 @@ def ruby-alternative-file -docstring 'Jump to the alternate file (implementation
 }}
 
 def -hidden _ruby_filter_around_selections %{
-    eval -draft -itersel %{
+    eval -no-hooks -draft -itersel %{
         exec <a-x>
         # remove trailing white spaces
         try %{ exec -draft s \h + $ <ret> d }
@@ -115,7 +115,7 @@ def -hidden _ruby_filter_around_selections %{
 }
 
 def -hidden _ruby_indent_on_char %{
-    eval -draft -itersel %{
+    eval -no-hooks -draft -itersel %{
         # align middle and end structures to start
         try %{ exec -draft <a-x> <a-k> ^ \h * (else|elsif) $ <ret> <a-\;> <a-?> ^ \h * (if)                                                       <ret> s \A | \Z <ret> \' <a-&> }
         try %{ exec -draft <a-x> <a-k> ^ \h * (when)       $ <ret> <a-\;> <a-?> ^ \h * (case)                                                     <ret> s \A | \Z <ret> \' <a-&> }
@@ -125,7 +125,7 @@ def -hidden _ruby_indent_on_char %{
 }
 
 def -hidden _ruby_indent_on_new_line %{
-    eval -draft -itersel %{
+    eval -no-hooks -draft -itersel %{
         # preserve previous line indent
         try %{ exec -draft K <a-&> }
         # filter previous line
@@ -136,7 +136,7 @@ def -hidden _ruby_indent_on_new_line %{
 }
 
 def -hidden _ruby_insert_on_new_line %{
-    eval -draft -itersel %{
+    eval -no-hooks -draft -itersel %{
         # copy _#_ comment prefix and following white spaces
         try %{ exec -draft k x s ^ \h * \K \# \h * <ret> y j p }
         # wisely add end structure

From 6e634c680add01b37112c567ae78783dda710c83 Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Fri, 9 Sep 2016 15:36:45 +0200
Subject: [PATCH 2/4] fixes 'end' insertion

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

diff --git a/rc/base/ruby.kak b/rc/base/ruby.kak
index 7abc7e83..30daf3ba 100644
--- a/rc/base/ruby.kak
+++ b/rc/base/ruby.kak
@@ -142,7 +142,7 @@ def -hidden _ruby_insert_on_new_line %{
         # wisely add end structure
         eval -save-regs x %{
             try %{ exec -draft k x s ^ \h + <ret> \" x y } catch %{ reg x '' }
-            try %{ exec -draft k x <a-k> ^ <c-r> x (begin|case|class|def|do|for|if|module|unless|until|while) <ret> j <a-a> i X <a-\;> K <a-K> ^ <c-r> x (for|function|if|while) . * \n <c-r> x end $ <ret> j x y p j a end <esc> <a-lt> }
+            try %{ exec -draft k x <a-k> ^ <c-r> x (begin|case|class|def|do|for|if|module|unless|until|while) <ret> j <a-a> i X <a-\;> K <a-K> ^ <c-r> x (begin|case|class|def|do|for|if|module|unless|until|while) . * \n <c-r> x end $ <ret> j x y p j a end <esc> <a-lt> }
         }
     }
 }

From bb911cc229e5f694cd5a28976cddc7e7229aa568 Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Fri, 16 Sep 2016 10:54:53 +0200
Subject: [PATCH 3/4] fixes symbol highlighting

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

diff --git a/rc/base/ruby.kak b/rc/base/ruby.kak
index 30daf3ba..8790ff0f 100644
--- a/rc/base/ruby.kak
+++ b/rc/base/ruby.kak
@@ -51,7 +51,7 @@ addhl -group /ruby/comment fill comment
 
 addhl -group /ruby/literal fill meta
 
-addhl -group /ruby/code regex \b([A-Za-z]\w*:)|([$@][A-Za-z]\w*)|(\W\K:[A-Za-z]\w*[=?!]?) 0:identifier
+addhl -group /ruby/code regex \b([A-Za-z]\w*:(?=[^:]))|([$@][A-Za-z]\w*)|((?<=[^:]):[A-Za-z]\w*[=?!]?) 0:identifier
 
 %sh{
     # Grammar

From e18d145f9606f27a33d3a8c0b4d6842fd6bb2656 Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Fri, 16 Sep 2016 11:12:02 +0200
Subject: [PATCH 4/4] highlight :: operator

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

diff --git a/rc/base/ruby.kak b/rc/base/ruby.kak
index 8790ff0f..c137cf94 100644
--- a/rc/base/ruby.kak
+++ b/rc/base/ruby.kak
@@ -51,7 +51,7 @@ addhl -group /ruby/comment fill comment
 
 addhl -group /ruby/literal fill meta
 
-addhl -group /ruby/code regex \b([A-Za-z]\w*:(?=[^:]))|([$@][A-Za-z]\w*)|((?<=[^:]):[A-Za-z]\w*[=?!]?) 0:identifier
+addhl -group /ruby/code regex \b([A-Za-z]\w*:(?=[^:]))|([$@][A-Za-z]\w*)|((?<=[^:]):[A-Za-z]\w*[=?!]?)|([A-Z]\w*|^|\h)\K::(?=[A-Z]) 0:identifier
 
 %sh{
     # Grammar