Provide type to idea when var is assignment from an array key

klesun · Sep 16, 2017 · 450c6a4 · 450c6a4
1 parent 516d93a
commit 450c6a4
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -5,13 +5,13 @@
     <vendor email="safronevev@gmail.com" url="http://midiana.lv/entry/phpstorm-deep-keys">Klesun</vendor>
 
     <description><![CDATA[
-This plugin greatly extends phpstorm's associative array completion and typing<br/>
 <ul>
-  <li>Associative array auto-completion inferred from other functions (in other files)</li>
-  <li>Go To Declaration</li>
-  <li>Specify array keys and reference functions in phpdoc</li>
-  <li>Preserve type info of object placed in an associative array</li>
+  <li>Associative array auto-completion inferred from other functions (in other files).</li>
+  <li>Go To Declaration.</li>
+  <li>Specify array keys and reference functions in phpdoc.</li>
+  <li>Preserve type info of object placed in an associative array.</li>
 </ul>
+This plugin greatly extends phpstorm's associative array completion and typing<br/>
 
 <br clear="all"/>
 <img style="width: 250px; height: auto;" src="https://user-images.githubusercontent.com/5202330/30349574-179c80e2-981c-11e7-9783-c7b9e6076c5c.png"/>

diff --git a/src/org/klesun/deep_keys/entry/AssocTypePvdr.java b/src/org/klesun/deep_keys/entry/AssocTypePvdr.java
@@ -7,6 +7,7 @@
 import com.jetbrains.php.lang.psi.elements.PhpExpression;
 import com.jetbrains.php.lang.psi.elements.PhpNamedElement;
 import com.jetbrains.php.lang.psi.elements.impl.ArrayAccessExpressionImpl;
+import com.jetbrains.php.lang.psi.elements.impl.AssignmentExpressionImpl;
 import com.jetbrains.php.lang.psi.resolve.types.PhpType;
 import com.jetbrains.php.lang.psi.resolve.types.PhpTypeProvider3;
 import org.jetbrains.annotations.Nullable;
@@ -38,9 +39,14 @@ public PhpType getType(PsiElement psi)
         boolean isFieldAcc = PlatformPatterns.psiElement(PhpElementTypes.ARRAY_ACCESS_EXPRESSION)
             .withParent(PlatformPatterns.psiElement(PhpElementTypes.FIELD_REFERENCE))
             .accepts(psi);
+        boolean isAssVal = Tls.cast(ArrayAccessExpressionImpl.class, psi)
+            .map(acc -> acc.getParent())
+            .fap(toCast(AssignmentExpressionImpl.class))
+            .map(ass -> psi.isEquivalentTo(ass.getValue()))
+            .def(false);
 
         // we will calculate type only for method or property access
-        if (!isMethCall && !isFieldAcc){
+        if (!isMethCall && !isFieldAcc && !isAssVal){
             return null;
         }
 

diff --git a/tests/src/DeepTest/UnitTest.php b/tests/src/DeepTest/UnitTest.php
@@ -984,6 +984,22 @@ public static function provideObjectInAKey()
         return $list;
     }
 
+    public function provideAssignObjectFromArray()
+    {
+        $list = [];
+
+        $rpcResult = [
+            'success' => true,
+            'result' => new PersonStorage(),
+        ];
+        $stor = $rpcResult['result'];
+        $rpcResult['result'] = [];
+        $stor->mainPerson[''];
+        $list[] = [$stor->mainPerson, ['name' => [], 'age' => []]];
+
+        return $list;
+    }
+
     //=============================
     // following are not implemented yet
     //=============================