M2.1: tree-sitter PHP in crates/syntax
Parser (parse, incremental reparse from lutra_text edits), outline with UTF-16 ranges and short signatures, folding ranges, 8 MiB parse cap. Snapshot tests for five PHP 8.3 fixtures, proptests (random bytes, reparse equals fresh parse, undo round trip), ignored release timing test. Docs: architecture Syntax section, parity evidence, G4 note. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
d12a517009
commit
a5236acd7e
25 changed files with 1768 additions and 6 deletions
67
crates/syntax/tests/fixtures/braced_namespaces.php
vendored
Normal file
67
crates/syntax/tests/fixtures/braced_namespaces.php
vendored
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Shop\Catalog {
|
||||
use Shop\Money\Price;
|
||||
|
||||
interface Sellable extends \Stringable, \Countable
|
||||
{
|
||||
public const string CURRENCY = 'EUR';
|
||||
|
||||
public function price(): Price;
|
||||
}
|
||||
|
||||
final class Product implements Sellable
|
||||
{
|
||||
private array $tags = [], $notes = [];
|
||||
|
||||
public function __construct(
|
||||
public readonly int $id,
|
||||
protected ?string $title = null,
|
||||
private array &$cache = [],
|
||||
string $unused = '',
|
||||
) {
|
||||
}
|
||||
|
||||
public function find(int $id): ?Product
|
||||
{
|
||||
return $id === $this->id ? $this : null;
|
||||
}
|
||||
|
||||
public static function tagged(string ...$tags): static
|
||||
{
|
||||
return new static(0);
|
||||
}
|
||||
|
||||
public function price(): Price
|
||||
{
|
||||
return new Price(0);
|
||||
}
|
||||
|
||||
public function __toString(): string
|
||||
{
|
||||
return (string) $this->title;
|
||||
}
|
||||
|
||||
public function count(): int
|
||||
{
|
||||
return \count($this->tags);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
namespace Shop\Orders {
|
||||
function total(array $lines, float $vat = 0.19): float
|
||||
{
|
||||
return array_sum($lines) * (1 + $vat);
|
||||
}
|
||||
|
||||
const MAX_LINES = 100, MIN_LINES = 1;
|
||||
}
|
||||
|
||||
namespace {
|
||||
function bootstrap(): void
|
||||
{
|
||||
}
|
||||
}
|
||||
36
crates/syntax/tests/fixtures/braced_namespaces.snap
vendored
Normal file
36
crates/syntax/tests/fixtures/braced_namespaces.snap
vendored
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
# outline
|
||||
namespace Shop\Catalog @4:0-51:1 sel 4:10-4:22
|
||||
interface Sellable extends \Stringable, \Countable @7:4-12:5 sel 7:14-7:22
|
||||
constant CURRENCY string @9:8-9:45 sel 9:28-9:36
|
||||
method price (): Price @11:8-11:39 sel 11:24-11:29
|
||||
class Product implements Sellable @14:4-50:5 sel 14:16-14:23
|
||||
property $tags array @16:22-16:32 sel 16:22-16:27
|
||||
property $notes array @16:34-16:45 sel 16:34-16:40
|
||||
method __construct (int $id, ?string $title, array &$cache, string $unused) @18:8-24:9 sel 18:24-18:35
|
||||
property $id int @19:12-19:35 sel 19:32-19:35
|
||||
property $title ?string @20:12-20:43 sel 20:30-20:36
|
||||
property $cache array @21:12-21:38 sel 21:27-21:33
|
||||
method find (int $id): ?Product @26:8-29:9 sel 26:24-26:28
|
||||
method tagged (string ...$tags): static @31:8-34:9 sel 31:31-31:37
|
||||
method price (): Price @36:8-39:9 sel 36:24-36:29
|
||||
method __toString (): string @41:8-44:9 sel 41:24-41:34
|
||||
method count (): int @46:8-49:9 sel 46:24-46:29
|
||||
namespace Shop\Orders @53:0-60:1 sel 53:10-53:21
|
||||
function total (array $lines, float $vat): float @54:4-57:5 sel 54:13-54:18
|
||||
constant MAX_LINES @59:10-59:25 sel 59:10-59:19
|
||||
constant MIN_LINES @59:27-59:40 sel 59:27-59:36
|
||||
function bootstrap (): void @63:4-65:5 sel 63:13-63:22
|
||||
# folding
|
||||
4:23-51:1
|
||||
8:4-12:5
|
||||
15:4-50:5
|
||||
23:10-24:9
|
||||
27:8-29:9
|
||||
32:8-34:9
|
||||
37:8-39:9
|
||||
42:8-44:9
|
||||
47:8-49:9
|
||||
53:22-60:1
|
||||
55:4-57:5
|
||||
62:10-66:1
|
||||
64:4-65:5
|
||||
28
crates/syntax/tests/fixtures/broken.php
vendored
Normal file
28
crates/syntax/tests/fixtures/broken.php
vendored
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
<?php
|
||||
|
||||
namespace Broken;
|
||||
|
||||
class Complete
|
||||
{
|
||||
public function ok(): bool
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
class Half extends
|
||||
{
|
||||
public function first(int $a
|
||||
|
||||
public function second(): void
|
||||
{
|
||||
if ($x {
|
||||
}
|
||||
}
|
||||
|
||||
function after_errors(): int
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
class
|
||||
12
crates/syntax/tests/fixtures/broken.snap
vendored
Normal file
12
crates/syntax/tests/fixtures/broken.snap
vendored
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
# outline
|
||||
namespace Broken @2:0-27:5 sel 2:10-2:16
|
||||
class Complete @4:0-10:1 sel 4:6-4:14
|
||||
method ok (): bool @6:4-9:5 sel 6:20-6:22
|
||||
method second (): void @14:4-20:1 sel 16:20-16:26
|
||||
method after_errors (): int @22:0-25:1 sel 22:9-22:21
|
||||
# folding
|
||||
5:0-10:1
|
||||
7:4-9:5
|
||||
17:4-20:1
|
||||
18:15-19:5
|
||||
23:0-25:1
|
||||
39
crates/syntax/tests/fixtures/scripts_and_anonymous.php
vendored
Normal file
39
crates/syntax/tests/fixtures/scripts_and_anonymous.php
vendored
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
<html>
|
||||
<body>
|
||||
<?php
|
||||
|
||||
if (!function_exists('greet')) {
|
||||
function greet(string $name = 'world'): string
|
||||
{
|
||||
return "Hello, {$name}!";
|
||||
}
|
||||
}
|
||||
|
||||
$handler = function (int $code) {
|
||||
function not_listed_inside_closure() {}
|
||||
return $code;
|
||||
};
|
||||
|
||||
$double = fn(int $x): int => $x * 2;
|
||||
|
||||
return new class ('db') extends Migration implements Countable {
|
||||
public function __construct(private string $connection)
|
||||
{
|
||||
}
|
||||
|
||||
public function up(): void
|
||||
{
|
||||
$inner = new class {
|
||||
public function hidden(): void {}
|
||||
};
|
||||
}
|
||||
|
||||
public function count(): int
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
?>
|
||||
<p><?= greet() ?></p>
|
||||
</body>
|
||||
</html>
|
||||
16
crates/syntax/tests/fixtures/scripts_and_anonymous.snap
vendored
Normal file
16
crates/syntax/tests/fixtures/scripts_and_anonymous.snap
vendored
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
# outline
|
||||
function greet (string $name): string @5:4-8:5 sel 5:13-5:18
|
||||
class class@anonymous extends Migration implements Countable @18:11-34:1 sel 18:11-18:16
|
||||
method __construct (string $connection) @19:4-21:5 sel 19:20-19:31
|
||||
property $connection string @19:32-19:58 sel 19:47-19:58
|
||||
method up (): void @23:4-28:5 sel 23:20-23:22
|
||||
method count (): int @30:4-33:5 sel 30:20-30:25
|
||||
# folding
|
||||
4:31-9:1
|
||||
6:4-8:5
|
||||
11:32-14:1
|
||||
18:63-34:1
|
||||
20:4-21:5
|
||||
24:4-28:5
|
||||
25:27-27:9
|
||||
31:4-33:5
|
||||
64
crates/syntax/tests/fixtures/unbraced_namespace.php
vendored
Normal file
64
crates/syntax/tests/fixtures/unbraced_namespace.php
vendored
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use App\Contracts\HasLabel;
|
||||
use App\Support\Str;
|
||||
use function App\Support\slugify;
|
||||
|
||||
#[\Attribute(\Attribute::TARGET_CLASS)]
|
||||
final class Entity
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* Base model for every entity.
|
||||
*/
|
||||
#[Entity]
|
||||
abstract class Model
|
||||
{
|
||||
protected static int $instances = 0;
|
||||
|
||||
#[\Deprecated]
|
||||
abstract public function key(): string|int;
|
||||
|
||||
public function &attributes(): array
|
||||
{
|
||||
static $cache = [];
|
||||
return $cache;
|
||||
}
|
||||
}
|
||||
|
||||
trait Timestamps
|
||||
{
|
||||
public ?\DateTimeImmutable $createdAt = null;
|
||||
|
||||
public function touch(\DateTimeImmutable $at = new \DateTimeImmutable()): void
|
||||
{
|
||||
$this->createdAt = $at;
|
||||
}
|
||||
}
|
||||
|
||||
namespace App\Enums;
|
||||
|
||||
enum Status: string implements \App\Contracts\HasLabel
|
||||
{
|
||||
case Draft = 'draft';
|
||||
case Published = 'published';
|
||||
|
||||
const DEFAULT = self::Draft;
|
||||
|
||||
public function label(): string
|
||||
{
|
||||
return match ($this) {
|
||||
self::Draft => 'Draft',
|
||||
self::Published => 'Published',
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
enum Suit
|
||||
{
|
||||
case Hearts;
|
||||
case Spades;
|
||||
}
|
||||
31
crates/syntax/tests/fixtures/unbraced_namespace.snap
vendored
Normal file
31
crates/syntax/tests/fixtures/unbraced_namespace.snap
vendored
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
# outline
|
||||
namespace App\Models @2:0-39:1 sel 2:10-2:20
|
||||
class Entity @8:0-11:1 sel 9:12-9:18
|
||||
class Model @16:0-29:1 sel 17:15-17:20
|
||||
property $instances int @19:4-19:40 sel 19:25-19:35
|
||||
method key (): string|int @21:4-22:47 sel 22:29-22:32
|
||||
method attributes (): array @24:4-28:5 sel 24:21-24:31
|
||||
trait Timestamps @31:0-39:1 sel 31:6-31:16
|
||||
property $createdAt ?\DateTimeImmutable @33:4-33:49 sel 33:31-33:41
|
||||
method touch (\DateTimeImmutable $at): void @35:4-38:5 sel 35:20-35:25
|
||||
namespace App\Enums @41:0-63:1 sel 41:10-41:19
|
||||
enum Status : string implements \App\Contracts\HasLabel @43:0-57:1 sel 43:5-43:11
|
||||
enumCase Draft 'draft' @45:4-45:25 sel 45:9-45:14
|
||||
enumCase Published 'published' @46:4-46:33 sel 46:9-46:18
|
||||
constant DEFAULT @48:4-48:32 sel 48:10-48:17
|
||||
method label (): string @50:4-56:5 sel 50:20-50:25
|
||||
enum Suit @59:0-63:1 sel 59:5-59:9
|
||||
enumCase Hearts @61:4-61:16 sel 61:9-61:15
|
||||
enumCase Spades @62:4-62:16 sel 62:9-62:15
|
||||
# folding
|
||||
4:0-6:33
|
||||
10:0-11:1
|
||||
13:0-15:3
|
||||
18:0-29:1
|
||||
25:4-28:5
|
||||
32:0-39:1
|
||||
36:4-38:5
|
||||
44:0-57:1
|
||||
51:4-56:5
|
||||
52:29-55:9
|
||||
60:0-63:1
|
||||
4
crates/syntax/tests/fixtures/unicode_positions.php
vendored
Normal file
4
crates/syntax/tests/fixtures/unicode_positions.php
vendored
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?php
|
||||
/** Prüfung — 🦦 otters use tools. */
|
||||
const ÄRGER = '🦦🦦'; class Café { public function naïve(string $straße): string { return $straße; } }
|
||||
$otters = "🦦🦦🦦"; function grüße(string $gruß = "🦦"): void {}
|
||||
6
crates/syntax/tests/fixtures/unicode_positions.snap
vendored
Normal file
6
crates/syntax/tests/fixtures/unicode_positions.snap
vendored
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
# outline
|
||||
constant ÄRGER @2:0-2:21 sel 2:6-2:11
|
||||
class Café @2:22-2:102 sel 2:28-2:32
|
||||
method naïve (string $straße): string @2:35-2:100 sel 2:51-2:56
|
||||
function grüße (string $gruß): void @3:20-3:64 sel 3:29-3:34
|
||||
# folding
|
||||
Loading…
Add table
Add a link
Reference in a new issue