bug: Fix indentation of comment at end of switch case (#6493)

PHP-CS-Fixer · Aug 13, 2022 · b81e40f · b81e40f
1 parent 366dea2
commit b81e40f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/src/Fixer/Whitespace/StatementIndentationFixer.php b/src/Fixer/Whitespace/StatementIndentationFixer.php
@@ -143,10 +143,6 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
         foreach ($tokens as $index => $token) {
             $currentScope = \count($scopes) - 1;
 
-            if ($token->isComment()) {
-                continue;
-            }
-
             if (
                 $token->equalsAny($blockFirstTokens)
                 || ($token->equals('(') && !$tokens[$tokens->getPrevMeaningfulToken($index)]->isGivenKind(T_ARRAY))
@@ -271,20 +267,20 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
                     $indent = false;
 
                     if ($scopes[$currentScope]['is_indented_block']) {
-                        $firstMeaningFulTokenIndex = null;
+                        $firstNonWhitespaceTokenIndex = null;
                         $nextNewlineIndex = null;
                         for ($searchIndex = $index + 1, $max = \count($tokens); $searchIndex < $max; ++$searchIndex) {
                             $searchToken = $tokens[$searchIndex];
 
-                            if (!$searchToken->isWhitespace() && !$searchToken->isComment()) {
-                                if (null === $firstMeaningFulTokenIndex) {
-                                    $firstMeaningFulTokenIndex = $searchIndex;
+                            if (!$searchToken->isWhitespace()) {
+                                if (null === $firstNonWhitespaceTokenIndex) {
+                                    $firstNonWhitespaceTokenIndex = $searchIndex;
                                 }
 
                                 continue;
                             }
 
-                            if ($searchToken->isWhitespace() && Preg::match('/\R/', $searchToken->getContent())) {
+                            if (Preg::match('/\R/', $searchToken->getContent())) {
                                 $nextNewlineIndex = $searchIndex;
 
                                 break;
@@ -299,7 +295,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
                             }
 
                             if (
-                                (null !== $firstMeaningFulTokenIndex && $firstMeaningFulTokenIndex < $endIndex)
+                                (null !== $firstNonWhitespaceTokenIndex && $firstNonWhitespaceTokenIndex < $endIndex)
                                 || (null !== $nextNewlineIndex && $nextNewlineIndex < $endIndex)
                             ) {
                                 $indent = true;
@@ -372,7 +368,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
                 --$currentScope;
             }
 
-            if ($token->equalsAny([';', ',', '}', [T_OPEN_TAG], [T_CLOSE_TAG], [CT::T_ATTRIBUTE_CLOSE]])) {
+            if ($token->isComment() || $token->equalsAny([';', ',', '}', [T_OPEN_TAG], [T_CLOSE_TAG], [CT::T_ATTRIBUTE_CLOSE]])) {
                 continue;
             }
 
@@ -460,7 +456,7 @@ private function findCaseBlockEnd(Tokens $tokens, int $index): array
             }
 
             if ($tokens[$index]->equalsAny(['}', [T_ENDSWITCH]])) {
-                return [$tokens->getPrevMeaningfulToken($index), false];
+                return [$tokens->getPrevNonWhitespace($index), false];
             }
         }
 

diff --git a/tests/Fixer/Whitespace/StatementIndentationFixerTest.php b/tests/Fixer/Whitespace/StatementIndentationFixerTest.php
@@ -740,6 +740,26 @@ class Foo
   Baz {
     public function foo() {
     }
+}',
+        ];
+
+        yield 'comment at end of switch case' => [
+            '<?php
+switch ($foo) {
+    case 1:
+        // Nothing to do
+}',
+        ];
+
+        yield 'comment at end of switch default' => [
+            '<?php
+switch ($foo) {
+    case 1:
+        break;
+    case 2:
+        break;
+    default:
+        // Nothing to do
 }',
         ];
     }