Tolerant parser 0.1 (#34)

* Update to tolerant-parser 0.1

* Remove ignored errors

* Fix stan

* Update

Author: dantleech

.php_cs.dist

@@ -9,6 +9,7 @@ $finder = PhpCsFixer\Finder::create()
 ;
 
 return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
         'no_unused_imports' => true,

composer.json

@@ -10,9 +10,9 @@
     ],
     "require": {
         "php": "^7.3 || ^8.0",
-        "microsoft/tolerant-php-parser": "~0.0.1",
+        "microsoft/tolerant-php-parser": "~0.1.0",
         "phpactor/text-document": "~1.2.3",
-        "phpactor/worse-reflection": "~0.4.4",
+        "phpactor/worse-reflection": "~0.4.7",
         "twig/twig": "^2.4"
     },
     "require-dev": {

lib/Adapter/TolerantParser/Edits.php

@@ -2,6 +2,9 @@
 
 namespace Phpactor\CodeBuilder\Adapter\TolerantParser;
 
+use Microsoft\PhpParser\Node;
+use Microsoft\PhpParser\Node\QualifiedName;
+use Microsoft\PhpParser\Token;
 use Phpactor\CodeBuilder\Util\TextFormat;
 use Phpactor\TextDocument\TextEdit;
 use Phpactor\TextDocument\TextEdits;
@@ -24,24 +27,36 @@ public function __construct(TextFormat $format = null)
         ;
     }
 
+    /**
+     * @param Node|Token $node
+     */
     public function remove($node): void
     {
-        $this->edits[] = TextEdit::create($node->getFullStart(), $node->getFullWidth(), '');
+        $this->edits[] = TextEdit::create($node->getFullStartPosition(), $node->getFullWidth(), '');
     }
 
+    /**
+     * @param Node|Token $node
+     */
     public function before($node, string $text): void
     {
-        $this->edits[] = TextEdit::create($node->getStart(), 0, $text);
+        $this->edits[] = TextEdit::create($node->getStartPosition(), 0, $text);
     }
 
+    /**
+     * @param Node|Token $node
+     */
     public function after($node, string $text): void
     {
         $this->edits[] = TextEdit::create($node->getEndPosition(), 0, $text);
     }
 
+    /**
+     * @param Node|Token|QualifiedName $node
+     */
     public function replace($node, string $text): void
     {
-        $this->edits[] = TextEdit::create($node->getFullStart(), $node->getFullWidth(), $text);
+        $this->edits[] = TextEdit::create($node->getFullStartPosition(), $node->getFullWidth(), $text);
     }
 
     public function textEdits(): TextEdits

lib/Adapter/TolerantParser/Updater/AbstractMethodUpdater.php

@@ -17,6 +17,7 @@
 use Microsoft\PhpParser\Node\Parameter;
 use Phpactor\CodeBuilder\Domain\Prototype\ReturnType;
 use Phpactor\TextDocument\TextEdit;
+use Phpactor\WorseReflection\Core\Util\QualifiedNameListUtil;
 
 abstract class AbstractMethodUpdater
 {
@@ -59,7 +60,6 @@ public function updateMethods(Edits $edits, ClassLikePrototype $classPrototype,
         $methodPrototypes = $classPrototype->methods()->in($existingMethodNames);
 
         $ignoreMethods = [];
-        /** @var Method $methodBuilder */
         foreach ($methodPrototypes as $methodPrototype) {
 
             /** @var MethodDeclaration $methodDeclaration */
@@ -175,7 +175,18 @@ private function updateOrAddReturnType(Edits $edits, ReturnType $returnType, Met
         }
 
         $returnType = (string) $returnType;
-        $existingReturnType = $returnType ? NodeHelper::resolvedShortName($methodDeclaration, $methodDeclaration->returnType) : null;
+
+        if (!$methodDeclaration->returnTypeList) {
+            return;
+        }
+
+        $firstReturnType = QualifiedNameListUtil::firstQualifiedNameOrNullOrToken($methodDeclaration->returnTypeList);
+
+        if (null === $firstReturnType) {
+            return;
+        }
+        
+        $existingReturnType = $returnType ? NodeHelper::resolvedShortName($methodDeclaration, $firstReturnType) : null;
 
         if (null === $existingReturnType) {
             // TODO: Add return type
@@ -186,7 +197,7 @@ private function updateOrAddReturnType(Edits $edits, ReturnType $returnType, Met
             return;
         }
 
-        $edits->replace($methodDeclaration->returnType, ' ' . $returnType);
+        $edits->replace($firstReturnType, ' ' . $returnType);
     }
 
     private function prototypeSameAsDeclaration(Method $methodPrototype, MethodDeclaration $methodDeclaration)
@@ -199,7 +210,7 @@ private function prototypeSameAsDeclaration(Method $methodPrototype, MethodDecla
 
             /** @var Parameter $parameter */
             foreach ($parameters as $parameter) {
-                $name = ltrim($parameter->variableName->getText($methodDeclaration->getFileContents()), '$');
+                $name = ltrim((string)$parameter->variableName->getText($methodDeclaration->getFileContents()), '$');
 
                 // if method prototype doesn't have the existing parameter
                 if (false === $methodPrototype->parameters()->has($name)) {
@@ -211,13 +222,13 @@ private function prototypeSameAsDeclaration(Method $methodPrototype, MethodDecla
                 $type = $parameterPrototype->type();
 
                 // adding a parameter type
-                if (null === $parameter->typeDeclaration && $type->notNone()) {
+                if (null === $parameter->typeDeclarationList && $type->notNone()) {
                     return false;
                 }
 
                 // if parameter has a different type
-                if (null !== $parameter->typeDeclaration) {
-                    $typeName = $parameter->typeDeclaration->getText($methodDeclaration->getFileContents());
+                if (null !== $parameter->typeDeclarationList) {
+                    $typeName = $parameter->typeDeclarationList->getText($methodDeclaration->getFileContents());
                     if ($type->notNone() && (string) $type !== $typeName) {
                         return false;
                     }
@@ -231,13 +242,14 @@ private function prototypeSameAsDeclaration(Method $methodPrototype, MethodDecla
         }
 
         // are we adding a return type?
-        if ($methodPrototype->returnType()->notNone() && null === $methodDeclaration->returnType) {
+        if ($methodPrototype->returnType()->notNone() && null === $methodDeclaration->returnTypeList) {
             return false;
         }
 
         // is the return type the same?
-        if (null !== $methodDeclaration->returnType) {
-            $name = $methodDeclaration->returnType->getText();
+        if (null !== $methodDeclaration->returnTypeList) {
+            // TODO: Does this work?
+            $name = $methodDeclaration->returnTypeList->getText();
             if ($methodPrototype->returnType()->__toString() !== $name) {
                 return false;
             }

lib/Adapter/TolerantParser/Updater/UseStatementUpdater.php

@@ -37,7 +37,7 @@ public function updateUseStatements(Edits $edits, SourceCode $prototype, SourceF
 
         $bodyNode = null;
         foreach ($node->getChildNodes() as $childNode) {
-            if ($childNode->getStart() > $startNode->getStart()) {
+            if ($childNode->getStartPosition() > $startNode->getStartPosition()) {
                 $bodyNode = $childNode;
                 break;
             }

lib/Adapter/TolerantParser/Util/NodeHelper.php

@@ -54,11 +54,11 @@ public static function resolvedShortName(Node $node, $type = null): string
     public static function emptyLinesPrecedingNode(Node $node): int
     {
         $contents = $node->getFileContents();
-        $preceding = substr($contents, 0, $node->getStart());
+        $preceding = substr($contents, 0, $node->getStartPosition());
 
         $lines = 0;
         $lastChar = null;
-        for ($i = $node->getStart() - 1; $i > 0; $i--) {
+        for ($i = $node->getStartPosition() - 1; $i > 0; $i--) {
             $char = $contents[$i];
 
             if ($char !== "\n") {

lib/Domain/Prototype/Parameters.php

@@ -4,7 +4,7 @@
 
 /**
  * @method \Phpactor\CodeBuilder\Domain\Prototype\Parameter first()
- * @method \Phpactor\CodeBuilder\Domain\Prototype\Parameter get()
+ * @method \Phpactor\CodeBuilder\Domain\Prototype\Parameter get(string $name)
  */
 class Parameters extends Collection
 {

lib/Domain/Prototype/Type.php

@@ -53,7 +53,7 @@ public function namespace(): ?string
             return null;
         }
 
-        if (false === strpos($this->type, '\\')) {
+        if (false === strrpos($this->type, '\\')) {
             return null;
         }