Skip to content

POC: Ast Merging and Scoped Cache Invalidation #2980

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
dantleech wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

POC: Ast Merging and Scoped Cache Invalidation #2980

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bc42d76
Ast Merging
dantleech Dec 6, 2025
94066b9
Sanity test for merging parser
dantleech Dec 7, 2025
263cea9
Failing test
dantleech Dec 7, 2025
9030385
Argh
dantleech Dec 7, 2025
6f773d2
It's in some kind of working state
dantleech Dec 7, 2025
6c13a82
Nope
dantleech Dec 7, 2025
da77a89
Parser still not working
dantleech Dec 7, 2025
946503e
Failing test
dantleech Dec 7, 2025
ce5774d
Seems to work
dantleech Dec 7, 2025
51b68d8
Update diff test for shortcut
dantleech Dec 7, 2025
4bce110
Add debug node ID
dantleech Dec 7, 2025
74366da
Get full text
dantleech Dec 7, 2025
3a8f0d0
Refactor test to simulate session
dantleech Dec 7, 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
Get full text
  • Loading branch information
@dantleech
dantleech committed Dec 7, 2025
commit 74366da8df8d60262a14670875a652431ff1591a
2 changes: 1 addition & 1 deletion lib/TolerantAstDiff/AstDiff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

private SourceFileNode $fileSource2;

private array $visited = [];

Check failure on line 21 in lib/TolerantAstDiff/AstDiff.php

View workflow job for this annotation

GitHub Actions / PHPStan (8.1) 

Property Phpactor\TolerantAstDiff\AstDiff::$visited type has no value type specified in iterable type array.

public function merge(Node $node1, Node $node2): void
{
Expand Down Expand Up @@ -111,7 +111,7 @@
$this->applyEdit(TextEdit::create(
$node1Child->getFullStartPosition(),
$node1Child->getFullWidth(),
$node2Child->getFullText(),
$node2Child->getFullText($this->fileSource2->getFileContents()),
));
continue;
}
Expand Down Expand Up @@ -142,24 +142,24 @@
// if the original member is NULL but the new member is
// NOT null then just replace it
if ($member2 === null && $member1 !== null) {
$node1->$childName = $this->copyNode($member2);

Check failure on line 145 in lib/TolerantAstDiff/AstDiff.php

View workflow job for this annotation

GitHub Actions / PHPStan (8.1) 

Parameter #1 $node of method Phpactor\TolerantAstDiff\AstDiff::copyNode() expects Microsoft\PhpParser\Node|Microsoft\PhpParser\Token, null given.
$this->applyEdit(TextEdit::create(
$lastPosition,
0,
$member2?->getFullText($this->fileSource2->getFileContents()) ?? '',

Check failure on line 149 in lib/TolerantAstDiff/AstDiff.php

View workflow job for this annotation

GitHub Actions / PHPStan (8.1) 

Expression on left side of ?? is always null.

Check failure on line 149 in lib/TolerantAstDiff/AstDiff.php

View workflow job for this annotation

GitHub Actions / PHPStan (8.1) 

Cannot call method getFullText() on null.
));
continue;
}

// if the members are both nodes then just replace it and continue
if ($member2 instanceof Node && $member2::class !== $member1::class) {

Check failure on line 155 in lib/TolerantAstDiff/AstDiff.php

View workflow job for this annotation

GitHub Actions / PHPStan (8.1) 

Cannot access constant class on mixed.
// update the reference content in the source node by
// applying a text edit - we'll reindex the offsets later.
$node1->$childName = $this->copyNode($member2);
$this->applyEdit(TextEdit::create(
$lastPosition,
$member1?->getFullWidth(),

Check failure on line 161 in lib/TolerantAstDiff/AstDiff.php

View workflow job for this annotation

GitHub Actions / PHPStan (8.1) 

Parameter #2 $length of static method Phpactor\TextDocument\TextEdit::create() expects int, mixed given.

Check failure on line 161 in lib/TolerantAstDiff/AstDiff.php

View workflow job for this annotation

GitHub Actions / PHPStan (8.1) 

Cannot call method getFullWidth() on mixed.
$member2?->getFullText($this->fileSource2->getFileContents()) ?? '',

Check failure on line 162 in lib/TolerantAstDiff/AstDiff.php

View workflow job for this annotation

GitHub Actions / PHPStan (8.1) 

Using nullsafe method call on non-nullable type Microsoft\PhpParser\Node. Use -> instead.

Check failure on line 162 in lib/TolerantAstDiff/AstDiff.php

View workflow job for this annotation

GitHub Actions / PHPStan (8.1) 

Method Microsoft\PhpParser\Node::getFullText() invoked with 1 parameter, 0 required.

Check failure on line 162 in lib/TolerantAstDiff/AstDiff.php

View workflow job for this annotation

GitHub Actions / PHPStan (8.1) 

Expression on left side of ?? is not nullable.
));
continue;
}
Expand Down
Loading