Infer type from interface func @return doc

klesun · Aug 29, 2018 · 0879071 · 0879071
1 parent 74263ff
commit 0879071
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 3 deletions.
diff --git a/src/org/klesun/deep_assoc_completion/resolvers/MethCallRes.java b/src/org/klesun/deep_assoc_completion/resolvers/MethCallRes.java
@@ -129,7 +129,7 @@ public static F<FuncCtx, L<DeepType>> findMethRetType(Method meth)
         return (FuncCtx funcCtx) -> {
             L<Method> impls = list(meth);
             if (meth.isAbstract()) {
-                impls = findOverridingMethods(meth);
+                impls.addAll(findOverridingMethods(meth));
                 // ignore $this and args in implementations
                 // since there may be dozens of them (Laravel)
                 funcCtx = new FuncCtx(funcCtx.getSearch());
@@ -138,7 +138,8 @@ public static F<FuncCtx, L<DeepType>> findMethRetType(Method meth)
             return impls.fap(m -> list(
                 ClosRes.getReturnedValue(m, finalCtx).types,
                 opt(meth.getDocComment()).map(doc -> doc.getReturnTag())
-                    .fap(tag -> parseReturnDoc(tag, finalCtx).types)
+                    .fap(tag -> parseReturnDoc(tag, finalCtx).types),
+                opt(m.getReturnType()).fap(rt -> list(new DeepType(rt, rt.getType())))
             ).fap(a -> a));
         };
     }

diff --git a/tests/src/DeepTest/IKonohaCitizen.php b/tests/src/DeepTest/IKonohaCitizen.php
@@ -12,4 +12,13 @@ interface IKonohaCitizen
      * ]
      */
     public function payTaxes();
+
+    /**
+     * @return array [
+     *     'whoShouldBeTheHokage' => 'Kakashi',
+     *     'whoStealsFromTreasury' => 'Sakura',
+     *     'whoShouldNotExist' => 'Boruto',
+     * ]
+     */
+    public function getHonestOpinion();
 }
diff --git a/tests/src/DeepTest/Konohamaru.php b/tests/src/DeepTest/Konohamaru.php
@@ -13,4 +13,9 @@ public function payTaxes()
             'familyTax' => '0',
         ];
     }
+
+    public function getHonestOpinion()
+    {
+        return json_decode(file_get_contents(__DIR__.'/honest_opinion.json'));
+    }
 }
diff --git a/tests/src/DeepTest/Naruto.php b/tests/src/DeepTest/Naruto.php
@@ -36,4 +36,9 @@ public function payTaxes()
             'familyTax' => '0', // Naruto has no family
         ];
     }
+
+    public function getHonestOpinion()
+    {
+        return json_decode(file_get_contents('http://narutohonestopinion.org/json'));
+    }
 }
diff --git a/tests/src/DeepTest/UnitTest.php b/tests/src/DeepTest/UnitTest.php
@@ -562,7 +562,7 @@ public static function provideBuiltIns()
         return $list;
     }
 
-    private static function makeKonohaCitizen()
+    private static function makeKonohaCitizen(): IKonohaCitizen
     {
         if (rand() % 2) {
             $konohanian = Naruto::kageBunshin();
@@ -2202,6 +2202,18 @@ public function provideAssocBuiltIns($handle)
         return $list;
     }
 
+    public function provideIfcReturnDoc()
+    {
+        $honestOpinion = static::makeKonohaCitizen()->getHonestOpinion();
+        $honestOpinion[''];
+        $list[] = [$honestOpinion, [
+            'whoShouldBeTheHokage' => [],
+            'whoStealsFromTreasury' => [],
+            'whoShouldNotExist' => [],
+        ]];
+        return $list;
+    }
+
     //=============================
     // following are not implemented yet
     //=============================