Do not merge member chain if there's a comment in-between (#1218)

Fixes #1198
prettier · Apr 13, 2017 · 4a4e181 · 4a4e181
1 parent 5d8ffd0
commit 4a4e181
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/printer.js b/src/printer.js
@@ -2731,11 +2731,12 @@ function printMemberChain(path, options, print) {
   // letter, just a sequence of _$ or this. The rationale is that they are
   // likely to be factories.
   const shouldMerge =
+    groups.length >= 2 &&
+    !groups[1][0].node.comments &&
     groups[0].length === 1 &&
     (groups[0][0].node.type === "ThisExpression" ||
       (groups[0][0].node.type === "Identifier" &&
-        groups[0][0].node.name.match(/(^[A-Z])|^[_$]+$/))) &&
-    groups.length >= 2;
+        groups[0][0].node.name.match(/(^[A-Z])|^[_$]+$/)));
 
   function printGroup(printedGroup) {
     return concat(printedGroup.map(tuple => tuple.printed));

diff --git a/tests/method-chain/__snapshots__/jsfmt.spec.js.snap b/tests/method-chain/__snapshots__/jsfmt.spec.js.snap
@@ -165,6 +165,11 @@ _.a(
 _.a(
   a
 ) /* very very very very very very very long such that it is longer than 80 columns */.a();
+
+Something
+  // $FlowFixMe(>=0.41.0)
+  .getInstance(this.props.dao)
+  .getters()
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 function f() {
   return (
@@ -187,6 +192,11 @@ _.a(
   a
 ) /* very very very very very very very long such that it is longer than 80 columns */.a();
 
+Something
+  // $FlowFixMe(>=0.41.0)
+  .getInstance(this.props.dao)
+  .getters();
+
 `;
 
 exports[`first_long.js 1`] = `

diff --git a/tests/method-chain/comment.js b/tests/method-chain/comment.js
@@ -17,3 +17,8 @@ _.a(
 _.a(
   a
 ) /* very very very very very very very long such that it is longer than 80 columns */.a();
+
+Something
+  // $FlowFixMe(>=0.41.0)
+  .getInstance(this.props.dao)
+  .getters()