NoBreakCommentFixer - fix throw detect

Author: SpacePossum

src/Fixer/ControlStructure/NoBreakCommentFixer.php

@@ -131,8 +131,9 @@ private function fixCase(Tokens $tokens, $casePosition)
         $empty = true;
         $fallThrough = true;
         $commentPosition = null;
+        $caseColonIndex = $tokens->getNextTokenOfKind($casePosition, [':', ';']);
 
-        for ($i = $tokens->getNextTokenOfKind($casePosition, [':', ';']) + 1, $max = \count($tokens); $i < $max; ++$i) {
+        for ($i = $caseColonIndex + 1, $max = \count($tokens); $i < $max; ++$i) {
             if ($tokens[$i]->isGivenKind([T_SWITCH, T_IF, T_ELSE, T_ELSEIF, T_FOR, T_FOREACH, T_WHILE, T_DO, T_FUNCTION, T_CLASS])) {
                 $empty = false;
                 $i = $this->getStructureEnd($tokens, $i);
@@ -149,7 +150,7 @@ private function fixCase(Tokens $tokens, $casePosition)
             if ($tokens[$i]->isGivenKind([T_THROW])) {
                 $previousIndex = $tokens->getPrevMeaningfulToken($i);
 
-                if ($previousIndex === $casePosition || $tokens[$previousIndex]->equalsAny(['{', ';', [T_OPEN_TAG]])) {
+                if ($previousIndex === $caseColonIndex || $tokens[$previousIndex]->equalsAny(['{', ';', [T_OPEN_TAG]])) {
                     $fallThrough = false;
                 }
 

tests/Fixer/ControlStructure/NoBreakCommentFixerTest.php

@@ -858,6 +858,24 @@ public function provideTestFixCases()
         bar();
 }',
             ],
+            [
+                '<?php
+switch ($a) {
+    case 1:
+        throw new \Exception("");
+    case 2;
+        throw new \Exception("");
+    case 3:
+        throw new \Exception("");
+    case 4;
+        throw new \Exception("");
+    case 5:
+        throw new \Exception("");
+    case 6;
+        throw new \Exception("");
+}
+                ',
+            ],
         ];
     }
 
@@ -938,6 +956,39 @@ public function foo($bar)
         bar();
 }',
             ],
+            [
+                '<?php
+switch($a) {
+    case 1:
+        $a = function () { throw new \Exception(""); };
+        // no break
+    case 2:
+        $a = new class(){
+            public function foo () { throw new \Exception(""); }
+        };
+        // no break
+    case 3:
+        echo 5;
+        // no break
+    default:
+        echo 1;
+}
+                ',
+                '<?php
+switch($a) {
+    case 1:
+        $a = function () { throw new \Exception(""); };
+    case 2:
+        $a = new class(){
+            public function foo () { throw new \Exception(""); }
+        };
+    case 3:
+        echo 5;
+    default:
+        echo 1;
+}
+                ',
+            ],
         ];
     }