danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Handle different line endings from baseline.

Browse Source
This commit is contained in:
Damian Wójcik 2023-03-24 10:48:03 +01:00
parent ef9a06c467
commit 350687dcb7
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Psalm/ErrorBaseline.php
View File

@ -118,7 +118,7 @@ final class ErrorBaseline
foreach ($codeSamples as $codeSample) { foreach ($codeSamples as $codeSample) {
$files[$fileName][$issueType]['o'] += 1; $files[$fileName][$issueType]['o'] += 1;
$files[$fileName][$issueType]['s'][] = trim($codeSample->textContent); $files[$fileName][$issueType]['s'][] = str_replace("\r\n", "\n", trim($codeSample->textContent));
} }
// TODO: Remove in Psalm 6 // TODO: Remove in Psalm 6

2
src/Psalm/Internal/LanguageServer/LanguageServer.php
View File

@ -782,7 +782,7 @@ class LanguageServer extends Dispatcher
if ($issue_baseline[$file][$type]['o'] === count($issue_baseline[$file][$type]['s'])) { if ($issue_baseline[$file][$type]['o'] === count($issue_baseline[$file][$type]['s'])) {
/** @psalm-suppress MixedArrayAccess, MixedAssignment */ /** @psalm-suppress MixedArrayAccess, MixedAssignment */
$position = array_search( $position = array_search(
trim($issue_data->selected_text), str_replace("\r\n", "\n", trim($issue_data->selected_text)),
$issue_baseline[$file][$type]['s'], $issue_baseline[$file][$type]['s'],
true, true,
); );

2
src/Psalm/IssueBuffer.php
View File

@ -592,7 +592,7 @@ final class IssueBuffer
if (isset($issue_baseline[$file][$type]) && $issue_baseline[$file][$type]['o'] > 0) { if (isset($issue_baseline[$file][$type]) && $issue_baseline[$file][$type]['o'] > 0) {
if ($issue_baseline[$file][$type]['o'] === count($issue_baseline[$file][$type]['s'])) { if ($issue_baseline[$file][$type]['o'] === count($issue_baseline[$file][$type]['s'])) {
$position = array_search( $position = array_search(
trim($issue_data->selected_text), str_replace("\r\n", "\n", trim($issue_data->selected_text)),
$issue_baseline[$file][$type]['s'], $issue_baseline[$file][$type]['s'],
true, true,
); );

20
tests/IssueBufferTest.php
View File

@ -79,11 +79,31 @@ class IssueBufferTest extends TestCase
0, 0,
), ),
], ],
'/path/four.php' => [
new IssueData(
"error",
0,
0,
"MissingPropertyType",
'Message',
"four.php",
"/path/four.php",
"snippet-4-multiline\r\nwith-carriage-return\r",
"snippet-4-multiline\r\nwith-carriage-return\r",
0,
0,
0,
0,
0,
0,
),
],
]); ]);
$baseline = [ $baseline = [
'one.php' => ['MissingPropertyType' => ['o' => 1, 's' => ['snippet-1']] ], 'one.php' => ['MissingPropertyType' => ['o' => 1, 's' => ['snippet-1']] ],
'two.php' => ['MissingPropertyType' => ['o' => 1, 's' => ['snippet-2']] ], 'two.php' => ['MissingPropertyType' => ['o' => 1, 's' => ['snippet-2']] ],
'three.php' => ['MissingPropertyType' => ['o' => 1, 's' => ['snippet-3-has-carriage-return']] ], 'three.php' => ['MissingPropertyType' => ['o' => 1, 's' => ['snippet-3-has-carriage-return']] ],
'four.php' => ['MissingPropertyType' => ['o' => 1, 's' => ["snippet-4-multiline\nwith-carriage-return"]] ],
]; ];
$analyzer = $this->createMock(Analyzer::class); $analyzer = $this->createMock(Analyzer::class);