Add AfterFunctionCallAnalysisEvent and AfterMethodCallAnalysisEvent s…

…upport for Args::getCallArgs
fp4php · Sep 11, 2022 · f76505b · f76505b
1 parent be711e6
commit f76505b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/src/Toolkit/Args.php b/src/Toolkit/Args.php
@@ -5,18 +5,19 @@
 namespace Fp\PsalmToolkit\Toolkit;
 
 use Fp\Collections\ArrayList;
-use Fp\Collections\NonEmptyArrayList;
 use PhpParser\Node;
 use Fp\Functional\Option\Option;
 use Psalm\CodeLocation;
 use Psalm\NodeTypeProvider;
 use Psalm\Plugin\EventHandler\Event\AfterExpressionAnalysisEvent;
+use Psalm\Plugin\EventHandler\Event\AfterFunctionCallAnalysisEvent;
 use Psalm\Plugin\EventHandler\Event\AfterStatementAnalysisEvent;
 use Psalm\Plugin\EventHandler\Event\AfterMethodCallAnalysisEvent;
 use Psalm\Plugin\EventHandler\Event\FunctionReturnTypeProviderEvent;
 use Psalm\Plugin\EventHandler\Event\MethodReturnTypeProviderEvent;
 use Psalm\StatementsSource;
 use Psalm\Type\Union;
+
 use function Fp\Evidence\proveOf;
 
 final class Args
@@ -29,38 +30,41 @@ public function getArgType(
         NodeTypeProvider |
         AfterStatementAnalysisEvent |
         AfterMethodCallAnalysisEvent |
+        AfterFunctionCallAnalysisEvent |
         MethodReturnTypeProviderEvent |
         FunctionReturnTypeProviderEvent |
         AfterExpressionAnalysisEvent $from,
         Node\Arg | Node\VariadicPlaceholder $for,
-    ): Option
-    {
+    ): Option {
         return proveOf($for, Node\Arg::class)
             ->flatMap(fn(Node\Arg $arg) => PsalmApi::$types->getType($from, $arg->value));
     }
 
     /**
      * @return Option<ArrayList<CallArg>>
      */
-    public function getCallArgs(MethodReturnTypeProviderEvent | FunctionReturnTypeProviderEvent $from): Option
-    {
+    public function getCallArgs(
+        MethodReturnTypeProviderEvent |
+        FunctionReturnTypeProviderEvent |
+        AfterFunctionCallAnalysisEvent |
+        AfterMethodCallAnalysisEvent $from,
+    ): Option {
         $source = match (true) {
             $from instanceof MethodReturnTypeProviderEvent => $from->getSource(),
             $from instanceof FunctionReturnTypeProviderEvent => $from->getStatementsSource(),
+            $from instanceof AfterFunctionCallAnalysisEvent => $from->getStatementsSource(),
+            $from instanceof AfterMethodCallAnalysisEvent => $from->getStatementsSource(),
+        };
+
+        $args = match (true) {
+            $from instanceof AfterFunctionCallAnalysisEvent => $from->getExpr()->getArgs(),
+            $from instanceof AfterMethodCallAnalysisEvent => $from->getExpr()->getArgs(),
+            default => $from->getCallArgs(),
         };
 
-        return ArrayList::collect($from->getCallArgs())
+        return ArrayList::collect($args)
             ->traverseOption(fn($arg) => $this->getArgType($from, $arg)->map(
                 fn(Union $type) => new CallArg($arg, new CodeLocation($source, $arg), $type)
             ));
     }
-
-    /**
-     * @return Option<NonEmptyArrayList<CallArg>>
-     */
-    public function getNonEmptyCallArgs(MethodReturnTypeProviderEvent | FunctionReturnTypeProviderEvent $from): Option
-    {
-        return $this->getCallArgs($from)
-            ->flatMap(fn($args) => $args->toNonEmptyArrayList());
-    }
 }
diff --git a/src/Toolkit/Types.php b/src/Toolkit/Types.php
@@ -12,6 +12,7 @@
 use Psalm\Internal\Type\TypeExpander;
 use Psalm\NodeTypeProvider;
 use Psalm\Plugin\EventHandler\Event\AfterExpressionAnalysisEvent;
+use Psalm\Plugin\EventHandler\Event\AfterFunctionCallAnalysisEvent;
 use Psalm\Plugin\EventHandler\Event\AfterMethodCallAnalysisEvent;
 use Psalm\Plugin\EventHandler\Event\FunctionReturnTypeProviderEvent;
 use Psalm\Plugin\EventHandler\Event\MethodReturnTypeProviderEvent;
@@ -140,6 +141,7 @@ public function getType(
         StatementsSource |
         NodeTypeProvider |
         AfterMethodCallAnalysisEvent |
+        AfterFunctionCallAnalysisEvent |
         MethodReturnTypeProviderEvent |
         AfterStatementAnalysisEvent |
         FunctionReturnTypeProviderEvent |
@@ -155,6 +157,7 @@ public function getType(
             $from instanceof FunctionReturnTypeProviderEvent => $from->getStatementsSource()->getNodeTypeProvider(),
             $from instanceof AfterExpressionAnalysisEvent => $from->getStatementsSource()->getNodeTypeProvider(),
             $from instanceof AfterMethodCallAnalysisEvent => $from->getStatementsSource()->getNodeTypeProvider(),
+            $from instanceof AfterFunctionCallAnalysisEvent => $from->getStatementsSource()->getNodeTypeProvider(),
         };
 
         return Option::fromNullable($provider->getType($for));