Support for Variable and MethodCall with chain for autocompletion

app/Contexts/AbstractContext.php

@@ -9,6 +9,12 @@ abstract class AbstractContext
 {
     public array $children = [];
 
+    /**
+     * Whether this context can be found as last result
+     * in findAutocompleting method
+     */
+    public bool $findable = false;
+
     public bool $autocompleting = false;
 
     protected array $freshObject;
@@ -48,20 +54,20 @@ public function flip()
     public function findAutocompleting(?AbstractContext $context = null)
     {
         $context = $context ?? $this;
-        $result = $this->seachForAutocompleting($context, true);
+        $result = $this->searchForAutocompleting($context, true);
         $lastResult = null;
 
         while ($result !== null) {
             $lastResult = $result;
-            $result = $this->seachForAutocompleting($result);
+            $result = $this->searchForAutocompleting($result);
         }
 
         return $lastResult;
     }
 
-    protected function seachForAutocompleting(AbstractContext $context, $checkCurrent = false)
+    protected function searchForAutocompleting(AbstractContext $context, $checkCurrent = false)
     {
-        if ($checkCurrent && $context->autocompleting && ($context instanceof MethodCall || $context instanceof ObjectValue)) {
+        if ($checkCurrent && $context->autocompleting && $context->findable) {
             return $context;
         }
 

app/Contexts/MethodCall.php

@@ -4,6 +4,8 @@
 
 class MethodCall extends AbstractContext
 {
+    public bool $findable = true;
+
     public ?string $methodName = null;
 
     public ?string $className = null;

app/Contexts/ObjectValue.php

@@ -4,6 +4,8 @@
 
 class ObjectValue extends AbstractContext
 {
+    public bool $findable = true;
+
     public ?string $className = null;
 
     public Arguments $arguments;

app/Contexts/Variable.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Contexts;
+
+class Variable extends AbstractContext
+{
+    public bool $findable = true;
+
+    public ?string $name = null;
+
+    protected bool $hasChildren = false;
+
+    public function type(): string
+    {
+        return 'variable';
+    }
+
+    public function castToArray(): array
+    {
+        return [
+            'name' => $this->name,
+        ];
+    }
+}

app/Parser/Walker.php

@@ -49,9 +49,20 @@ protected function documentSkipsClosingQuote()
         return false;
     }
 
+    protected function documentSkipsObjectOperator(): bool
+    {
+        if (count($this->sourceFile->statementList) === 1 && $this->sourceFile->statementList[0] instanceof InlineHtml) {
+            $lastChars = substr($this->sourceFile->getFullText(), -2);
+
+            return $lastChars === '->';
+        }
+
+        return false;
+    }
+
     public function walk()
     {
-        if (!$this->documentSkipsClosingQuote()) {
+        if (!$this->documentSkipsClosingQuote() && !$this->documentSkipsObjectOperator()) {
             return new Base;
         }
 

app/Parsers/MemberAccessExpressionParser.php

@@ -17,8 +17,23 @@ class MemberAccessExpressionParser extends AbstractParser
      */
     protected AbstractContext $context;
 
+    /**
+     * Check if the node has a object operator and
+     * is a last element in the string
+     */
+    private function hasObjectOperator(MemberAccessExpression $node): bool
+    {
+        $name = $node->memberName->getFullText($node->getRoot()->getFullText());
+
+        return preg_match('/->' . $name . '->;$/s', $node->getFileContents());
+    }
+
     public function parse(MemberAccessExpression $node)
     {
+        if ($this->hasObjectOperator($node)) {
+            $this->context->autocompleting = true;
+        }
+
         $this->context->methodName = $node->memberName->getFullText($node->getRoot()->getFullText());
 
         foreach ($node->getDescendantNodes() as $child) {
@@ -30,7 +45,9 @@ public function parse(MemberAccessExpression $node)
 
             if ($child instanceof Variable) {
                 if ($child->getName() === 'this') {
-                    if ($child->getParent()->getParent() instanceof CallExpression) {
+                    $parent = $child->getParent();
+
+                    if ($parent?->getParent() instanceof CallExpression) {
                         // They are calling a method on the current class
                         $result = $this->context->nearestClassDefinition();
 
@@ -41,12 +58,14 @@ public function parse(MemberAccessExpression $node)
                         continue;
                     }
 
-                    $propName = $child->getParent()->memberName->getFullText($node->getRoot()->getFullText());
+                    if ($parent instanceof MemberAccessExpression) {
+                        $propName = $parent->memberName->getFullText($node->getRoot()->getFullText());
 
-                    $result = $this->context->searchForProperty($propName);
+                        $result = $this->context->searchForProperty($propName);
 
-                    if ($result) {
-                        $this->context->className = $result['types'][0] ?? null;
+                        if ($result) {
+                            $this->context->className = $result['types'][0] ?? null;
+                        }
                     }
 
                     continue;

app/Parsers/VariableParser.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Parsers;
+
+use App\Contexts\AbstractContext;
+use App\Contexts\Variable as VariableContext;
+use App\Parser\Settings;
+use Microsoft\PhpParser\Node\Expression\Variable;
+use Microsoft\PhpParser\PositionUtilities;
+
+class VariableParser extends AbstractParser
+{
+    /**
+     * @var VariableContext
+     */
+    protected AbstractContext $context;
+
+    /**
+     * Check if the node has a object operator and
+     * is a last element in the string
+     */
+    private function hasObjectOperator(Variable $node): bool
+    {
+        $name = $node->getName();
+
+        return preg_match('/\$' . $name . '->;$/s', $node->getFileContents());
+    }
+
+    public function parse(Variable $node)
+    {
+        if ($this->hasObjectOperator($node)) {
+            $this->context->autocompleting = true;
+        }
+
+        $this->context->name = $node->getName();
+
+        if (Settings::$capturePosition) {
+            $range = PositionUtilities::getRangeFromPosition(
+                $node->getStartPosition(),
+                mb_strlen($node->getText()),
+                $node->getRoot()->getFullText(),
+            );
+
+            if (Settings::$calculatePosition !== null) {
+                $range = Settings::adjustPosition($range);
+            }
+
+            $this->context->setPosition($range);
+        }
+
+        return $this->context;
+    }
+
+    public function initNewContext(): ?AbstractContext
+    {
+        return new VariableContext;
+    }
+}