Refine sameLine implicit object tagging [Fixes #4568] (#4598)

jashkenas · Aug 3, 2017 · 2653b3b · 2653b3b
1 parent 64c790f
commit 2653b3b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/lib/coffeescript/rewriter.js b/lib/coffeescript/rewriter.js
diff --git a/src/rewriter.coffee b/src/rewriter.coffee
@@ -336,8 +336,9 @@ exports.Rewriter = class Rewriter
 
  # Mark all enclosing objects as not sameLine
  if tag in LINEBREAKS
- for stackItem in stack by -1 when isImplicitObject stackItem
- stackItem[2].sameLine = no
+ for stackItem in stack by -1
+ break unless isImplicit stackItem
+ stackItem[2].sameLine = no if isImplicitObject stackItem
 
  newLine = prevTag is 'OUTDENT' or prevToken.newLine
  if tag in IMPLICIT_END or tag in CALL_CLOSERS and newLine

diff --git a/test/formatting.coffee b/test/formatting.coffee
@@ -232,6 +232,16 @@ test "method call chaining inside objects", ->
  .c
  eq 42, result.b
 
+test "#4568: refine sameLine implicit object tagging", ->
+ condition = yes
+ fn = -> yes
+
+ x =
+ fn bar: {
+ foo: 123
+ } if not condition
+ eq x, undefined
+
 # Nested blocks caused by paren unwrapping
 test "#1492: Nested blocks don't cause double semicolons", ->
  js = CoffeeScript.compile '(0;0)'