Fixes #1176: regression tests updated
diff --git a/LanguageFeatures/regression/34482_t01.dart b/LanguageFeatures/regression/34482_t01.dart
index 0aa5c6f..f4df360 100644
--- a/LanguageFeatures/regression/34482_t01.dart
+++ b/LanguageFeatures/regression/34482_t01.dart
@@ -11,10 +11,17 @@
import "dart:async";
main() {
- FutureOr f = new Future(() => 12345);
+ Future f = new Future(() => 12345);
Future? f1 = f;
Future<dynamic>? f2 = f;
- Future<Object>? f3 = f;
+ Future<Object?>? f3 = f;
Future<void>? f4 = f;
Future<FutureOr>? f5 = f;
+
+ FutureOr? f6 = f;
+ FutureOr<dynamic>? f7 = f;
+ FutureOr<Object>? f8 = f;
+ FutureOr<Object?>? f9 = f;
+ FutureOr<void>? f10 = f;
+ FutureOr<FutureOr>? f11 = f;
}
diff --git a/LanguageFeatures/regression/34741_t01.dart b/LanguageFeatures/regression/34741_t01.dart
index 25211b0..fcbc410 100644
--- a/LanguageFeatures/regression/34741_t01.dart
+++ b/LanguageFeatures/regression/34741_t01.dart
@@ -5,7 +5,10 @@
/// @description Regression test for the Issue 34741: Analyzer doesn't allow
/// function to use type parameter [<Instance of 'TypeParameterMember'>] as a
/// type argument whereas dart does allow this.
-/// @Issue 34741
+/// @note: after https://github.com/dart-lang/language/issues/496 generic
+/// function types as type arguments and bounds are allowed, so there should not
+/// be errors here.
+/// @Issue 30931, 34741
/// @author iarkh@unipro.ru
Type typeOf<X>() => X;
@@ -15,9 +18,5 @@
main() {
typeOf<G>();
-//^
-// [cfe] A generic function type can't be used as a type argument.
-// ^
-// [analyzer] COMPILE_TIME_ERROR.GENERIC_FUNCTION_TYPE_CANNOT_BE_TYPE_ARGUMENT
typeOf<G1>();
}
