TASK: Remove pathToSource property from NodeAttributes

grebaldi · grebaldi · commit 5df6f3df6eb4 · 2023-07-31T19:09:58.000+02:00
diff --git a/src/Language/AST/NodeAttributes/NodeAttributes.php b/src/Language/AST/NodeAttributes/NodeAttributes.php
@@ -23,12 +23,10 @@
 namespace PackageFactory\ComponentEngine\Language\AST\NodeAttributes;
 
 use PackageFactory\ComponentEngine\Parser\Source\Range;
-use PackageFactory\ComponentEngine\Parser\Source\Path;
 
 final class NodeAttributes
 {
     public function __construct(
-        public readonly Path $pathToSource,
         public readonly Range $rangeInSource
     ) {
     }
diff --git a/src/Language/Parser/BooleanLiteral/BooleanLiteralParser.php b/src/Language/Parser/BooleanLiteral/BooleanLiteralParser.php
@@ -45,7 +45,6 @@ public function parse(\Iterator $tokens): BooleanLiteralNode
 
         return new BooleanLiteralNode(
             attributes: new NodeAttributes(
-                pathToSource: $token->sourcePath,
                 rangeInSource: $token->boundaries
             ),
             value: $value
diff --git a/src/Language/Parser/EnumDeclaration/EnumDeclarationParser.php b/src/Language/Parser/EnumDeclaration/EnumDeclarationParser.php
@@ -65,7 +65,6 @@ public function parse(\Iterator $tokens): EnumDeclarationNode
 
         return new EnumDeclarationNode(
             attributes: new NodeAttributes(
-                pathToSource: $enumKeyWordToken->sourcePath,
                 rangeInSource: Range::from(
                     $enumKeyWordToken->boundaries->start,
                     $closingBracketToken->boundaries->end
@@ -103,7 +102,6 @@ private function parseEnumName(\Iterator $tokens): EnumNameNode
         $enumKeyNameToken = $tokens->current();
         $enumNameNode = new EnumNameNode(
             attributes: new NodeAttributes(
-                pathToSource: $enumKeyNameToken->sourcePath,
                 rangeInSource: $enumKeyNameToken->boundaries
             ),
             value: EnumName::from($enumKeyNameToken->value)
@@ -176,7 +174,6 @@ private function parseEnumMemberDeclaration(\Iterator $tokens): EnumMemberDeclar
 
         return new EnumMemberDeclarationNode(
             attributes: new NodeAttributes(
-                pathToSource: $enumMemberName->attributes->pathToSource,
                 rangeInSource: Range::from(
                     $enumMemberName->attributes->rangeInSource->start,
                     $value?->attributes->rangeInSource->end
@@ -199,7 +196,6 @@ private function parseEnumMemberName(\Iterator $tokens): EnumMemberNameNode
         $enumMemberNameToken = $tokens->current();
         $enumMemberNameNode = new EnumMemberNameNode(
             attributes: new NodeAttributes(
-                pathToSource: $enumMemberNameToken->sourcePath,
                 rangeInSource: $enumMemberNameToken->boundaries
             ),
             value: EnumMemberName::from($enumMemberNameToken->value)
@@ -241,7 +237,6 @@ private function parseEnumMemberValue(\Iterator $tokens): ?EnumMemberValueNode
 
         return new EnumMemberValueNode(
             attributes: new NodeAttributes(
-                pathToSource: $valueToken->sourcePath,
                 rangeInSource: Range::from(
                     $openingBracketToken->boundaries->start,
                     $closingBracketToken->boundaries->end
diff --git a/src/Language/Parser/IntegerLiteral/IntegerLiteralParser.php b/src/Language/Parser/IntegerLiteral/IntegerLiteralParser.php
@@ -42,7 +42,6 @@ public function parse(\Iterator $tokens): IntegerLiteralNode
 
         return new IntegerLiteralNode(
             attributes: new NodeAttributes(
-                pathToSource: $token->sourcePath,
                 rangeInSource: $token->boundaries
             ),
             format: IntegerFormat::fromTokenType($token->type),
diff --git a/src/Language/Parser/NullLiteral/NullLiteralParser.php b/src/Language/Parser/NullLiteral/NullLiteralParser.php
@@ -44,7 +44,6 @@ public function parse(\Iterator $tokens): NullLiteralNode
 
         return new NullLiteralNode(
             attributes: new NodeAttributes(
-                pathToSource: $token->sourcePath,
                 rangeInSource: $token->boundaries
             )
         );
diff --git a/src/Language/Parser/StringLiteral/StringLiteralParser.php b/src/Language/Parser/StringLiteral/StringLiteralParser.php
@@ -44,7 +44,6 @@ public function parse(\Iterator $tokens): StringLiteralNode
 
         return new StringLiteralNode(
             attributes: new NodeAttributes(
-                pathToSource: $token->sourcePath,
                 rangeInSource: $token->boundaries
             ),
             value: $token->value
diff --git a/src/Language/Parser/TypeReference/TypeReferenceParser.php b/src/Language/Parser/TypeReference/TypeReferenceParser.php
@@ -53,7 +53,6 @@ public function parse(\Iterator $tokens): TypeReferenceNode
         try {
             return new TypeReferenceNode(
                 attributes: new NodeAttributes(
-                    pathToSource: $startingToken->sourcePath,
                     rangeInSource: Range::from(
                         $startingToken->boundaries->start,
                         $closingArrayToken?->boundaries->end
@@ -101,7 +100,6 @@ public function parseTypeNames(\Iterator $tokens): TypeNameNodes
             $typeNameToken = $tokens->current();
             $items[] = new TypeNameNode(
                 attributes: new NodeAttributes(
-                    pathToSource: $typeNameToken->sourcePath,
                     rangeInSource: $typeNameToken->boundaries
                 ),
                 value: TypeName::from($typeNameToken->value)
diff --git a/test/Unit/Language/AST/Helpers/DummyAttributes.php b/test/Unit/Language/AST/Helpers/DummyAttributes.php
@@ -23,7 +23,6 @@
 namespace PackageFactory\ComponentEngine\Test\Unit\Language\AST\Helpers;
 
 use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
-use PackageFactory\ComponentEngine\Parser\Source\Path;
 use PackageFactory\ComponentEngine\Parser\Source\Position;
 use PackageFactory\ComponentEngine\Parser\Source\Range;
 
@@ -37,7 +36,6 @@ trait DummyAttributes
     public function setUpDummyAttributes(): void
     {
         $this->dummyAttributes = new NodeAttributes(
-            pathToSource: Path::fromString(':memory:'),
             rangeInSource: Range::from(
                 new Position(0, 0),
                 new Position(0, 0)
diff --git a/test/Unit/Language/AST/Node/TypeReference/TypeNameNodesTest.php b/test/Unit/Language/AST/Node/TypeReference/TypeNameNodesTest.php
@@ -28,7 +28,6 @@
 use PackageFactory\ComponentEngine\Language\AST\Node\TypeReference\TypeNameNode;
 use PackageFactory\ComponentEngine\Language\AST\Node\TypeReference\TypeNameNodes;
 use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
-use PackageFactory\ComponentEngine\Parser\Source\Path;
 use PackageFactory\ComponentEngine\Parser\Source\Position;
 use PackageFactory\ComponentEngine\Parser\Source\Range;
 use PackageFactory\ComponentEngine\Test\Unit\Language\AST\Helpers\DummyAttributes;
@@ -65,7 +64,6 @@ public function mustNotContainDuplicates(): void
     {
         $duplicate = new TypeNameNode(
             attributes: new NodeAttributes(
-                pathToSource: Path::fromString(':memory:'),
                 rangeInSource: Range::from(
                     new Position(1, 1),
                     new Position(1, 1)
diff --git a/test/Unit/Language/Parser/BooleanLiteral/BooleanLiteralParserTest.php b/test/Unit/Language/Parser/BooleanLiteral/BooleanLiteralParserTest.php
@@ -26,7 +26,6 @@
 use PackageFactory\ComponentEngine\Language\Parser\BooleanLiteral\BooleanLiteralParser;
 use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
 use PackageFactory\ComponentEngine\Parser\Source\Range;
-use PackageFactory\ComponentEngine\Parser\Source\Path;
 use PackageFactory\ComponentEngine\Parser\Source\Position;
 use PackageFactory\ComponentEngine\Parser\Source\Source;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Tokenizer;
@@ -44,7 +43,6 @@ public function producesAstNodeForTrueIfGivenOneTrueToken(): void
 
         $expectedBooleanLiteralNode = new BooleanLiteralNode(
             attributes: new NodeAttributes(
-                pathToSource: Path::fromString(':memory:'),
                 rangeInSource: Range::from(
                     new Position(0, 0),
                     new Position(0, 3)
@@ -69,7 +67,6 @@ public function producesAstNodeForFalseIfGivenOneFalseToken(): void
 
         $expectedBooleanLiteralNode = new BooleanLiteralNode(
             attributes: new NodeAttributes(
-                pathToSource: Path::fromString(':memory:'),
                 rangeInSource: Range::from(
                     new Position(0, 0),
                     new Position(0, 4)
diff --git a/test/Unit/Language/Parser/EnumDeclaration/EnumDeclarationParserTest.php b/test/Unit/Language/Parser/EnumDeclaration/EnumDeclarationParserTest.php
diff --git a/test/Unit/Language/Parser/IntegerLiteral/IntegerLiteralParserTest.php b/test/Unit/Language/Parser/IntegerLiteral/IntegerLiteralParserTest.php
diff --git a/test/Unit/Language/Parser/NullLiteral/NullLiteralParserTest.php b/test/Unit/Language/Parser/NullLiteral/NullLiteralParserTest.php
diff --git a/test/Unit/Language/Parser/StringLiteral/StringLiteralParserTest.php b/test/Unit/Language/Parser/StringLiteral/StringLiteralParserTest.php
diff --git a/test/Unit/Language/Parser/TypeReference/TypeReferenceParserTest.php b/test/Unit/Language/Parser/TypeReference/TypeReferenceParserTest.php

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,10 @@`
`23`	`23`	`namespace PackageFactory\ComponentEngine\Language\AST\NodeAttributes;`
`24`	`24`
`25`	`25`	`use PackageFactory\ComponentEngine\Parser\Source\Range;`
`26`		`-use PackageFactory\ComponentEngine\Parser\Source\Path;`
`27`	`26`
`28`	`27`	`final class NodeAttributes`
`29`	`28`	`{`
`30`	`29`	`public function __construct(`
`31`		`- public readonly Path $pathToSource,`
`32`	`30`	`public readonly Range $rangeInSource`
`33`	`31`	`) {`
`34`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ public function parse(\Iterator $tokens): NullLiteralNode`
`44`	`44`
`45`	`45`	`return new NullLiteralNode(`
`46`	`46`	`attributes: new NodeAttributes(`
`47`		`- pathToSource: $token->sourcePath,`
`48`	`47`	`rangeInSource: $token->boundaries`
`49`	`48`	`)`
`50`	`49`	`);`