From 4938762bf764b0edb357f831d7094d268e3fa9be Mon Sep 17 00:00:00 2001
From: Shahid5577 <shashaik673@gmail.com>
Date: Sun, 31 May 2026 19:21:48 +0530
Subject: [PATCH] Fix failing reflectable tests and example code

---
 packages/reflectable/example/bin/example.dart       |  2 +-
 packages/test_reflectable/test/delegate_test.dart   |  6 +++---
 packages/test_reflectable/test/invoke_test.dart     | 13 +++++++------
 packages/test_reflectable/test/invoker_test.dart    |  2 +-
 .../test_reflectable/test/new_instance_test.dart    |  4 ++--
 .../test_reflectable/test/no_such_method_test.dart  | 10 +++++-----
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/packages/reflectable/example/bin/example.dart b/packages/reflectable/example/bin/example.dart
index 4d5998ea..fc413450 100644
--- a/packages/reflectable/example/bin/example.dart
+++ b/packages/reflectable/example/bin/example.dart
@@ -18,7 +18,7 @@ const myReflectable = MyReflectable();
 class A {
   int arg0() => 42;
   int arg1(int x) => x - 42;
-  int arg1to3(int x, int y, [int z = 0, w]) => x + y + z * 42;
+  int arg1to3(int x, int y, [int z = 0, String? w]) => x + y + z * 42;
   int argNamed(int x, int y, {int z = 42}) => x + y - z;
   int operator +(int x) => 42 + x;
   int operator [](int x) => 42 + x;
diff --git a/packages/test_reflectable/test/delegate_test.dart b/packages/test_reflectable/test/delegate_test.dart
index 059b907a..b28a477e 100644
--- a/packages/test_reflectable/test/delegate_test.dart
+++ b/packages/test_reflectable/test/delegate_test.dart
@@ -42,17 +42,17 @@ class A {
   @D()
   int arg1(int x) => 101;
 
-  int arg2to4(A x, int y, [Reflector? z, w]) => 102;
+  int arg2to4(A x, int y, [Reflector? z, int? w]) => 102;
 
   @D()
-  int argNamed(int x, y, {num? z}) => 103;
+  int argNamed(int x, Object y, {num? z}) => 103;
 
   int operator +(int x) => 104;
 
   @D()
   int operator [](int x) => indexTarget;
 
-  void operator []=(int x, v) {
+  void operator []=(int x, int v) {
     indexTarget = v;
   }
 
diff --git a/packages/test_reflectable/test/invoke_test.dart b/packages/test_reflectable/test/invoke_test.dart
index 37ae8cae..cf164ce0 100644
--- a/packages/test_reflectable/test/invoke_test.dart
+++ b/packages/test_reflectable/test/invoke_test.dart
@@ -21,11 +21,11 @@ const myReflectable = MyReflectable();
 class A {
   int arg0() => 42;
   int arg1(int x) => x - 42;
-  int arg1to3(int x, int y, [int z = 0, w]) => x + y + z * 42;
+  int arg1to3(int x, int y, [int z = 0, String? w]) => x + y + z * 42;
   int argNamed(int x, int y, {int z = 42}) => x + y - z;
-  int operator +(x) => (42 + x).toInt();
-  int operator [](x) => 42 + (x as int);
-  void operator []=(x, v) {
+  int operator +(int x) => 42 + x;
+  int operator [](int x) => 42 + x;
+  void operator []=(int x, int v) {
     f = x + v;
   }
 
@@ -35,8 +35,9 @@ class A {
   int f = 0;
 
   static int noArguments() => 42;
-  static int oneArgument(x) => x - 42;
-  static int optionalArguments(x, y, [z = 0, w]) => x + y + z * 42;
+  static int oneArgument(int x) => x - 42;
+  static int optionalArguments(int x, int y, [int z = 0, String? w]) =>
+      x + y + z * 42;
   static int namedArguments(int x, int y, {int z = 42}) => x + y - z;
 }
 
diff --git a/packages/test_reflectable/test/invoker_test.dart b/packages/test_reflectable/test/invoker_test.dart
index 13b1880e..1632f193 100644
--- a/packages/test_reflectable/test/invoker_test.dart
+++ b/packages/test_reflectable/test/invoker_test.dart
@@ -25,7 +25,7 @@ class A {
   A(this.f);
   int arg0() => 42 + f;
   int arg1(int x) => x - 42 + f;
-  int arg1to3(int x, int y, [int z = 0, w]) => x + y + z * 42 + f;
+  int arg1to3(int x, int y, [int z = 0, String? w]) => x + y + z * 42 + f;
   int argNamed(int x, int y, {int z = 42}) => x + y - z + f;
 }
 
diff --git a/packages/test_reflectable/test/new_instance_test.dart b/packages/test_reflectable/test/new_instance_test.dart
index 27201d76..44318640 100644
--- a/packages/test_reflectable/test/new_instance_test.dart
+++ b/packages/test_reflectable/test/new_instance_test.dart
@@ -37,8 +37,8 @@ class A {
   A.positional(int x) : f = x - 42;
 
   @C()
-  A.optional(int x, int y, [int z = 1, w])
-    : f = x + y + z * 42 + ((w ?? 10) as int);
+  A.optional(int x, int y, [int z = 1, int? w])
+    : f = x + y + z * 42 + (w ?? 10);
 
   @C()
   A.argNamed(int x, int y, {int z = 42, int? p}) : f = x + y - z - (p ?? 10);
diff --git a/packages/test_reflectable/test/no_such_method_test.dart b/packages/test_reflectable/test/no_such_method_test.dart
index d44b86c5..55301240 100644
--- a/packages/test_reflectable/test/no_such_method_test.dart
+++ b/packages/test_reflectable/test/no_such_method_test.dart
@@ -23,14 +23,14 @@ const reflector = Reflector();
 class A {
   int arg0() => 100;
   int arg1(int x) => 101;
-  int arg2to4(A x, int y, [Reflector? z, w]) => 102;
-  int argNamed(int x, y, {num? z}) => 103;
+  int arg2to4(A x, int y, [Reflector? z, Object? w]) => 102;
+  int argNamed(int x, int y, {num? z}) => 103;
   int operator [](int x) => 104;
-  void operator []=(int x, v) {}
+  void operator []=(int x, Object? v) {}
 
   // Not a movie title.
-  int deepThrow(o) => deepThrowImpl(o);
-  int deepThrowImpl(o) => o.thisGetterDoesNotExist;
+  int deepThrow(Object o) => deepThrowImpl(o);
+  int deepThrowImpl(dynamic o) => o.thisGetterDoesNotExist;
 }
 
 Matcher throwsReflectableNoSuchMethod = throwsA(