Report Full: iterate on line wrapping bug fix [2]

Prevent inconsistency in handling of single-line vs multi-line length calculation. Co-authored-by: Brad Jorsch <[email protected]>
anomiex · Dec 11, 2023 · b9dd7db · b9dd7db
1 parent 3577799
commit b9dd7db
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Reports/Full.php b/src/Reports/Full.php
@@ -137,10 +137,10 @@ public function generateFileReport($report, File $phpcsFile, $showSources=false,
 
                     if ($showSources === true) {
                         $lastMsg          = $errorMsg;
-                        $startPosLastLine = strrpos($errorMsg, $paddingLine2.$beforeMsg);
+                        $startPosLastLine = strrpos($errorMsg, PHP_EOL.$paddingLine2.$beforeMsg);
                         if ($startPosLastLine !== false) {
-                            // Message is multiline.
-                            $lastMsg = substr($errorMsg, ($startPosLastLine + strlen($paddingLine2.$beforeMsg)));
+                            // Message is multiline. Grab the text of last line of the message, including the color codes.
+                            $lastMsg = substr($errorMsg, ($startPosLastLine + strlen(PHP_EOL.$paddingLine2)));
                         }
 
                         // When show sources is used, the message itself will be bolded, so we need to correct the length.