1.change DirectMethodInvocation to MethodInvocation;

2.add "node.nullability";
XianyuTech · Nov 14, 2020 · 90fb874 · 90fb874
1 parent dcc980b
commit 90fb874
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/src/transformer/aop/aop_utils.dart b/lib/src/transformer/aop/aop_utils.dart
@@ -468,7 +468,7 @@ class AopUtils {
         return const DynamicType();
       }
       return TypeParameterType(
-          deepCopyASTNode(node.parameter), deepCopyASTNode(node.promotedBound));
+          deepCopyASTNode(node.parameter), node.nullability,deepCopyASTNode(node.promotedBound));
     }
     if (node is FunctionType) {
       return FunctionType(

diff --git a/lib/src/transformer/aop/aspectd_aop_call_visitor.dart b/lib/src/transformer/aop/aspectd_aop_call_visitor.dart
@@ -329,10 +329,10 @@ class AspectdAopCallVisitor extends Transformer {
       Class pointCutClass, Class procedureImpl, Procedure originalProcedure) {
     //Add library dependency
     //Add new Procedure
-    final DirectMethodInvocation mockedInvocation = DirectMethodInvocation(
+    final MethodInvocation mockedInvocation = MethodInvocation(
         AsExpression(PropertyGet(ThisExpression(), Name('target')),
             InterfaceType(procedureImpl, Nullability.legacy)),
-        originalProcedure,
+        originalProcedure.name,
         AopUtils.concatArguments4PointcutStubCall(originalProcedure));
     final bool shouldReturn =
         !(originalProcedure.function.returnType is VoidType);

diff --git a/lib/src/transformer/aop/aspectd_aop_execute_visitor.dart b/lib/src/transformer/aop/aspectd_aop_execute_visitor.dart
@@ -191,10 +191,10 @@ class AspectdAopExecuteVisitor extends RecursiveVisitor<void> {
     final Class pointcutClass = AopUtils.pointCutProceedProcedure.parent;
     AopUtils.insertLibraryDependency(pointcutLibrary, originalLibrary);
 
-    final DirectMethodInvocation mockedInvocation = DirectMethodInvocation(
+    final MethodInvocation mockedInvocation = MethodInvocation(
         AsExpression(PropertyGet(ThisExpression(), Name('target')),
             InterfaceType(originalClass, Nullability.legacy)),
-        originalStubProcedure,
+        originalStubProcedure.name,
         AopUtils.concatArguments4PointcutStubCall(originalProcedure));
 
     final Procedure stubProcedureNew = AopUtils.createStubProcedure(