FPPP: Fix visibility change with attributes

With the introduction of attributes, the visibility modifier isn't always at the start of the node anymore. As such, preserve any leaving whitespace. Fixes nikic#1117.

Author: nikic

lib/PhpParser/PrettyPrinterAbstract.php

@@ -678,8 +678,10 @@ protected function p(
  }
 
  [$printFn, $findToken] = $this->modifierChangeMap[$key];
+ $skipWSPos = $this->origTokens->skipRightWhitespace($pos);
+ $result .= $this->origTokens->getTokenCode($pos, $skipWSPos, $indentAdjustment);
  $result .= $this->$printFn($subNode);
- $pos = $this->origTokens->findRight($pos, $findToken);
+ $pos = $this->origTokens->findRight($skipWSPos, $findToken);
  continue;
  }
 

test/code/formatPreservation/modifierChange.test

@@ -66,3 +66,22 @@ $stmts[1]->expr->class->flags = 0;
 <?php
 readonly class {};
 class {};
+-----
+<?php
+class X {
+ #[A]
+ public function m() {}
+ /** A */
+ public function m2() {}
+}
+-----
+$stmts[0]->stmts[0]->flags = Modifiers::PROTECTED;
+$stmts[0]->stmts[1]->flags = Modifiers::PROTECTED;
+-----
+<?php
+class X {
+ #[A]
+ protected function m() {}
+ /** A */
+ protected function m2() {}
+}