Merge pull request #2930 from marchaefner/Issue1057

Fixes #1057: Allow catch/finally in single line functions.

lib/coffee-script/rewriter.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 1.6.2
 (function() {
-  var BALANCED_PAIRS, EXPRESSION_CLOSE, EXPRESSION_END, EXPRESSION_START, IMPLICIT_BLOCK, IMPLICIT_CALL, IMPLICIT_END, IMPLICIT_FUNC, IMPLICIT_UNSPACED_CALL, INVERSES, LINEBREAKS, SINGLE_CLOSERS, SINGLE_LINERS, generate, left, rite, _i, _len, _ref,
+  var BALANCED_PAIRS, EXPRESSION_CLOSE, EXPRESSION_END, EXPRESSION_START, IMPLICIT_CALL, IMPLICIT_END, IMPLICIT_FUNC, IMPLICIT_UNSPACED_CALL, INVERSES, LINEBREAKS, SINGLE_CLOSERS, SINGLE_LINERS, generate, left, rite, _i, _len, _ref,
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
     __slice = [].slice;
 
@@ -358,8 +358,8 @@
       var action, condition, indent, outdent, starter;
       starter = indent = outdent = null;
       condition = function(token, i) {
-        var _ref;
-        return token[1] !== ';' && (_ref = token[0], __indexOf.call(SINGLE_CLOSERS, _ref) >= 0) && !(token[0] === 'ELSE' && (starter !== 'IF' && starter !== 'THEN'));
+        var _ref, _ref1;
+        return token[1] !== ';' && (_ref = token[0], __indexOf.call(SINGLE_CLOSERS, _ref) >= 0) && !(token[0] === 'ELSE' && starter !== 'THEN') && !(((_ref1 = token[0]) === 'CATCH' || _ref1 === 'FINALLY') && (starter === '->' || starter === '=>'));
       };
       action = function(token, i) {
         return this.tokens.splice((this.tag(i - 1) === ',' ? i - 1 : i), 0, outdent);
@@ -474,8 +474,6 @@
 
   IMPLICIT_UNSPACED_CALL = ['+', '-'];
 
-  IMPLICIT_BLOCK = ['->', '=>', '{', '[', ','];
-
   IMPLICIT_END = ['POST_IF', 'FOR', 'WHILE', 'UNTIL', 'WHEN', 'BY', 'LOOP', 'TERMINATOR'];
 
   SINGLE_LINERS = ['ELSE', '->', '=>', 'TRY', 'FINALLY', 'THEN'];

src/rewriter.coffee

@@ -362,7 +362,8 @@ class exports.Rewriter
 
     condition = (token, i) ->
       token[1] isnt ';' and token[0] in SINGLE_CLOSERS and
-      not (token[0] is 'ELSE' and starter not in ['IF', 'THEN'])
+      not (token[0] is 'ELSE' and starter isnt 'THEN') and
+      not (token[0] in ['CATCH', 'FINALLY'] and starter in ['->', '=>'])
 
     action = (token, i) ->
       @tokens.splice (if @tag(i - 1) is ',' then i - 1 else i), 0, outdent
@@ -465,9 +466,6 @@ IMPLICIT_CALL    = [
 
 IMPLICIT_UNSPACED_CALL = ['+', '-']
 
-# Tokens indicating that the implicit call must enclose a block of expressions.
-IMPLICIT_BLOCK   = ['->', '=>', '{', '[', ',']
-
 # Tokens that always mark the end of an implicit call for single-liners.
 IMPLICIT_END     = ['POST_IF', 'FOR', 'WHILE', 'UNTIL', 'WHEN', 'BY',
   'LOOP', 'TERMINATOR']

test/control_flow.coffee

@@ -438,3 +438,7 @@ test "#2555, strange function if bodies", ->
 
   failure() if try
     false
+
+test "#1057: `catch` or `finally` in single-line functions", ->
+  ok do -> try throw 'up' catch then yes
+  ok do -> try yes finally 'nothing'