Merge pull request #3324 from xixixao/issue1871

Fixes #1871, close implicit objects in implicit returns

Author: michaelficarra

lib/coffee-script/lexer.js

@@ -302,7 +302,8 @@ class exports.Rewriter
             endImplicitCall()
           # Close implicit objects such as:
           # return a: 1, b: 2 unless true
-          else if inImplicitObject() and sameLine and not startsLine
+          else if inImplicitObject() and sameLine and
+                  tag isnt 'TERMINATOR' and prevTag isnt ':'
             endImplicitObject()
           # Close implicit objects when at end of line, line didn't end with a comma
           # and the implicit object didn't start the line or the next line doesn't look like

lib/coffee-script/rewriter.js

@@ -387,6 +387,23 @@ test "#1871: Special case for IMPLICIT_END in the middle of an implicit object",
 
   eq result.two.join(' '), '2 2 2'
 
+test "#1871: implicit object closed by IMPLICIT_END in implicit returns", ->
+  ob = do ->
+    a: 1 if no
+  eq ob, undefined
+
+  # instead these return an object
+  func = ->
+    key:
+      i for i in [1, 2, 3]
+
+  eq func().key.join(' '), '1 2 3'
+
+  func = ->
+    key: (i for i in [1, 2, 3])
+
+  eq func().key.join(' '), '1 2 3'
+
 test "#1961, #1974, regression with compound assigning to an implicit object", ->
 
   obj = null