ClassMemberSpacingSniff: Fixed false positives because of attributes

Author: kukulich

SlevomatCodingStandard/Sniffs/Classes/ClassMemberSpacingSniff.php

@@ -21,6 +21,7 @@
 use const T_ABSTRACT;
 use const T_ANON_CLASS;
 use const T_AS;
+use const T_ATTRIBUTE_END;
 use const T_CLOSE_CURLY_BRACKET;
 use const T_CONST;
 use const T_FINAL;
@@ -194,19 +195,31 @@ private function getMemberStartPointer(File $phpcsFile, int $memberPointer): int
 		$tokens = $phpcsFile->getTokens();
 
 		$memberFirstCodePointer = $this->getMemberFirstCodePointer($phpcsFile, $memberPointer);
-		$pointerBefore = TokenHelper::findPreviousExcluding($phpcsFile, T_WHITESPACE, $memberFirstCodePointer - 1);
-
-		if (
-			in_array($tokens[$pointerBefore]['code'], Tokens::$commentTokens, true)
-			&& $tokens[$pointerBefore]['line'] + 1 === $tokens[$memberFirstCodePointer]['line']
-		) {
-			$pointerBeforeComment = TokenHelper::findPreviousEffective($phpcsFile, $pointerBefore - 1);
-			if ($tokens[$pointerBeforeComment]['line'] !== $tokens[$pointerBefore]['line']) {
-				return array_key_exists('comment_opener', $tokens[$pointerBefore])
-					? $tokens[$pointerBefore]['comment_opener']
-					: CommentHelper::getMultilineCommentStartPointer($phpcsFile, $pointerBefore);
+
+		do {
+			$pointerBefore = TokenHelper::findPreviousExcluding($phpcsFile, T_WHITESPACE, $memberFirstCodePointer - 1);
+
+			if ($tokens[$pointerBefore]['code'] === T_ATTRIBUTE_END) {
+				$memberFirstCodePointer = $tokens[$pointerBefore]['attribute_opener'];
+				continue;
 			}
-		}
+
+			if (
+				in_array($tokens[$pointerBefore]['code'], Tokens::$commentTokens, true)
+				&& $tokens[$pointerBefore]['line'] + 1 === $tokens[$memberFirstCodePointer]['line']
+			) {
+				$pointerBeforeComment = TokenHelper::findPreviousEffective($phpcsFile, $pointerBefore - 1);
+				if ($tokens[$pointerBeforeComment]['line'] !== $tokens[$pointerBefore]['line']) {
+					$memberFirstCodePointer = array_key_exists('comment_opener', $tokens[$pointerBefore])
+						? $tokens[$pointerBefore]['comment_opener']
+						: CommentHelper::getMultilineCommentStartPointer($phpcsFile, $pointerBefore);
+					continue;
+				}
+			}
+
+			break;
+
+		} while (true);
 
 		return $memberFirstCodePointer;
 	}

tests/Sniffs/Classes/data/classMemberSpacingNoErrors.php

@@ -56,6 +56,7 @@ abstract class WithoutErrors
 	/** @var string|null */
 	private $two;
 
+	#[AttributeBeforeComment]
 	/**
 	 * @return object
 	 */
@@ -82,7 +83,11 @@ final public function two()
 
 	public $third;
 
-	abstract public function third();
+	/**
+	 * @return mixed
+	 */
+	#[SomeAttribute]
+	abstract public function thirdWithAttributeAndDocDomment();
 
 	/**
 	 * @codingStandardsIgnoreStart
@@ -92,7 +97,9 @@ abstract public function third();
 	protected $forth;
 	// @codingStandardsIgnoreEnd
 
-	public function forth()
+	#[SomeAttribute]
+	#[JustAnotherAttribute]
+	public function forthWithAttribute()
 	{
 	}