Fixed internal error in CommentHelper

slevomat · Mar 9, 2024 · ea3ff00 · ea3ff00
1 parent 5cac991
commit ea3ff00
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/SlevomatCodingStandard/Helpers/CommentHelper.php b/SlevomatCodingStandard/Helpers/CommentHelper.php
@@ -5,7 +5,7 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 use function array_key_exists;
-use function array_merge;
+use function in_array;
 use function preg_match;
 use function strpos;
 use const T_COMMENT;
@@ -38,13 +38,23 @@ public static function getCommentEndPointer(File $phpcsFile, int $commentStartPo
 			return null;
 		}
 
-		$nextPointerAfterComment = TokenHelper::findNextExcluding(
-			$phpcsFile,
-			array_merge([T_COMMENT], Tokens::$phpcsCommentTokens),
-			$commentStartPointer + 1
-		);
+		$commentEndPointer = $commentStartPointer;
+
+		for ($i = $commentStartPointer + 1; $i < $phpcsFile->numTokens; $i++) {
+			if ($tokens[$i]['code'] === T_COMMENT) {
+				$commentEndPointer = $i;
+				continue;
+			}
+
+			if (in_array($tokens[$i]['code'], Tokens::$phpcsCommentTokens, true)) {
+				$commentEndPointer = $i;
+				continue;
+			}
+
+			break;
+		}
 
-		return $nextPointerAfterComment - 1;
+		return $commentEndPointer;
 	}
 
 	public static function getMultilineCommentStartPointer(File $phpcsFile, int $commentEndPointer): int

diff --git a/tests/Sniffs/Commenting/data/emptyCommentNoErrors.php b/tests/Sniffs/Commenting/data/emptyCommentNoErrors.php
@@ -41,3 +41,6 @@
 $some = 'sample_code';
 // phpcs:enable
  */
+
+/* not empty
+multiline comment */