Skip to content

Rework comments support for pretty-printing #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ondrejmirtes wants to merge 7 commits into
base: 2.1.x
Choose a base branch
from
Draft

Rework comments support for pretty-printing #266

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fb0c3b0
Fix Printer
ondrejmirtes Feb 18, 2025
d9523d9
print comments
ondrejmirtes Feb 18, 2025
2733157
wip?
ondrejmirtes Feb 18, 2025
ac871af
verify indexes
ondrejmirtes Feb 19, 2025
3f0f728
Revert "wip?"
ondrejmirtes Feb 19, 2025
77b2588
verify
ondrejmirtes Feb 19, 2025
2814bf7
one more test
ondrejmirtes Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
verify indexes
  • Loading branch information
@ondrejmirtes
ondrejmirtes committed Feb 19, 2025
commit ac871aff25734a12b24ef5c59e35c49cf3b779c8
27 changes: 27 additions & 0 deletions tests/PHPStan/Parser/TypeParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,40 @@ public function testVerifyAttributes(string $input, $expectedResult): void
$this->assertNotNull($node->getAttribute(Attribute::END_INDEX), (string) $node);
}

$this->verifyNodeIndexes($node);

$this->assertEquals(
$this->unsetAllAttributesButComments($expectedResult),
$this->unsetAllAttributesButComments($typeNode),
);
}


private function verifyNodeIndexes(Node $node): void
{
$subNodeNames = array_keys(get_object_vars($node));
foreach ($subNodeNames as $subNodeName) {
$subNode = $node->$subNodeName;
if (is_array($subNode)) {
$lastEndIndex = null;
foreach ($subNode as $subSubNode) {
$startIndex = $subSubNode->getAttribute(Attribute::START_INDEX);
$endIndex = $subSubNode->getAttribute(Attribute::END_INDEX);
if ($lastEndIndex !== null) {
$this->assertGreaterThan($startIndex, $lastEndIndex, (string) $subSubNode);
}

$lastEndIndex = $endIndex;

$this->verifyNodeIndexes($subSubNode);
}
} elseif ($subNode instanceof Node) {
$this->verifyNodeIndexes($subNode);
}
}
}


private function unsetAllAttributes(Node $node): Node
{
$visitor = new class extends AbstractNodeVisitor {
Expand Down