Fixes jashkenas#1871, close implicit objects in implicit returns

Author: xixixao

lib/coffee-script/lexer.js

@@ -302,7 +302,7 @@ 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'
             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:
+      for i in [1, 2, 3] then i
+
+  eq func().key.join(' '), '1 2 3'
+  
+  func = ->
+    key: (for i in [1, 2, 3] then i)
+
+  eq func().key.join(' '), '1 2 3'
+
 test "#1961, #1974, regression with compound assigning to an implicit object", ->
 
   obj = null
@@ -405,12 +422,6 @@ test "#1961, #1974, regression with compound assigning to an implicit object", -
 
   eq obj.four, 4
 
-test "#2207: Immediate implicit closes don't close implicit objects", ->
-  func = ->
-    key: for i in [1, 2, 3] then i
-
-  eq func().key.join(' '), '1 2 3'
-
 test 'inline implicit object literals within multiline implicit object literals', ->
   x =
     a: aa: 0