Fix #4533: chained calls incorrectly wrapping enclosing implicit obje…

…cts (#4534)

src/rewriter.coffee

@@ -149,9 +149,12 @@ exports.Rewriter = class Rewriter
       forward   = (n) -> i - startIdx + n
 
       # Helper functions
-      inImplicit        = -> stackTop()?[2]?.ours
-      inImplicitCall    = -> inImplicit() and stackTop()?[0] is '('
-      inImplicitObject  = -> inImplicit() and stackTop()?[0] is '{'
+      isImplicit        = (stackItem) -> stackItem?[2]?.ours
+      isImplicitObject  = (stackItem) -> isImplicit(stackItem) and stackItem?[0] is '{'
+      isImplicitCall    = (stackItem) -> isImplicit(stackItem) and stackItem?[0] is '('
+      inImplicit        = -> isImplicit stackTop()
+      inImplicitCall    = -> isImplicitCall stackTop()
+      inImplicitObject  = -> isImplicitObject stackTop()
       # Unclosed control statement inside implicit parens (like
       # class declaration or if-conditionals)
       inImplicitControl = -> inImplicit and stackTop()?[0] is 'CONTROL'
@@ -298,7 +301,10 @@ exports.Rewriter = class Rewriter
       #     .g b
       #     .h a
 
-      stackTop()[2].sameLine = no if inImplicitObject() and tag in LINEBREAKS
+      # Mark all enclosing objects as not sameLine
+      if tag in LINEBREAKS
+        for stackItem in stack by -1 when isImplicitObject stackItem
+          stackItem[2].sameLine = no
 
       newLine = prevTag is 'OUTDENT' or prevToken.newLine
       if tag in IMPLICIT_END or tag in CALL_CLOSERS and newLine

test/formatting.coffee

@@ -128,6 +128,9 @@ test "indented heredoc", ->
 #   * single line arguments
 #   * inline function literal
 #   * inline object literal
+#
+# * chaining inside
+#   * implicit object literal
 
 test "chaining after outdent", ->
   id = (x) -> x
@@ -221,6 +224,14 @@ test "chaining should work within spilling ternary", ->
       .a
   eq 3, result.h
 
+test "method call chaining inside objects", ->
+  f = (x) -> c: 42
+  result =
+    a: f 1
+    b: f a: 1
+      .c
+  eq 42, result.b
+
 # Nested blocks caused by paren unwrapping
 test "#1492: Nested blocks don't cause double semicolons", ->
   js = CoffeeScript.compile '(0;0)'