Add ArrayValue to searchForAutocompleting N1ebieski#7

Author: N1ebieski

app/Contexts/AbstractContext.php

@@ -2,14 +2,19 @@
 
 namespace App\Contexts;
 
-use App\Contexts\Contracts\PossibleAutocompleting;
 use Illuminate\Support\Arr;
 use Microsoft\PhpParser\Range;
 
 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;
@@ -62,7 +67,7 @@ public function findAutocompleting(?AbstractContext $context = null)
 
     protected function searchForAutocompleting(AbstractContext $context, $checkCurrent = false)
     {
-        if ($checkCurrent && $context->autocompleting && $context instanceof PossibleAutocompleting) {
+        if ($checkCurrent && $context->autocompleting && $context->findable) {
             return $context;
         }
 

app/Contexts/ArrayValue.php

@@ -2,9 +2,7 @@
 
 namespace App\Contexts;
 
-use App\Contexts\Contracts\PossibleAutocompleting;
-
-class ArrayValue extends AbstractContext implements PossibleAutocompleting
+class ArrayValue extends AbstractContext
 {
     public function type(): string
     {

app/Contexts/Contracts/PossibleAutocompleting.php

@@ -2,10 +2,10 @@
 
 namespace App\Contexts;
 
-use App\Contexts\Contracts\PossibleAutocompleting;
-
-class MethodCall extends AbstractContext implements PossibleAutocompleting
+class MethodCall extends AbstractContext
 {
+    public bool $findable = true;
+
     public ?string $methodName = null;
 
     public ?string $className = null;

app/Contexts/MethodCall.php

@@ -2,10 +2,10 @@
 
 namespace App\Contexts;
 
-use App\Contexts\Contracts\PossibleAutocompleting;
-
-class ObjectValue extends AbstractContext implements PossibleAutocompleting
+class ObjectValue extends AbstractContext
 {
+    public bool $findable = true;
+
     public ?string $className = null;
 
     public Arguments $arguments;

app/Contexts/ObjectValue.php

@@ -35,9 +35,11 @@ public function parse(ArrayCreationExpression $node)
         // then we need to ignore autocompleting for ArrayValue because
         // priority is given to App\Contexts\MethodCall
         if (!$this->isParentNode($node, CallExpression::class)) {
-            $this->context->autocompleting = $node->closeParenOrBracket instanceof MissingToken;
+            $this->context->findable = true;
         }
 
+        $this->context->autocompleting = $node->closeParenOrBracket instanceof MissingToken;
+
         return $this->context;
     }