Use search for abstract function implementations when providing used …

…keys completion
klesun · May 23, 2018 · c12fad2 · c12fad2
1 parent 11125f6
commit c12fad2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/org/klesun/deep_assoc_completion/resolvers/KeyUsageResolver.java b/src/org/klesun/deep_assoc_completion/resolvers/KeyUsageResolver.java
@@ -139,16 +139,24 @@ private L<String> findClsMagicCtorUsedKeys(NewExpressionImpl newEx, int order)
             });
     }
 
+    private static L<? extends Function> getImplementations(Function meth)
+    {
+        L<Function> result = Tls.cast(Method.class, meth)
+            .fap(m -> MethCallRes.findOverridingMethods(m)).map(a -> a);
+        result.add(meth);
+        return result;
+    }
+
     private L<String> findKeysUsedOnExpr(PhpExpression arrCtor)
     {
         return opt(arrCtor.getParent())
             .fop(toCast(ParameterList.class))
             .fap(argList -> {
                 int order = L(argList.getParameters()).indexOf(arrCtor);
                 return resolveFunc(argList)
-                    .thn(asd -> System.out.println("resolved func " + asd.getClass() + " " + asd.getName()))
                     .fap(meth -> list(
-                        resolveArgUsedKeys(meth, order),
+                        getImplementations(meth)
+                            .fap(ipl -> resolveArgUsedKeys(ipl, order)),
                         opt(meth.getName())
                             .flt(n -> n.equals("array_merge") || n.equals("array_replace"))
                             .fap(n -> resolveReplaceKeys(argList, order))

diff --git a/src/org/klesun/deep_assoc_completion/resolvers/MethCallRes.java b/src/org/klesun/deep_assoc_completion/resolvers/MethCallRes.java
@@ -39,7 +39,7 @@ public static boolean nameIs(MethodReferenceImpl call, String cls, String mth)
         return callCls.equals(cls) && callMet.equals(mth);
     }
 
-    private static L<Method> findOverridingMethods(Method meth)
+    public static L<Method> findOverridingMethods(Method meth)
     {
         return opt(PhpIndex.getInstance(meth.getProject()))
             .fop(idx -> opt(meth.getContainingClass())

diff --git a/tests/index.php b/tests/index.php
@@ -576,6 +576,14 @@ public function testSelfSuggestion()
     // not implemented follow
     //============================
 
+    public function provideAbstractMethodUsedKeys()
+    {
+        $result = (new \Gtl\AmadeusSoapActions\AmadeusGetFareRulesAction('GENERIC'))
+            ->execute([
+                ''
+            ]);
+    }
+
     private static function makeCoolOutfit($materials)
     {
         return [