JumpStatementsSpacingSniff: Improved fixer

Author: kukulich

SlevomatCodingStandard/Sniffs/ControlStructures/AbstractControlStructureSpacing.php

@@ -121,7 +121,7 @@ protected function checkLinesBefore(File $phpcsFile, int $controlStructurePointe
 					? $tokens[$pointerBefore]['comment_opener']
 					: CommentHelper::getMultilineCommentStartPointer($phpcsFile, $pointerBefore);
 				/** @var int $pointerBefore */
-				$pointerBefore = $pointerBeforeComment;
+				$pointerBefore = TokenHelper::findPreviousExcluding($phpcsFile, T_WHITESPACE, $controlStructureStartPointer - 1);
 			}
 		}
 

tests/Sniffs/ControlStructures/JumpStatementsSpacingSniffTest.php

@@ -17,7 +17,7 @@ public function testDefaultSettingsErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/jumpStatementsSpacingWithDefaultSettingsErrors.php');
 
-		self::assertSame(28, $report->getErrorCount());
+		self::assertSame(29, $report->getErrorCount());
 
 		self::assertSniffError($report, 10, JumpStatementsSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 1 lines before "break", found 0.');
 		self::assertSniffError($report, 10, JumpStatementsSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_LAST_CONTROL_STRUCTURE, 'Expected 0 lines after "break", found 1.');
@@ -47,6 +47,7 @@ public function testDefaultSettingsErrors(): void
 		self::assertSniffError($report, 127, JumpStatementsSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 1 lines before "return", found 0.');
 		self::assertSniffError($report, 127, JumpStatementsSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_CONTROL_STRUCTURE, 'Expected 1 lines after "return", found 0.');
 		self::assertSniffError($report, 128, JumpStatementsSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 1 lines before "yield", found 0.');
+		self::assertSniffError($report, 139, JumpStatementsSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 1 lines before "return", found 2.');
 
 		self::assertAllFixedInFile($report);
 	}

tests/Sniffs/ControlStructures/data/jumpStatementsSpacingWithDefaultSettingsErrors.fixed.php

@@ -116,3 +116,13 @@ function () {
 
 	yield 3;
 };
+
+function () {
+	$foo = 1;
+	$bar = 2;
+
+	// first comment
+
+	// second comment
+	return $foo + $bar;
+};

tests/Sniffs/ControlStructures/data/jumpStatementsSpacingWithDefaultSettingsErrors.php

@@ -127,3 +127,14 @@ function () {
 	return 2;
 	yield 3;
 };
+
+function () {
+	$foo = 1;
+	$bar = 2;
+
+	// first comment
+
+
+	// second comment
+	return $foo + $bar;
+};

tests/Sniffs/ControlStructures/data/jumpStatementsSpacingWithDefaultSettingsNoErrors.php

@@ -168,3 +168,13 @@ function ($array) {
 		}
 	}
 };
+
+function () {
+	$foo = 1;
+	$bar = 2;
+
+	// first comment
+
+	// second comment
+	return $foo + $bar;
+};