fix: MethodArgumentSpaceFixer inject new line after trailing space on…

… current line
PHP-CS-Fixer · Sep 26, 2023 · 4c8d48a · 4c8d48a
1 parent 573ab70
commit 4c8d48a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/Fixer/FunctionNotation/MethodArgumentSpaceFixer.php b/src/Fixer/FunctionNotation/MethodArgumentSpaceFixer.php
@@ -360,6 +360,10 @@ private function fixNewline(Tokens $tokens, int $index, string $indentation, boo
         if ($tokens[$index + 2]->isComment()) {
             $nextMeaningfulTokenIndex = $tokens->getNextMeaningfulToken($index + 2);
             if (!$this->isNewline($tokens[$nextMeaningfulTokenIndex - 1])) {
+                if ($tokens[$nextMeaningfulTokenIndex - 1]->isWhitespace()) {
+                    $tokens->clearAt($nextMeaningfulTokenIndex - 1);
+                }
+
                 $tokens->ensureWhitespaceAtIndex($nextMeaningfulTokenIndex, 0, $this->whitespacesConfig->getLineEnding().$indentation);
             }
 

diff --git a/tests/Fixer/FunctionNotation/MethodArgumentSpaceFixerTest.php b/tests/Fixer/FunctionNotation/MethodArgumentSpaceFixerTest.php
@@ -1004,6 +1004,20 @@ function foo(
         $f);# comment4
 ',
         ];
+
+        yield [
+            '<?php
+foo(
+    /* bar */
+    "baz"
+);
+            ',
+            '<?php
+foo(
+    /* bar */ "baz"
+);
+            ',
+        ];
     }
 
     /**