From d4d19c25908bd373b0af42ab6ec1cb458a126404 Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Wed, 3 Feb 2016 09:05:58 +0100
Subject: clean up

---
 rc/coffee.kak | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/rc/coffee.kak b/rc/coffee.kak
index b7732592..3d1020e0 100644
--- a/rc/coffee.kak
+++ b/rc/coffee.kak
@@ -50,8 +50,11 @@ addhl -group /coffee/code regex \<(break|case|catch|class|const|continue|debugge
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _coffee_filter_around_selections %{
-    # remove trailing white spaces
-    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
+    eval -draft -itersel %{
+        exec <a-x>
+        # remove trailing white spaces
+        try %{ exec -draft s \h + $ <ret> d }
+    }
 }
 
 def -hidden _coffee_indent_on_new_line %{
@@ -61,9 +64,9 @@ def -hidden _coffee_indent_on_new_line %{
         # filter previous line
         try %{ exec -draft k : _coffee_filter_around_selections <ret> }
         # copy '#' comment prefix and following white spaces
-        try %{ exec -draft k x s ^\h*\K#\h* <ret> y j p }
-        # indent after lines beginning with token and ending with ->
-        try %_ exec -draft k x <a-k> ^\h*(case|catch|class|else|finally|for|function|if|switch|try|while|with)|(->)$ <ret> j <a-gt> _
+        try %{ exec -draft k x s ^ \h * \K \# \h * <ret> y j p }
+        # indent after start structure
+        try %{ exec -draft k x <a-k> ^ \h * (case|catch|class|else|finally|for|function|if|switch|try|while|with) | (->) $ <ret> j <a-gt> }
     }
 }
 
-- 
cgit v1.2.3


From 85383e70836fcdc4741c8e2ce8313cccad33169c Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Wed, 3 Feb 2016 09:27:46 +0100
Subject: do not clear multiple selections when preserving previous line indent

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

diff --git a/rc/coffee.kak b/rc/coffee.kak
index 3d1020e0..ed1a042b 100644
--- a/rc/coffee.kak
+++ b/rc/coffee.kak
@@ -60,7 +60,7 @@ def -hidden _coffee_filter_around_selections %{
 def -hidden _coffee_indent_on_new_line %{
     eval -draft -itersel %{
         # preserve previous line indent
-        try %{ exec -draft <space> K <a-&> }
+        try %{ exec -draft K <a-&> }
         # filter previous line
         try %{ exec -draft k : _coffee_filter_around_selections <ret> }
         # copy '#' comment prefix and following white spaces
-- 
cgit v1.2.3


From 1aed03aaf9a6ff41b8a3f6bd1ceb2a77d87f72a1 Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Wed, 3 Feb 2016 09:12:26 +0100
Subject: make auto-indenting after start structure more robust

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

diff --git a/rc/coffee.kak b/rc/coffee.kak
index ed1a042b..2b343086 100644
--- a/rc/coffee.kak
+++ b/rc/coffee.kak
@@ -66,7 +66,7 @@ def -hidden _coffee_indent_on_new_line %{
         # copy '#' comment prefix and following white spaces
         try %{ exec -draft k x s ^ \h * \K \# \h * <ret> y j p }
         # indent after start structure
-        try %{ exec -draft k x <a-k> ^ \h * (case|catch|class|else|finally|for|function|if|switch|try|while|with) | (->) $ <ret> j <a-gt> }
+        try %{ exec -draft k x <a-k> ^ \h * (case|catch|class|else|finally|for|function|if|switch|try|while|with) \b | (->) $ <ret> j <a-gt> }
     }
 }
 
-- 
cgit v1.2.3


From f54ba102ad1026c8c47cd8cd4c18544db5963871 Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Wed, 3 Feb 2016 09:14:13 +0100
Subject: indent after lines ending with '='

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

diff --git a/rc/coffee.kak b/rc/coffee.kak
index 2b343086..a8bfb068 100644
--- a/rc/coffee.kak
+++ b/rc/coffee.kak
@@ -66,7 +66,7 @@ def -hidden _coffee_indent_on_new_line %{
         # copy '#' comment prefix and following white spaces
         try %{ exec -draft k x s ^ \h * \K \# \h * <ret> y j p }
         # indent after start structure
-        try %{ exec -draft k x <a-k> ^ \h * (case|catch|class|else|finally|for|function|if|switch|try|while|with) \b | (->) $ <ret> j <a-gt> }
+        try %{ exec -draft k x <a-k> ^ \h * (case|catch|class|else|finally|for|function|if|switch|try|while|with) \b | (=|->) $ <ret> j <a-gt> }
     }
 }
 
-- 
cgit v1.2.3


From dccaaa12d5f1d83ea34d906b819fd63e7a6bedf6 Mon Sep 17 00:00:00 2001
From: Alex Leferry 2 <alexherbo2@gmail.com>
Date: Wed, 3 Feb 2016 09:15:24 +0100
Subject: support commenting

---
 rc/coffee.kak | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rc/coffee.kak b/rc/coffee.kak
index a8bfb068..36171ded 100644
--- a/rc/coffee.kak
+++ b/rc/coffee.kak
@@ -1,6 +1,8 @@
 # http://coffeescript.org
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
+# require commenting.kak
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -78,6 +80,9 @@ hook global WinSetOption filetype=coffee %{
 
     hook window InsertEnd  .* -group coffee-hooks  _coffee_filter_around_selections
     hook window InsertChar \n -group coffee-indent _coffee_indent_on_new_line
+
+    set window comment_line_chars '#'
+    set window comment_selection_chars '###:###'
 }
 
 hook global WinSetOption filetype=(?!coffee).* %{
-- 
cgit v1.2.3