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: [PATCH] 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> }
     }
 }