fixing multiple single-line function forms on the same line

lib/rewriter.js

@@ -46,7 +46,7 @@
   // Single-line flavors of block expressions that have unclosed endings.
   // The grammar can't disambiguate them, so we insert the implicit indentation.
   SINGLE_LINERS = ['ELSE', "->", "=>", 'TRY', 'FINALLY', 'THEN'];
-  SINGLE_CLOSERS = ['TERMINATOR', 'CATCH', 'FINALLY', 'ELSE', 'OUTDENT', 'LEADING_WHEN', 'PARAM_START'];
+  SINGLE_CLOSERS = ['TERMINATOR', 'CATCH', 'FINALLY', 'ELSE', 'OUTDENT', 'LEADING_WHEN'];
   // Rewrite the token stream in multiple passes, one logical filter at
   // a time. This could certainly be changed into a single pass through the
   // stream, with a big ol' efficient switch, but it's much nicer like this.
@@ -239,7 +239,7 @@
   re.prototype.add_implicit_indentation = function add_implicit_indentation() {
     return this.scan_tokens((function(__this) {
       var __func = function(prev, token, post, i) {
-        var idx, insertion, parens, starter, tok;
+        var idx, insertion, parens, pre, starter, tok;
         if (!(SINGLE_LINERS.indexOf(token[0]) >= 0 && post[0] !== 'INDENT' && !(token[0] === 'ELSE' && post[0] === 'IF'))) {
           return 1;
         }
@@ -250,8 +250,9 @@
         while (true) {
           idx += 1;
           tok = this.tokens[idx];
-          if ((!tok || (SINGLE_CLOSERS.indexOf(tok[0]) >= 0 && tok[1] !== ';') || (tok[0] === ')' && parens === 0)) && !(starter === 'ELSE' && tok[0] === 'ELSE')) {
-            insertion = this.tokens[idx - 1][0] === "," ? idx - 1 : idx;
+          pre = this.tokens[idx - 1];
+          if ((!tok || (SINGLE_CLOSERS.indexOf(tok[0]) >= 0 && tok[1] !== ';') || (pre[0] === ',' && tok[0] === 'PARAM_START') || (tok[0] === ')' && parens === 0)) && !(starter === 'ELSE' && tok[0] === 'ELSE')) {
+            insertion = pre[0] === "," ? idx - 1 : idx;
             this.tokens.splice(insertion, 0, ['OUTDENT', 2, token[2]]);
             break;
           }

src/rewriter.coffee

@@ -37,7 +37,7 @@ for pair in BALANCED_PAIRS
 # Single-line flavors of block expressions that have unclosed endings.
 # The grammar can't disambiguate them, so we insert the implicit indentation.
 SINGLE_LINERS: ['ELSE', "->", "=>", 'TRY', 'FINALLY', 'THEN']
-SINGLE_CLOSERS: ['TERMINATOR', 'CATCH', 'FINALLY', 'ELSE', 'OUTDENT', 'LEADING_WHEN', 'PARAM_START']
+SINGLE_CLOSERS: ['TERMINATOR', 'CATCH', 'FINALLY', 'ELSE', 'OUTDENT', 'LEADING_WHEN']
 
 # Rewrite the token stream in multiple passes, one logical filter at
 # a time. This could certainly be changed into a single pass through the
@@ -177,11 +177,13 @@ re::add_implicit_indentation: ->
     while true
       idx += 1
       tok: @tokens[idx]
+      pre: @tokens[idx - 1]
       if (not tok or
           (SINGLE_CLOSERS.indexOf(tok[0]) >= 0 and tok[1] isnt ';') or
+          (pre[0] is ',' and tok[0] is 'PARAM_START') or
           (tok[0] is ')' && parens is 0)) and
           not (starter is 'ELSE' and tok[0] is 'ELSE')
-        insertion: if @tokens[idx - 1][0] is "," then idx - 1 else idx
+        insertion: if pre[0] is "," then idx - 1 else idx
         @tokens.splice(insertion, 0, ['OUTDENT', 2, token[2]])
         break
       parens += 1 if tok[0] is '('

test/test_functions.coffee

@@ -77,4 +77,10 @@ ok result is 25
 
 result: ("hello".slice) 3
 
-ok result is 'lo'
+ok result is 'lo'
+
+
+# And with multiple single-line functions on the same line.
+
+func: (x) -> (x) -> (x) -> x
+ok func(1)(2)(3) is 3