Make unmatched inline ignores fixable

ignore.unmatchedIdentifier removes the identifier from the @PHPStan-Ignore
comment, or the whole ignore when it is the only one. ignore.unmatchedLine
removes the @phpstan-ignore-line / -next-line ignore. Plain comments are
edited as text and left alone when they have other contents. PHPDocs are
edited with PhpDocEditor, so their other tags are kept.

Amp-Thread-ID: https://ampcode.com/threads/T-01a198ef-d81e-7532-81f4-438bae7a4db3

Author: ondrejmirtes

build/baseline-pre-8.0.neon

@@ -157,3 +157,27 @@ parameters:
 			identifier: property.internalClass
 			count: 3
 			path: ../src/Parser/RichParser.php
+
+		-
+			rawMessage: Access to property $id of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
+			identifier: property.internalClass
+			count: 6
+			path: ../src/Analyser/Ignore/UnmatchedIgnoreFixer.php
+
+		-
+			rawMessage: Access to property $line of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
+			identifier: property.internalClass
+			count: 7
+			path: ../src/Analyser/Ignore/UnmatchedIgnoreFixer.php
+
+		-
+			rawMessage: Access to property $pos of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
+			identifier: property.internalClass
+			count: 1
+			path: ../src/Analyser/Ignore/UnmatchedIgnoreFixer.php
+
+		-
+			rawMessage: Access to property $text of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
+			identifier: property.internalClass
+			count: 2
+			path: ../src/Analyser/Ignore/UnmatchedIgnoreFixer.php

src/Analyser/AnalyserResultFinalizer.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use PHPStan\AnalysedCodeException;
+use PHPStan\Analyser\Ignore\UnmatchedIgnoreFixer;
 use PHPStan\Analyser\ResultCache\LazyCollectedData;
 use PHPStan\BetterReflection\NodeCompiler\Exception\UnableToCompileNode;
 use PHPStan\BetterReflection\Reflection\Exception\CircularReference;
@@ -12,6 +13,7 @@
 use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\DependencyInjection\ExtensionsCollection;
+use PHPStan\File\FileReader;
 use PHPStan\Node\CollectedDataNode;
 use PHPStan\Node\CollectedDataNodeReads;
 use PHPStan\Rules\Registry as RuleRegistry;
@@ -44,6 +46,7 @@ public function __construct(
 		private RuleErrorTransformer $ruleErrorTransformer,
 		private ScopeFactory $scopeFactory,
 		private LocalIgnoresProcessor $localIgnoresProcessor,
+		private UnmatchedIgnoreFixer $unmatchedIgnoreFixer,
 		#[AutowiredParameter]
 		private bool $reportUnmatchedIgnoredErrors,
 		private ValueDependencyCollector $valueDependencyCollector,
@@ -399,6 +402,23 @@ private function mergeFilteredPhpErrors(AnalyserResult $analyserResult): Analyse
 		);
 	}
 
+	/**
+	 * @return list<FixedErrorDiff>
+	 */
+	private function fixUnmatchedIgnore(string $file, ?string $code, int $line, ?string $identifier): array
+	{
+		if ($code === null) {
+			return [];
+		}
+
+		$newCode = $this->unmatchedIgnoreFixer->fix($code, $line, $identifier);
+		if ($newCode === null) {
+			return [];
+		}
+
+		return [$this->ruleErrorTransformer->createFixedErrorDiff($file, $code, $newCode)];
+	}
+
 	/**
 	 * @param list<Error> $collectorErrors
 	 * @param list<Error> $locallyIgnoredCollectorErrors
@@ -423,26 +443,31 @@ private function addUnmatchedIgnoredErrors(
 					continue;
 				}
 
+				$code = is_file($file) ? FileReader::read($file) : null;
 				foreach ($lines as $line => $identifiers) {
 					if ($identifiers === null) {
-						$errors[] = (new Error(
+						$errors[] = new Error(
 							sprintf('No error to ignore is reported on line %d.', $line),
 							$file,
 							$line,
 							false,
 							$file,
-						))->withIdentifier('ignore.unmatchedLine');
+							identifier: 'ignore.unmatchedLine',
+							fixedErrorDiffs: $this->fixUnmatchedIgnore($file, $code, $line, null),
+						);
 						continue;
 					}
 
 					foreach ($identifiers as $identifier) {
-						$errors[] = (new Error(
+						$errors[] = new Error(
 							sprintf('No error with identifier %s is reported on line %d.', $identifier['name'], $line),
 							$file,
 							$line,
 							false,
 							$file,
-						))->withIdentifier('ignore.unmatchedIdentifier');
+							identifier: 'ignore.unmatchedIdentifier',
+							fixedErrorDiffs: $this->fixUnmatchedIgnore($file, $code, $line, $identifier['name']),
+						);
 					}
 				}
 			}