better checking of auto-split-margins re: unbreakable lines

src/Line.php

@@ -155,13 +155,12 @@ public function autoAddMargins() : void
     {
         $tmp = clone $this;
         $output = '';
+        $tmp->append($output);
 
-        if ($tmp->fitsOnSingleLine($output)) {
-            return;
+        if ($tmp->lines || strpos(trim($output), $this->eol)) {
+            $this->addMarginAbove();
+            $this->addMarginBelow();
         }
-
-        $this->addMarginAbove();
-        $this->addMarginBelow();
     }
 
     public function append(string &$output) : void

src/Printer.php

@@ -2047,6 +2047,7 @@ protected function escapeString(
             $hex = dechex(ord($matches[0]));
             return '\x' . str_pad($hex, 2, '0', STR_PAD_LEFT);
         };
+
         return preg_replace_callback($regex, $callback, $escaped);
     }
 

src/Styler.php

@@ -590,6 +590,10 @@ protected function sClassPropertyEnd(P\ClassProperty $end) : void
 
     protected function sClosure(P\Closure $p) : void
     {
+        if (! $this->nesting->in(P\Args::class)) {
+            $this->line->addMarginAbove();
+        }
+
         $this->line[] = $p->static ? 'static function ' : 'function ';
     }
 
@@ -624,6 +628,10 @@ protected function sClosureBodyEnd(P\Body $p) : void
         $this->line->allowMarginAbove(false);
         $this->outdent();
         $this->line[] = '}';
+
+        if (! $this->nesting->in(P\Args::class)) {
+            $this->line->addMarginBelow();
+        }
     }
 
     protected function sClosureBodyEmpty(P\BodyEmpty $p) : void
@@ -906,6 +914,7 @@ protected function sGoto(P\Goto_ $p) : void
 
     protected function sHaltCompiler(P\HaltCompiler $p) : void
     {
+        $this->line->allowMarginAbove(false);
         $this->line[] = '__halt_compiler();';
     }
 
@@ -1054,13 +1063,14 @@ protected function sInfixEnd(P\Infix $p) : void
 
     protected function sInlineHtml(P\InlineHtml $p) : void
     {
+        $this->line->allowMarginAbove(false);
         $this->line[] = '?>' . ($p->newline ? $this->eol : '');
     }
 
     protected function sInlineHtmlEnd(P\InlineHtml $p) : void
     {
         $this->line[] = '<?php';
-        $this->newline();
+        $this->newlineWithoutMargins();
     }
 
     protected function sInstanceOp(P\InstanceOp $p) : void

tests/Examples/auto-blank-lines.php

@@ -1,4 +1,11 @@
 <?php
+/**
+ *
+ * Short line
+ * Also a short line
+ * A very very very very very very very very very very very very very very very very very very long line
+ *
+ */
 if (true) {
     $foo1->language
         ->evaluate(

tests/Examples/comments-inline.php

@@ -34,14 +34,19 @@ function foo()
 
 // set matcher callbacks
 $this->htmlAttrMatcher = /** @param array<array-key, string> $matches */
+
 function (array $matches) : string {
     return $this->htmlAttrMatcher($matches);
 };
+
 $this->jsMatcher = /** @param array<array-key, string> $matches */
+
 function (array $matches) : string {
     return $this->jsMatcher($matches);
 };
+
 $this->cssMatcher = /** @param array<array-key, string> $matches */
+
 function (array $matches) : string {
     return $this->cssMatcher($matches);
 };

tests/Examples/other-expr.php

@@ -2,7 +2,9 @@
 print "hello";
 print (1 + 2) * 3;
 (print "hello") && false;
-function () {
+
+$foo = function () {
     yield from $foo;
 };
+
 @suppressError();

tests/Examples/quoted-strings.php

@@ -7,9 +7,13 @@
 $foo = "this\nthat";
 $foo = "zim\"zim\"zim";
 $foo = 'zim\'zim\'zim';
+
 $foo = 'foo
     bar
     baz';
+
 $foo = "foo
     bar
     baz";
+
+$foo = "\nfoo\nbar";

tests/LineTest.php

@@ -52,7 +52,6 @@ public function testOffsetUnset() : void
     public function testNoSuchSplit() : void
     {
         $this->line[] = 'fake fake fake fake fake fake fake fake fake fake fake fake fake fake fake fake fake fake ';
-
         $this->line[] = new Split(0, 'fake', 'fake', null);
         $output = '';
         $this->expectException(Exception::class);