Skip to content

gh-3007: Fix regression with node-at-cursor #3008

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

Merged
dantleech merged 1 commit into from
Dec 29, 2025
+25 −6
Merged

gh-3007: Fix regression with node-at-cursor #3008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions lib/Completion/Bridge/TolerantParser/NodeAtCursorProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@ public function get(TextDocument $document, ByteOffset $byteOffset): Node
{
$node = deep_copy($this->provider->get($document));
assert($node instanceof Node);
$truncatedSourceCode = substr($document->__toString(), 0, $byteOffset->toInt());

$lastNonWhiteSpaceOffset = OffsetHelper::lastNonWhitespaceCharacterOffset($document->__toString());
$lastNonWhiteSpaceOffset = OffsetHelper::lastNonWhitespaceByteOffset($truncatedSourceCode);

if ($byteOffset->toInt() > $lastNonWhiteSpaceOffset) {
$byteOffset = ByteOffset::fromInt(strlen(
mb_substr($document->__toString(), 0, $lastNonWhiteSpaceOffset)
));
$byteOffset = ByteOffset::fromInt($lastNonWhiteSpaceOffset);
}

$node = $node->getDescendantNodeAtPosition($byteOffset->toInt());
Expand Down
14 changes: 12 additions & 2 deletions lib/Completion/Core/Util/OffsetHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class OffsetHelper
{
public static function lastNonWhitespaceCharacterOffset(string $input): int
public static function trimToLastNonWhitespaceCharacter(string $input): string
{
$source = preg_replace('/[ \t\x0d\n\r\f]+$/u', '', $input);

Expand All @@ -19,6 +19,16 @@ public static function lastNonWhitespaceCharacterOffset(string $input): int
));
}

return mb_strlen($source);
return $source;
}

public static function lastNonWhitespaceCharacterOffset(string $input): int
{
return mb_strlen(self::trimToLastNonWhitespaceCharacter($input));
}

public static function lastNonWhitespaceByteOffset(string $input): int
{
return strlen(self::trimToLastNonWhitespaceCharacter($input));
}
}
10 changes: 10 additions & 0 deletions lib/Completion/Tests/Unit/Bridge/TolerantParser/NodeAtCursorProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Closure;
use Generator;
use Microsoft\PhpParser\Node;
use Microsoft\PhpParser\Node\CaseStatementNode;
use Microsoft\PhpParser\Node\Expression\MemberAccessExpression;
use Microsoft\PhpParser\Node\Expression\Variable;
use Microsoft\PhpParser\Node\MethodDeclaration;
Expand Down Expand Up @@ -103,6 +104,15 @@ function (Node $node): void {
self::assertInstanceOf(MemberAccessExpression::class, $node);
}
];

yield [
<<<'PHP'
<?php namespace V; switch (true) { case 0: <> }
PHP,
function (Node $node): void {
self::assertInstanceOf(CaseStatementNode::class, $node);
}
];
}

public function testDoesNotCorruptOriginalAst(): void
Expand Down