IgnoreLexer: exclude all parentheses in T_OTHER

phpstan · May 24, 2024 · da6e9ae · da6e9ae
1 parent 0055aac
commit da6e9ae
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/Analyser/Ignore/IgnoreLexer.php b/src/Analyser/Ignore/IgnoreLexer.php
@@ -83,8 +83,8 @@ private function generateRegexp(): string
 			self::TOKEN_OPEN_PARENTHESIS => '\\(',
 			self::TOKEN_CLOSE_PARENTHESIS => '\\)',
 
-			// everything except whitespaces, TOKEN_CLOSE_PARENTHESIS
-			self::TOKEN_OTHER => '(?:(?!\\))[^\\s])++',
+			// everything except whitespaces and parentheses
+			self::TOKEN_OTHER => '([^\\s\\)\\(])++',
 		];
 
 		foreach ($patterns as $type => &$pattern) {

diff --git a/tests/PHPStan/Parser/RichParserTest.php b/tests/PHPStan/Parser/RichParserTest.php
@@ -237,6 +237,30 @@ public function dataLinesToIgnore(): iterable
 				2 => ['identifier'],
 			],
 		];
+
+		yield [
+			'<?php' . PHP_EOL .
+			'test(); // @phpstan-ignore identifier (var_export() is used intentionally)' . PHP_EOL,
+			[
+				2 => ['identifier'],
+			],
+		];
+
+		yield [
+			'<?php' . PHP_EOL .
+			'test(); // @phpstan-ignore identifier (FileSystem::write() does not support LOCK_EX)' . PHP_EOL,
+			[
+				2 => ['identifier'],
+			],
+		];
+
+		yield [
+			'<?php' . PHP_EOL .
+			'test(); // @phpstan-ignore identifier (type ensured in self::createClient())' . PHP_EOL,
+			[
+				2 => ['identifier'],
+			],
+		];
 	}
 
 	/**