JumpStatementsSpacingSniff: Fixed false positive

Author: kukulich

SlevomatCodingStandard/Sniffs/ControlStructures/AbstractControlStructureSpacing.php

@@ -226,18 +226,32 @@ protected function checkLinesAfter(File $phpcsFile, int $controlStructurePointer
 			return;
 		}
 
-		$hasCommentAfter = in_array(
-			$tokens[$notWhitespacePointerAfter]['code'],
-			Tokens::$commentTokens,
-			true
-		) && $tokens[$notWhitespacePointerAfter]['line'] === $tokens[$controlStructureEndPointer]['line'];
-		$pointerAfter = $hasCommentAfter
-			? TokenHelper::findNextExcluding($phpcsFile, T_WHITESPACE, $notWhitespacePointerAfter + 1)
-			: $notWhitespacePointerAfter;
-
-		$isLastControlStructure = in_array($tokens[$controlStructurePointer]['code'], [T_CASE, T_DEFAULT], true)
-			? $tokens[$pointerAfter]['code'] === T_CLOSE_CURLY_BRACKET
-			: in_array($tokens[$pointerAfter]['code'], [T_CLOSE_CURLY_BRACKET, T_CASE, T_DEFAULT], true);
+		$hasCommentAfter = in_array($tokens[$notWhitespacePointerAfter]['code'], Tokens::$commentTokens, true);
+		$isCommentAfterOnSameLine = false;
+		$pointerAfter = $notWhitespacePointerAfter;
+
+		$isControlStructureEndAfterPointer = static function (int $pointer) use ($tokens, $controlStructurePointer): bool {
+			return in_array($tokens[$controlStructurePointer]['code'], [T_CASE, T_DEFAULT], true)
+				? $tokens[$pointer]['code'] === T_CLOSE_CURLY_BRACKET
+				: in_array($tokens[$pointer]['code'], [T_CLOSE_CURLY_BRACKET, T_CASE, T_DEFAULT], true);
+		};
+
+		if ($hasCommentAfter) {
+			if ($tokens[$notWhitespacePointerAfter]['line'] === $tokens[$controlStructureEndPointer]['line'] + 1) {
+				$commentEndPointer = CommentHelper::getCommentEndPointer($phpcsFile, $notWhitespacePointerAfter);
+				$pointerAfterComment = TokenHelper::findNextExcluding($phpcsFile, T_WHITESPACE, $commentEndPointer + 1);
+
+				if ($isControlStructureEndAfterPointer($pointerAfterComment)) {
+					$controlStructureEndPointer = $commentEndPointer;
+					$pointerAfter = $pointerAfterComment;
+				}
+			} elseif ($tokens[$notWhitespacePointerAfter]['line'] === $tokens[$controlStructureEndPointer]['line']) {
+				$isCommentAfterOnSameLine = true;
+				$pointerAfter = TokenHelper::findNextExcluding($phpcsFile, T_WHITESPACE, $notWhitespacePointerAfter + 1);
+			}
+		}
+
+		$isLastControlStructure = $isControlStructureEndAfterPointer($pointerAfter);
 
 		$requiredLinesCountAfter = $isLastControlStructure
 			? $this->getLinesCountAfterLast($phpcsFile, $controlStructurePointer, $controlStructureEndPointer)
@@ -263,7 +277,7 @@ protected function checkLinesAfter(File $phpcsFile, int $controlStructurePointer
 			return;
 		}
 
-		$replaceStartPointer = $hasCommentAfter ? $notWhitespacePointerAfter : $controlStructureEndPointer;
+		$replaceStartPointer = $isCommentAfterOnSameLine ? $notWhitespacePointerAfter : $controlStructureEndPointer;
 		$endOfLineBeforeAfterPointer = TokenHelper::findPreviousContent($phpcsFile, T_WHITESPACE, $phpcsFile->eolChar, $pointerAfter - 1);
 
 		$phpcsFile->fixer->beginChangeset();
@@ -272,7 +286,7 @@ protected function checkLinesAfter(File $phpcsFile, int $controlStructurePointer
 			$phpcsFile->fixer->replaceToken($i, '');
 		}
 
-		if ($hasCommentAfter) {
+		if ($isCommentAfterOnSameLine) {
 			for ($i = 0; $i < $requiredLinesCountAfter; $i++) {
 				$phpcsFile->fixer->addNewline($notWhitespacePointerAfter);
 			}

tests/Sniffs/ControlStructures/data/jumpStatementsSpacingWithDefaultSettingsNoErrors.php

@@ -178,3 +178,11 @@ function () {
 	// second comment
 	return $foo + $bar;
 };
+
+function ($bool) {
+	if (!$bool) {
+	    // @codeCoverageIgnoreStart
+	    throw new Exception('Some error');
+	    // @codeCoverageIgnoreEnd
+	}
+};