feat: update chain breaking heuristic (#1437)

* WIP update chain breaking heuristic

* fix: only consider expression statements, fix tests

Co-authored-by: Christian Zosel <christian@zosel.ch>

Author: karptonite

src/printer.js

@@ -395,6 +395,12 @@ function printMemberChain(path, options, print) {
   //    $foo->Data['key']("foo")
   //      ->method();
   //
+  // 3. expression statements with variable names shorter than the tab width
+  //
+  // Example:
+  // $foo->bar()
+  //     ->baz()
+  //     ->buzz()
 
   function shouldNotWrap(groups) {
     const hasComputed =
@@ -404,11 +410,17 @@ function printMemberChain(path, options, print) {
       const firstNode = groups[0][0].node;
 
       return (
-        (firstNode.kind === "variable" && firstNode.name === "this") ||
+        (firstNode.kind === "variable" &&
+          (firstNode.name === "this" ||
+            (isExpressionStatement && isShort(firstNode.name)))) ||
         isReferenceLikeNode(firstNode)
       );
     }
 
+    function isShort(name) {
+      return name.length < options.tabWidth;
+    }
+
     const lastNode = getLast(groups[0]).node;
 
     return (
@@ -419,6 +431,8 @@ function printMemberChain(path, options, print) {
     );
   }
 
+  const isExpressionStatement =
+    path.getParentNode().kind === "expressionstatement";
   const shouldMerge =
     groups.length >= 2 && !groups[1][0].node.comments && shouldNotWrap(groups);
 

tests/call/__snapshots__/jsfmt.spec.js.snap

@@ -602,23 +602,21 @@ string
 string
 string');
 
-$a
-    ->call(
-        $a,
-        '
+$a->call(
+    $a,
+    '
 string
 string
 string',
-        $c
-    )
-    ->call(
-        $a,
-        '
+    $c
+)->call(
+    $a,
+    '
 string
 string
 string',
-        $c
-    );
+    $c
+);
 
 call("string $var string");
 call("string $var string");

tests/comments/__snapshots__/jsfmt.spec.js.snap

@@ -710,10 +710,8 @@ $var = $a /* Comment */
 
 $a /* Comment*/->/*Comment*/ bar /* Comment */;
 $a /* Comment */['test'];
-$a /* Comment */
-    ->/* Comment */ bar();
-$a /* Comment */
-    ::/* Comment */ bar();
+$a /* Comment */->/* Comment */ bar();
+$a /* Comment */::/* Comment */ bar();
 
 ================================================================================
 `;

tests/member_chain/__snapshots__/jsfmt.spec.js.snap

@@ -372,6 +372,14 @@ $a->b->a();
 $a->b()->c()->d();
 $a->b->c->d;
 
+// should inline
+$t->shouldReceive( 'signUp' )->with( anInstanceOf( 'Foo\\\\Bar\\\\Baz' ), $this->app['foo.bar.baz']->getEmail())->once();
+$te->shouldReceive( 'signUp' )->with( anInstanceOf( 'Foo\\\\Bar\\\\Baz' ), $this->app['foo.bar.baz']->getEmail())->once();
+$tes->shouldReceive( 'signUp' )->with( anInstanceOf( 'Foo\\\\Bar\\\\Baz' ), $this->app['foo.bar.baz']->getEmail())->once();
+// should break
+$test->shouldReceive( 'signUp' )->with( anInstanceOf( 'Foo\\\\Bar\\\\Baz' ), $this->app['foo.bar.baz']->getEmail())->once();
+$a = $t->shouldReceive( 'signUp' )->with( anInstanceOf( 'Foo\\\\Bar\\\\Baz' ), $this->app['foo.bar.baz']->getEmail())->once();
+
 $this->loooooooooooong->lookup = (int) $this->getRequest()->getParam(
     'some-param'
 );
@@ -468,12 +476,31 @@ $a->a()->b();
 $a->a()->b();
 $a->a()->b;
 $a->b->a();
-$a
-    ->b()
+$a->b()
     ->c()
     ->d();
 $a->b->c->d;
 
+// should inline
+$t->shouldReceive('signUp')
+    ->with(anInstanceOf('Foo\\\\Bar\\\\Baz'), $this->app['foo.bar.baz']->getEmail())
+    ->once();
+$te->shouldReceive('signUp')
+    ->with(anInstanceOf('Foo\\\\Bar\\\\Baz'), $this->app['foo.bar.baz']->getEmail())
+    ->once();
+$tes->shouldReceive('signUp')
+    ->with(anInstanceOf('Foo\\\\Bar\\\\Baz'), $this->app['foo.bar.baz']->getEmail())
+    ->once();
+// should break
+$test
+    ->shouldReceive('signUp')
+    ->with(anInstanceOf('Foo\\\\Bar\\\\Baz'), $this->app['foo.bar.baz']->getEmail())
+    ->once();
+$a = $t
+    ->shouldReceive('signUp')
+    ->with(anInstanceOf('Foo\\\\Bar\\\\Baz'), $this->app['foo.bar.baz']->getEmail())
+    ->once();
+
 $this->loooooooooooong->lookup = (int) $this->getRequest()->getParam(
     'some-param'
 );

tests/member_chain/member_chain.php

@@ -33,6 +33,14 @@
 $a->b()->c()->d();
 $a->b->c->d;
 
+// should inline
+$t->shouldReceive( 'signUp' )->with( anInstanceOf( 'Foo\\Bar\\Baz' ), $this->app['foo.bar.baz']->getEmail())->once();
+$te->shouldReceive( 'signUp' )->with( anInstanceOf( 'Foo\\Bar\\Baz' ), $this->app['foo.bar.baz']->getEmail())->once();
+$tes->shouldReceive( 'signUp' )->with( anInstanceOf( 'Foo\\Bar\\Baz' ), $this->app['foo.bar.baz']->getEmail())->once();
+// should break
+$test->shouldReceive( 'signUp' )->with( anInstanceOf( 'Foo\\Bar\\Baz' ), $this->app['foo.bar.baz']->getEmail())->once();
+$a = $t->shouldReceive( 'signUp' )->with( anInstanceOf( 'Foo\\Bar\\Baz' ), $this->app['foo.bar.baz']->getEmail())->once();
+
 $this->loooooooooooong->lookup = (int) $this->getRequest()->getParam(
     'some-param'
 );