Trim issue snippet at time of comparison with baseline, not in IssueD…

…ata constructor
vimeo · Jun 27, 2021 · 5bdb6ce · 5bdb6ce
1 parent 097ccf1
commit 5bdb6ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Analyzer/IssueData.php b/src/Psalm/Internal/Analyzer/IssueData.php
@@ -156,7 +156,7 @@ public function __construct(
         $this->file_name = $file_name;
         $this->file_path = $file_path;
         $this->snippet = $snippet;
-        $this->selected_text = trim($selected_text);
+        $this->selected_text = $selected_text;
         $this->from = $from;
         $this->to = $to;
         $this->snippet_from = $snippet_from;

diff --git a/src/Psalm/IssueBuffer.php b/src/Psalm/IssueBuffer.php
@@ -48,6 +48,7 @@
 use function sprintf;
 use function str_repeat;
 use function str_replace;
+use function trim;
 use function usort;
 
 use const DEBUG_BACKTRACE_IGNORE_ARGS;
@@ -518,7 +519,7 @@ function (IssueData $d1, IssueData $d2) : int {
                         if (isset($issue_baseline[$file][$type]) && $issue_baseline[$file][$type]['o'] > 0) {
                             if ($issue_baseline[$file][$type]['o'] === count($issue_baseline[$file][$type]['s'])) {
                                 $position = array_search(
-                                    $issue_data->selected_text,
+                                    trim($issue_data->selected_text),
                                     $issue_baseline[$file][$type]['s'],
                                     true
                                 );