Implemented method call chaining

xixixao · xixixao · commit 15a70f863ce5 · 2013-11-27T03:41:52.000Z
diff --git a/lib/coffee-script/rewriter.js b/lib/coffee-script/rewriter.js
diff --git a/src/rewriter.coffee b/src/rewriter.coffee
@@ -131,7 +131,7 @@ class exports.Rewriter
 
     @scanTokens (token, i, tokens) ->
       [tag]     = token
-      [prevTag] = if i > 0 then tokens[i - 1] else []
+      [prevTag] = prevToken = if i > 0 then tokens[i - 1] else []
       [nextTag] = if i < tokens.length - 1 then tokens[i + 1] else []
       stackTop  = -> stack[stack.length - 1]
       startIdx  = i
@@ -275,7 +275,14 @@ class exports.Rewriter
       #       c
       #     .h a
       #
-      if prevTag is 'OUTDENT' and inImplicitCall() and tag in ['.', '?.', '::', '?::']
+      # and also
+      #
+      #     f a
+      #     .g b
+      #     .h a
+      #
+      if (prevTag is 'OUTDENT' or prevToken.newLine) and inImplicitCall() and
+          tag in ['.', '?.', '::', '?::']
         endImplicitCall()
         return forward(1)
 
diff --git a/test/formatting.coffee b/test/formatting.coffee
@@ -44,17 +44,47 @@ test "chained accesses split on period/newline, backwards and forwards", ->
     .reverse()
     .reverse()
   arrayEq ['c','b','a'], result
-  arrayEq ['c','b','a'], str
+  arrayEq ['c','b','a'],
+    str
     .split('')
     .reverse()
     .reverse()
     .reverse()
-  arrayEq ['c','b','a'], str.
+  arrayEq ['c','b','a'],
+    str.
     split('')
     .reverse().
     reverse()
     .reverse()
 
+test "#1495, method call chaining", ->
+  str = 'abc'
+
+  result = str.split ''
+              .join ', '
+  eq 'a, b, c', result
+
+  result = str
+  .split ''
+  .join ', '
+  eq 'a, b, c', result
+
+  eq 'a, b, c', (str
+    .split ''
+    .join ', '
+  )
+
+  eq 'abc',
+    'aaabbbccc'.replace /(\w)\1\1/g, '$1$1'
+               .replace /([abc])\1/g, '$1'
+
+  # Unreadable code, not a real-life use case
+  result = str.split ''.
+    split ''
+    .join('')
+    .join ', '
+  eq 'a, b, c', result
+
 # Operators
 
 test "newline suppression for operators", ->
@@ -65,9 +95,11 @@ test "newline suppression for operators", ->
   eq 6, six
 
 test "`?.` and `::` should continue lines", ->
-  ok not Date
-  ::
-  ?.foo
+  ok not (
+    Date
+    ::
+    ?.foo
+  )
   #eq Object::toString, Date?.
   #prototype
   #::
