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

Show file tree
Hide file tree
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
Seems to work
  • Loading branch information
@dantleech
dantleech committed Dec 7, 2025
commit ce5774da36ba4ad76f244f4025496dd9733324b8
18 changes: 17 additions & 1 deletion lib/TolerantAstDiff/AstDiff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ final class AstDiff

private SourceFileNode $fileSource2;

private array $visited = [];

public function merge(Node $node1, Node $node2): void
{
$this->visited = [];
$this->fileSource1 = $node1->getRoot();
$this->fileSource2 = $node2->getRoot();

Expand All @@ -28,6 +31,18 @@ public function merge(Node $node1, Node $node2): void

private function doMerge(Node $node1, Node $node2): void
{
if ($node1->getText() === $node2->getText()) {
return;
}

// check for circular references
// TODO: this was added for debugging can probably be removed
if (isset($this->visited[spl_object_id($node1)])) {
throw new \RuntimeException('Circular reference');
}

$this->visited[spl_object_id($node1)] = true;

if ($node1::class !== $node2::class) {
throw new RuntimeException(sprintf(
'Can only compare nodes of the same type, got: %s vs %s',
Expand Down Expand Up @@ -257,6 +272,7 @@ private function appendChildren(Node $parent, string $childName, array $newNodes
}

private function applyEdit(TextEdit $edit): void

{
$source = $this->fileSource1;
$source->fileContents = TextEdits::one($edit)->apply($source->getFileContents());
Expand All @@ -267,7 +283,7 @@ private static function reindex(Node $node): void
{
$offset = 0;
foreach ($node->getDescendantTokens() as $token) {
$leading = $token->fullStart - $token->start;
$leading = $token->start - $token->fullStart;

$token->fullStart = $offset;
$token->start = $offset + $leading;
Expand Down
24 changes: 24 additions & 0 deletions lib/TolerantAstDiff/Tests/Benchmark/AstDiffBench.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

namespace Phpactor\TolerantAstDiff\Tests\Benchmark;

use Phpactor\TolerantAstDiff\AstDiff;
use Phpactor\WorseReflection\Bridge\TolerantParser\Parser\MergingParser;

final class AstDiffBench
{
public function benchMerge(): void
{
$largeFile = __DIR__ . '/../../AstDiff.php';
$mergingParser = new MergingParser(new AstDiff());
$contents = file_get_contents($largeFile);

$ast1 = $mergingParser->parseSourceFile($contents, __FILE__);

$contents = (string)substr($contents, 0, 150);
$contents .= "\n";
$contents .= "\n";

$ast2 = $mergingParser->parseSourceFile($contents, __FILE__);
}
}
15 changes: 5 additions & 10 deletions lib/WorseReflection/Bridge/TolerantParser/Parser/MergingParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,22 @@ public function __construct(

public function parseSourceFile(string $source, ?string $uri = null): SourceFileNode
{
if ($uri === null) {
if (!$uri) {
return parent::parseSourceFile($source);
}



if (!isset($this->documents[$uri])) {

@dantleech dantleech Dec 7, 2025 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should probably, for now, use a Ttl caching mechanism, but should use the #2882

$node = parent::parseSourceFile($source, $uri);
$this->documents[$uri] = $node;
return $node;
}

$node1 = $this->documents[$uri];
$node2 = parent::parseSourceFile($source, $uri);

$start = microtime(true);
$node2 = parent::parseSourceFile($source, $uri);
$this->merger->merge($node1, $node2);

if ($uri === 'file://'.__FILE__) {
$this->merger->merge($node1, $node2);
$this->merger->merge($node1, $node2);
}

return $node2;
return $node1;
}
}