Fixes #1871, allows single-line implicit ends to close implicit objects.

Author: jashkenas

lib/coffee-script/rewriter.js

@@ -103,13 +103,15 @@ class exports.Rewriter
     stack       = []
     start       = null
     startsLine  = null
+    sameLine    = yes
     startIndent = 0
 
     condition = (token, i) ->
       [one, two, three] = @tokens[i + 1 .. i + 3]
-      return false if 'HERECOMMENT' is one?[0]
+      return no if 'HERECOMMENT' is one?[0]
       [tag] = token
-      (tag in ['TERMINATOR', 'OUTDENT'] and
+      sameLine = no if tag in LINEBREAKS
+      ((tag in ['TERMINATOR', 'OUTDENT'] or (tag in IMPLICIT_END and sameLine)) and
           ((!startsLine and @tag(i - 1) isnt ',') or 
           not (two?[0] is ':' or one?[0] is '@' and three?[0] is ':'))) or
         (tag is ',' and one and
@@ -129,6 +131,7 @@ class exports.Rewriter
         return 1
       return 1 unless tag is ':' and
         ((ago = @tag i - 2) is ':' or stack[stack.length - 1]?[0] isnt '{')
+      sameLine = yes
       stack.push ['{']
       idx =  if ago is '@' then i - 2 else i - 1
       idx -= 2 while @tag(idx - 2) is 'HERECOMMENT'

src/rewriter.coffee

@@ -237,3 +237,17 @@ test "#1322: implicit call against implicit object with block comments", ->
 test "#1513: Top level bare objs need to be wrapped in parens for unary and existence ops", ->
   doesNotThrow -> CoffeeScript.run "{}?", bare: true
   doesNotThrow -> CoffeeScript.run "{}.a++", bare: true
+  
+test "#1871: Special case for IMPLICIT_END in the middle of an implicit object", ->
+  result = 'result'
+  ident = (x) -> x
+  
+  result = ident one: 1 if false
+  
+  eq result, 'result'
+
+  result = ident
+    one: 1
+    two: 2 for i in [1..3]
+    
+  eq result.two.join(' '), '2 2 2'