Merge branch 2.1.x into 2.2.x

Author: phpstan-bot

src/Command/ErrorFormatter/TableErrorFormatter.php

@@ -110,6 +110,12 @@ public function formatErrors(
 			foreach ($errors as $error) {
 				$message = $error->getMessage();
 				$filePath = $error->getTraitFilePath() ?? $error->getFilePath();
+				if (
+					$error->getIdentifier() !== null
+					&& in_array($error->getIdentifier(), ['phpstan.type', 'phpstan.nativeType', 'phpstan.variable', 'phpstan.dumpType', 'phpstan.unknownExpectation'], true)
+				) {
+					$message = '<fg=red>' . OutputFormatter::escape($message) . '</>';
+				}
 				if ($error->getIdentifier() !== null) {
 					$message .= "\n";
 					$message .= '🪪  ' . $error->getIdentifier();
@@ -157,13 +163,6 @@ public function formatErrors(
 					$message .= "\n✏️  <href=" . OutputFormatter::escape($url) . '>' . $title . '</>';
 				}
 
-				if (
-					$error->getIdentifier() !== null
-					&& in_array($error->getIdentifier(), ['phpstan.type', 'phpstan.nativeType', 'phpstan.variable', 'phpstan.dumpType', 'phpstan.unknownExpectation'], true)
-				) {
-					$message = '<fg=red>' . $message . '</>';
-				}
-
 				$rows[] = [
 					$this->formatLineNumber($error->getLine()),
 					$message,