Resolve parenthesised expression properly

klesun · Jun 21, 2018 · adb505d · adb505d
1 parent c574ad8
commit adb505d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/src/org/klesun/deep_assoc_completion/DeepTypeResolver.java b/src/org/klesun/deep_assoc_completion/DeepTypeResolver.java
@@ -2,6 +2,7 @@
 
 import com.intellij.psi.*;
 import com.jetbrains.php.lang.psi.elements.AssignmentExpression;
+import com.jetbrains.php.lang.psi.elements.ParenthesizedExpression;
 import com.jetbrains.php.lang.psi.elements.PhpExpression;
 import com.jetbrains.php.lang.psi.elements.impl.*;
 import org.klesun.deep_assoc_completion.helpers.FuncCtx;
@@ -51,6 +52,10 @@ public static Opt<L<DeepType>> resolveIn(PsiElement expr, FuncCtx ctx)
                 .map(ass -> ass.getValue())
                 .fop(toCast(PhpExpression.class))
                 .map(val -> ctx.findExprType(val).types)
+            , Tls.cast(ParenthesizedExpression.class, expr)
+                .map(par -> par.getArgument())
+                .fop(toCast(PhpExpression.class))
+                .map(val -> ctx.findExprType(val).types)
             , Tls.cast(ClassConstantReferenceImpl.class, expr)
                 .map(cst -> L(cst.multiResolve(false))
                     .map(ref -> ref.getElement())

diff --git a/tests/index.php b/tests/index.php
@@ -555,6 +555,9 @@ private static function testInArray($asd)
         }
         if (array_intersect([''], $types, ['ASD'])) {
 
+        }
+        if (($types[$i] ?? null) === '') {
+
         }
     }
 

diff --git a/tests/src/DeepTest/UnitTest.php b/tests/src/DeepTest/UnitTest.php
@@ -1854,6 +1854,15 @@ public function provideArrayMapKeys()
         return $list;
     }
 
+    public function provideBracketExpression()
+    {
+        $dict = ['vova' => 1, 'misha' => 2];
+        $asd = ($dict ?? null);
+        $asd[''];
+        $list[] = [$asd, ['vova' => [], 'misha' => []]];
+        return $list;
+    }
+
     //=============================
     // following are not implemented yet
     //=============================
-Original file line number
+Diff line change
@@ Expand Up / @@ -555,6 +555,9 @@ private static function testInArray($asd) @@
             }
             if (array_intersect([''], $types, ['ASD'])) {
+            }
+            if (($types[$i] ?? null) === '') {
             }
         }
@@ Expand Down @@