#1122. nonfunction-type-aliases experimental flag removed
diff --git a/Language/Classes/Abstract_Instance_Members/inherited_t13.dart b/Language/Classes/Abstract_Instance_Members/inherited_t13.dart
index ed85d4d..8471dcb 100644
--- a/Language/Classes/Abstract_Instance_Members/inherited_t13.dart
+++ b/Language/Classes/Abstract_Instance_Members/inherited_t13.dart
@@ -11,8 +11,6 @@
/// declared in a concrete class. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
// ^
// [cfe] unspecified
diff --git a/Language/Classes/Abstract_Instance_Members/inherited_t14.dart b/Language/Classes/Abstract_Instance_Members/inherited_t14.dart
index bd02de3..4b08885 100644
--- a/Language/Classes/Abstract_Instance_Members/inherited_t14.dart
+++ b/Language/Classes/Abstract_Instance_Members/inherited_t14.dart
@@ -11,7 +11,6 @@
/// inherited in a concrete class. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class A {
foo([x]);
}
diff --git a/Language/Classes/Abstract_Instance_Members/inherited_t15.dart b/Language/Classes/Abstract_Instance_Members/inherited_t15.dart
index 3cd52c0..d006210 100644
--- a/Language/Classes/Abstract_Instance_Members/inherited_t15.dart
+++ b/Language/Classes/Abstract_Instance_Members/inherited_t15.dart
@@ -12,7 +12,6 @@
/// Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
foo([x]) {}
}
diff --git a/Language/Classes/Abstract_Instance_Members/invocation_t05.dart b/Language/Classes/Abstract_Instance_Members/invocation_t05.dart
index 0a4ea23..cfc9e54 100644
--- a/Language/Classes/Abstract_Instance_Members/invocation_t05.dart
+++ b/Language/Classes/Abstract_Instance_Members/invocation_t05.dart
@@ -10,8 +10,6 @@
/// abstract method that is inherited from non-direct superclass. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class A {
m1();
}
diff --git a/Language/Classes/Abstract_Instance_Members/invocation_t06.dart b/Language/Classes/Abstract_Instance_Members/invocation_t06.dart
index ab0297d..8e34a06 100644
--- a/Language/Classes/Abstract_Instance_Members/invocation_t06.dart
+++ b/Language/Classes/Abstract_Instance_Members/invocation_t06.dart
@@ -12,7 +12,6 @@
///
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
abstract class A {
diff --git a/Language/Classes/Abstract_Instance_Members/override_default_value_t10.dart b/Language/Classes/Abstract_Instance_Members/override_default_value_t10.dart
index ce711bd..f6608b1 100644
--- a/Language/Classes/Abstract_Instance_Members/override_default_value_t10.dart
+++ b/Language/Classes/Abstract_Instance_Members/override_default_value_t10.dart
@@ -18,7 +18,6 @@
/// @issue 27476
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
foo([x = 1]) {}
}
diff --git a/Language/Classes/Abstract_Instance_Members/override_less_positional_parameters_t03.dart b/Language/Classes/Abstract_Instance_Members/override_less_positional_parameters_t03.dart
index 3eb3608..0ffd3df 100644
--- a/Language/Classes/Abstract_Instance_Members/override_less_positional_parameters_t03.dart
+++ b/Language/Classes/Abstract_Instance_Members/override_less_positional_parameters_t03.dart
@@ -11,8 +11,6 @@
/// parameters than m2. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class A {
foo(var a, [x, y]);
}
diff --git a/Language/Classes/Abstract_Instance_Members/override_more_required_parameters_t05.dart b/Language/Classes/Abstract_Instance_Members/override_more_required_parameters_t05.dart
index 6584947..5b0e5c7 100644
--- a/Language/Classes/Abstract_Instance_Members/override_more_required_parameters_t05.dart
+++ b/Language/Classes/Abstract_Instance_Members/override_more_required_parameters_t05.dart
@@ -11,8 +11,6 @@
/// greater number of required parameters. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
f(var x) {}
}
diff --git a/Language/Classes/Abstract_Instance_Members/override_no_named_parameters_t07.dart b/Language/Classes/Abstract_Instance_Members/override_no_named_parameters_t07.dart
index ae79b62..669ae00 100644
--- a/Language/Classes/Abstract_Instance_Members/override_no_named_parameters_t07.dart
+++ b/Language/Classes/Abstract_Instance_Members/override_no_named_parameters_t07.dart
@@ -11,8 +11,6 @@
/// overridden (2 vs 3) and neither have any required parameters. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
f({var x, var y, var z}) {}
}
diff --git a/Language/Classes/Abstract_Instance_Members/override_not_a_subtype_t05.dart b/Language/Classes/Abstract_Instance_Members/override_not_a_subtype_t05.dart
index d9fe18c..3bbea79 100644
--- a/Language/Classes/Abstract_Instance_Members/override_not_a_subtype_t05.dart
+++ b/Language/Classes/Abstract_Instance_Members/override_not_a_subtype_t05.dart
@@ -11,8 +11,6 @@
/// (parameters of both methods being completely identical). Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
int foo(var x) => 42;
}
diff --git a/Language/Classes/Abstract_Instance_Members/same_name_static_method_in_superclass_t07.dart b/Language/Classes/Abstract_Instance_Members/same_name_static_method_in_superclass_t07.dart
index 67a45cb..5962e2e 100644
--- a/Language/Classes/Abstract_Instance_Members/same_name_static_method_in_superclass_t07.dart
+++ b/Language/Classes/Abstract_Instance_Members/same_name_static_method_in_superclass_t07.dart
@@ -13,8 +13,6 @@
/// @issue 27476
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
static var f;
}
diff --git a/Language/Classes/Constructors/Constant_Constructors/name_t01.dart b/Language/Classes/Constructors/Constant_Constructors/name_t01.dart
index 15aae65..8b19e09 100644
--- a/Language/Classes/Constructors/Constant_Constructors/name_t01.dart
+++ b/Language/Classes/Constructors/Constant_Constructors/name_t01.dart
@@ -8,8 +8,6 @@
/// the type alias.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class C {
const CAlias() {}
//^^^^^
diff --git a/Language/Classes/Constructors/Constant_Constructors/not_a_constant_in_superclass_t03.dart b/Language/Classes/Constructors/Constant_Constructors/not_a_constant_in_superclass_t03.dart
index 443b266..4aa6a7e 100644
--- a/Language/Classes/Constructors/Constant_Constructors/not_a_constant_in_superclass_t03.dart
+++ b/Language/Classes/Constructors/Constant_Constructors/not_a_constant_in_superclass_t03.dart
@@ -13,7 +13,6 @@
/// by non-constant expression. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
}
diff --git a/Language/Classes/Constructors/Constant_Constructors/superinitializer_t05.dart b/Language/Classes/Constructors/Constant_Constructors/superinitializer_t05.dart
index 51bd2bc..d3e2ff8 100644
--- a/Language/Classes/Constructors/Constant_Constructors/superinitializer_t05.dart
+++ b/Language/Classes/Constructors/Constant_Constructors/superinitializer_t05.dart
@@ -10,7 +10,6 @@
/// superinitializer is a call to non const constructor. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class C {
C();
}
diff --git a/Language/Classes/Constructors/Constant_Constructors/superinitializer_t06.dart b/Language/Classes/Constructors/Constant_Constructors/superinitializer_t06.dart
index ea01606..8bcd935 100644
--- a/Language/Classes/Constructors/Constant_Constructors/superinitializer_t06.dart
+++ b/Language/Classes/Constructors/Constant_Constructors/superinitializer_t06.dart
@@ -10,8 +10,6 @@
/// superinitializer call is a call of a constant constructor. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class C {
const C();
}
diff --git a/Language/Classes/Constructors/Factories/name_t06.dart b/Language/Classes/Constructors/Factories/name_t06.dart
index 932e7bf..f6c1330 100644
--- a/Language/Classes/Constructors/Factories/name_t06.dart
+++ b/Language/Classes/Constructors/Factories/name_t06.dart
@@ -8,8 +8,6 @@
/// type alias.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class S {}
typedef SAlias = S;
diff --git a/Language/Classes/Constructors/Factories/name_t07.dart b/Language/Classes/Constructors/Factories/name_t07.dart
index e8cc31a..4a8cb06 100644
--- a/Language/Classes/Constructors/Factories/name_t07.dart
+++ b/Language/Classes/Constructors/Factories/name_t07.dart
@@ -8,8 +8,6 @@
/// type alias.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class C {
factory CAlias() => throw "Should not reach here";
// ^^^^^^
diff --git a/Language/Classes/Constructors/Factories/redirecting_constructor_call_t03.dart b/Language/Classes/Constructors/Factories/redirecting_constructor_call_t03.dart
index d3095fd..49ea1e6 100644
--- a/Language/Classes/Constructors/Factories/redirecting_constructor_call_t03.dart
+++ b/Language/Classes/Constructors/Factories/redirecting_constructor_call_t03.dart
@@ -13,7 +13,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 45051
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../../Utils/expect.dart";
class F {
diff --git a/Language/Classes/Constructors/Factories/redirecting_constructor_t04.dart b/Language/Classes/Constructors/Factories/redirecting_constructor_t04.dart
index 68ea658..edbfb9a 100644
--- a/Language/Classes/Constructors/Factories/redirecting_constructor_t04.dart
+++ b/Language/Classes/Constructors/Factories/redirecting_constructor_t04.dart
@@ -14,7 +14,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 45051
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../../Utils/expect.dart";
class A {
diff --git a/Language/Classes/Constructors/Factories/redirecting_to_itself_t05.dart b/Language/Classes/Constructors/Factories/redirecting_to_itself_t05.dart
index 41ae458..9566281 100644
--- a/Language/Classes/Constructors/Factories/redirecting_to_itself_t05.dart
+++ b/Language/Classes/Constructors/Factories/redirecting_to_itself_t05.dart
@@ -9,8 +9,6 @@
/// redirects to itself. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class F {
factory F() = FAlias;
// ^
diff --git a/Language/Classes/Constructors/Factories/redirecting_to_itself_t06.dart b/Language/Classes/Constructors/Factories/redirecting_to_itself_t06.dart
index 769a4ff..17512b2 100644
--- a/Language/Classes/Constructors/Factories/redirecting_to_itself_t06.dart
+++ b/Language/Classes/Constructors/Factories/redirecting_to_itself_t06.dart
@@ -9,8 +9,6 @@
/// redirects to non-named and vice versa. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class F {
factory F() = FAlias.id;
// ^^^^^^^^^
diff --git a/Language/Classes/Constructors/Factories/redirecting_to_itself_t07.dart b/Language/Classes/Constructors/Factories/redirecting_to_itself_t07.dart
index 228bd79..fb5bde8 100644
--- a/Language/Classes/Constructors/Factories/redirecting_to_itself_t07.dart
+++ b/Language/Classes/Constructors/Factories/redirecting_to_itself_t07.dart
@@ -9,8 +9,6 @@
/// redirects to itself through a cycle.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class F1 {
factory F1() = F2;
// ^^
diff --git a/Language/Classes/Constructors/Factories/return_type_t08.dart b/Language/Classes/Constructors/Factories/return_type_t08.dart
index be12080..5838279 100644
--- a/Language/Classes/Constructors/Factories/return_type_t08.dart
+++ b/Language/Classes/Constructors/Factories/return_type_t08.dart
@@ -11,7 +11,6 @@
/// and no static warnings are produced. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class S {}
class A extends S {
diff --git a/Language/Classes/Constructors/Factories/return_wrong_type_t08.dart b/Language/Classes/Constructors/Factories/return_wrong_type_t08.dart
index de17949..0bc24ff 100644
--- a/Language/Classes/Constructors/Factories/return_wrong_type_t08.dart
+++ b/Language/Classes/Constructors/Factories/return_wrong_type_t08.dart
@@ -8,8 +8,6 @@
/// from factory constructor M produces a compile error. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class C {}
typedef CAlias = C;
diff --git a/Language/Classes/Constructors/Factories/return_wrong_type_t09.dart b/Language/Classes/Constructors/Factories/return_wrong_type_t09.dart
index 61c23be..d395ea7 100644
--- a/Language/Classes/Constructors/Factories/return_wrong_type_t09.dart
+++ b/Language/Classes/Constructors/Factories/return_wrong_type_t09.dart
@@ -8,8 +8,6 @@
/// from factory M.id produces a compile error. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class I {}
class C implements I {}
diff --git a/Language/Classes/Constructors/Factories/return_wrong_type_t10.dart b/Language/Classes/Constructors/Factories/return_wrong_type_t10.dart
index f52f637..1106257 100644
--- a/Language/Classes/Constructors/Factories/return_wrong_type_t10.dart
+++ b/Language/Classes/Constructors/Factories/return_wrong_type_t10.dart
@@ -9,8 +9,6 @@
/// from factory constructor M does not produce an error. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class A {
A() {}
factory A.foo() => CAlias.foo();
diff --git a/Language/Classes/Constructors/Generative_Constructors/execution_of_a_superinitializer_t02.dart b/Language/Classes/Constructors/Generative_Constructors/execution_of_a_superinitializer_t02.dart
index fcb1595..50346c5 100644
--- a/Language/Classes/Constructors/Generative_Constructors/execution_of_a_superinitializer_t02.dart
+++ b/Language/Classes/Constructors/Generative_Constructors/execution_of_a_superinitializer_t02.dart
@@ -21,7 +21,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../../Utils/expect.dart";
var log;
diff --git a/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t09.dart b/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t09.dart
index 83bf85d..fd976b2 100644
--- a/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t09.dart
+++ b/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t09.dart
@@ -11,8 +11,6 @@
/// instance variable of the superclass. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class S {
var x;
}
diff --git a/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t10.dart b/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t10.dart
index 9d858fa..fa50911 100644
--- a/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t10.dart
+++ b/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t10.dart
@@ -11,8 +11,6 @@
/// variable of the superinterface. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class I {
var x;
}
diff --git a/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t11.dart b/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t11.dart
index 23f8850..ab9cc7f 100644
--- a/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t11.dart
+++ b/Language/Classes/Constructors/Generative_Constructors/formal_parameter_t11.dart
@@ -11,8 +11,6 @@
/// produce compile-time errors. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class C {
C() {}
C.initialFormal(this.x, int this.y, this.z) {}
diff --git a/Language/Classes/Constructors/Generative_Constructors/implicit_superinitializer_t03.dart b/Language/Classes/Constructors/Generative_Constructors/implicit_superinitializer_t03.dart
index de29ef5..aafea26 100644
--- a/Language/Classes/Constructors/Generative_Constructors/implicit_superinitializer_t03.dart
+++ b/Language/Classes/Constructors/Generative_Constructors/implicit_superinitializer_t03.dart
@@ -9,7 +9,6 @@
/// is provided. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../../Utils/expect.dart";
class A {
diff --git a/Language/Classes/Constructors/Generative_Constructors/implicit_superinitializer_t04.dart b/Language/Classes/Constructors/Generative_Constructors/implicit_superinitializer_t04.dart
index d6bffca..a841b74 100644
--- a/Language/Classes/Constructors/Generative_Constructors/implicit_superinitializer_t04.dart
+++ b/Language/Classes/Constructors/Generative_Constructors/implicit_superinitializer_t04.dart
@@ -9,7 +9,6 @@
/// k's initializers. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../../Utils/expect.dart";
var global = "";
diff --git a/Language/Classes/Constructors/Generative_Constructors/initializers_t17.dart b/Language/Classes/Constructors/Generative_Constructors/initializers_t17.dart
index c26c6f5..f79b189 100644
--- a/Language/Classes/Constructors/Generative_Constructors/initializers_t17.dart
+++ b/Language/Classes/Constructors/Generative_Constructors/initializers_t17.dart
@@ -16,8 +16,6 @@
/// type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
typedef void FType();
void foo() {}
diff --git a/Language/Classes/Constructors/Generative_Constructors/name_t01.dart b/Language/Classes/Constructors/Generative_Constructors/name_t01.dart
index fcb6fd8..fcf3059 100644
--- a/Language/Classes/Constructors/Generative_Constructors/name_t01.dart
+++ b/Language/Classes/Constructors/Generative_Constructors/name_t01.dart
@@ -8,8 +8,6 @@
/// the type alias.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class C {
// ^
// [cfe] unspecified
diff --git a/Language/Classes/Constructors/Generative_Constructors/superinitializer_t04.dart b/Language/Classes/Constructors/Generative_Constructors/superinitializer_t04.dart
index 603b5c8..390a393 100644
--- a/Language/Classes/Constructors/Generative_Constructors/superinitializer_t04.dart
+++ b/Language/Classes/Constructors/Generative_Constructors/superinitializer_t04.dart
@@ -8,8 +8,6 @@
/// constructor includes two identical superinitializers in its initializer list.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
A();
A.foo();
diff --git a/Language/Classes/Constructors/implicit_constructor_t04.dart b/Language/Classes/Constructors/implicit_constructor_t04.dart
index 4df1d69..b6bc017 100644
--- a/Language/Classes/Constructors/implicit_constructor_t04.dart
+++ b/Language/Classes/Constructors/implicit_constructor_t04.dart
@@ -8,7 +8,6 @@
/// that doesn't declare any constructors. Use type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class C {
diff --git a/Language/Classes/Constructors/implicit_constructor_t05.dart b/Language/Classes/Constructors/implicit_constructor_t05.dart
index be052f9..2cc3ea8 100644
--- a/Language/Classes/Constructors/implicit_constructor_t05.dart
+++ b/Language/Classes/Constructors/implicit_constructor_t05.dart
@@ -8,7 +8,6 @@
/// type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {
diff --git a/Language/Classes/Constructors/name_t08.dart b/Language/Classes/Constructors/name_t08.dart
index 7ae3deb..071f081 100644
--- a/Language/Classes/Constructors/name_t08.dart
+++ b/Language/Classes/Constructors/name_t08.dart
@@ -16,7 +16,6 @@
/// type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
static int get foo => 42;
}
diff --git a/Language/Classes/Constructors/wrong_name_t02.dart b/Language/Classes/Constructors/wrong_name_t02.dart
index e2e0cec..84dee80 100644
--- a/Language/Classes/Constructors/wrong_name_t02.dart
+++ b/Language/Classes/Constructors/wrong_name_t02.dart
@@ -9,8 +9,6 @@
/// @description Checks that type alias cannot be used as a named constructor
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class C {
CAlias.named() {}
//^^^^^
diff --git a/Language/Classes/Constructors/wrong_name_t03.dart b/Language/Classes/Constructors/wrong_name_t03.dart
index d553419..2c313a0 100644
--- a/Language/Classes/Constructors/wrong_name_t03.dart
+++ b/Language/Classes/Constructors/wrong_name_t03.dart
@@ -9,7 +9,6 @@
/// @description Checks that type alias cannot be used as a default constructor
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class C {
String log = "No";
diff --git a/Language/Classes/Getters/instance_getter_t13.dart b/Language/Classes/Getters/instance_getter_t13.dart
index dbd3c65..6f6d6c5 100644
--- a/Language/Classes/Getters/instance_getter_t13.dart
+++ b/Language/Classes/Getters/instance_getter_t13.dart
@@ -16,8 +16,6 @@
/// with the same name in its superclass. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
static int n = 0;
static set v(int v1) {
diff --git a/Language/Classes/Getters/instance_getter_t14.dart b/Language/Classes/Getters/instance_getter_t14.dart
index 938cd8d..888b85f 100644
--- a/Language/Classes/Getters/instance_getter_t14.dart
+++ b/Language/Classes/Getters/instance_getter_t14.dart
@@ -16,8 +16,6 @@
/// same name. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
int v = 5;
}
diff --git a/Language/Classes/Getters/override_t05.dart b/Language/Classes/Getters/override_t05.dart
index ebe4ec8..7659479 100644
--- a/Language/Classes/Getters/override_t05.dart
+++ b/Language/Classes/Getters/override_t05.dart
@@ -9,8 +9,6 @@
/// assignable. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
double n = 3.14;
}
diff --git a/Language/Classes/Getters/same_name_method_t13.dart b/Language/Classes/Getters/same_name_method_t13.dart
index c4434fe..ff3c578 100644
--- a/Language/Classes/Getters/same_name_method_t13.dart
+++ b/Language/Classes/Getters/same_name_method_t13.dart
@@ -11,8 +11,6 @@
/// name. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
var foo;
}
diff --git a/Language/Classes/Getters/same_name_method_t14.dart b/Language/Classes/Getters/same_name_method_t14.dart
index 44962de..2b88cb1 100644
--- a/Language/Classes/Getters/same_name_method_t14.dart
+++ b/Language/Classes/Getters/same_name_method_t14.dart
@@ -11,8 +11,6 @@
/// the same name. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
get foo => "foo";
}
diff --git a/Language/Classes/Getters/type_object_t03.dart b/Language/Classes/Getters/type_object_t03.dart
index 2224c02..14cfe46 100644
--- a/Language/Classes/Getters/type_object_t03.dart
+++ b/Language/Classes/Getters/type_object_t03.dart
@@ -11,8 +11,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 23721
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "dart:core";
import "../../../Utils/expect.dart";
diff --git a/Language/Classes/Instance_Methods/override_different_default_values_t03.dart b/Language/Classes/Instance_Methods/override_different_default_values_t03.dart
index f63e5d5..44225fd 100644
--- a/Language/Classes/Instance_Methods/override_different_default_values_t03.dart
+++ b/Language/Classes/Instance_Methods/override_different_default_values_t03.dart
@@ -13,7 +13,6 @@
/// @issue 27476
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
foo([x = '']) {}
}
diff --git a/Language/Classes/Instance_Methods/override_fewer_parameters_t03.dart b/Language/Classes/Instance_Methods/override_fewer_parameters_t03.dart
index 94b2df5..e28e6eb 100644
--- a/Language/Classes/Instance_Methods/override_fewer_parameters_t03.dart
+++ b/Language/Classes/Instance_Methods/override_fewer_parameters_t03.dart
@@ -9,7 +9,6 @@
/// required parameters. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
f([var x, var y, var z]) {}
}
diff --git a/Language/Classes/Instance_Methods/override_more_parameters_t03.dart b/Language/Classes/Instance_Methods/override_more_parameters_t03.dart
index 98719d8..8082534 100644
--- a/Language/Classes/Instance_Methods/override_more_parameters_t03.dart
+++ b/Language/Classes/Instance_Methods/override_more_parameters_t03.dart
@@ -9,8 +9,6 @@
/// and m1 has a single required parameter. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
f() { }
}
diff --git a/Language/Classes/Instance_Methods/override_named_parameters_t07.dart b/Language/Classes/Instance_Methods/override_named_parameters_t07.dart
index 6bdf63b..5ba12eb 100644
--- a/Language/Classes/Instance_Methods/override_named_parameters_t07.dart
+++ b/Language/Classes/Instance_Methods/override_named_parameters_t07.dart
@@ -10,8 +10,6 @@
/// parameters declared by m2. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
foo(var a, {x, y}) {}
}
diff --git a/Language/Classes/Instance_Methods/override_named_parameters_t08.dart b/Language/Classes/Instance_Methods/override_named_parameters_t08.dart
index 3b2db69..5d0b11e 100644
--- a/Language/Classes/Instance_Methods/override_named_parameters_t08.dart
+++ b/Language/Classes/Instance_Methods/override_named_parameters_t08.dart
@@ -10,8 +10,6 @@
/// type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
f({var x}) {}
}
diff --git a/Language/Classes/Instance_Methods/override_named_parameters_t09.dart b/Language/Classes/Instance_Methods/override_named_parameters_t09.dart
index bd20f1f..7ca078d 100644
--- a/Language/Classes/Instance_Methods/override_named_parameters_t09.dart
+++ b/Language/Classes/Instance_Methods/override_named_parameters_t09.dart
@@ -9,8 +9,6 @@
/// of named parameters as m2 but in a different order. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
f({var x, var y}) {
return x + y;
diff --git a/Language/Classes/Instance_Methods/override_named_parameters_t10.dart b/Language/Classes/Instance_Methods/override_named_parameters_t10.dart
index c0742f1..e5470fa 100644
--- a/Language/Classes/Instance_Methods/override_named_parameters_t10.dart
+++ b/Language/Classes/Instance_Methods/override_named_parameters_t10.dart
@@ -10,8 +10,6 @@
/// name.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
f({var x, var y, var z}) {}
}
diff --git a/Language/Classes/Instance_Methods/override_named_parameters_t11.dart b/Language/Classes/Instance_Methods/override_named_parameters_t11.dart
index d3769b3..8a771dc 100644
--- a/Language/Classes/Instance_Methods/override_named_parameters_t11.dart
+++ b/Language/Classes/Instance_Methods/override_named_parameters_t11.dart
@@ -10,8 +10,6 @@
/// m1 is not a direct subtype of the class declaring m2. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
f({var x, var y}) { return x + y; }
}
diff --git a/Language/Classes/Instance_Methods/override_subtype_t07.dart b/Language/Classes/Instance_Methods/override_subtype_t07.dart
index 7c5297c..d38c229 100644
--- a/Language/Classes/Instance_Methods/override_subtype_t07.dart
+++ b/Language/Classes/Instance_Methods/override_subtype_t07.dart
@@ -9,8 +9,6 @@
/// isn't void either. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
int foo(var x) => 42;
}
diff --git a/Language/Classes/Instance_Methods/override_subtype_t08.dart b/Language/Classes/Instance_Methods/override_subtype_t08.dart
index 71d06f7..aeb9a16 100644
--- a/Language/Classes/Instance_Methods/override_subtype_t08.dart
+++ b/Language/Classes/Instance_Methods/override_subtype_t08.dart
@@ -9,8 +9,6 @@
/// assignable. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
foo(int x) {}
}
diff --git a/Language/Classes/Instance_Methods/override_subtype_t09.dart b/Language/Classes/Instance_Methods/override_subtype_t09.dart
index 0a94d83..546fbee 100644
--- a/Language/Classes/Instance_Methods/override_subtype_t09.dart
+++ b/Language/Classes/Instance_Methods/override_subtype_t09.dart
@@ -9,8 +9,6 @@
/// mutually assignable.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
foo([double? name]) {}
}
diff --git a/Language/Classes/Instance_Methods/override_subtype_t10.dart b/Language/Classes/Instance_Methods/override_subtype_t10.dart
index 435d511..0a43438 100644
--- a/Language/Classes/Instance_Methods/override_subtype_t10.dart
+++ b/Language/Classes/Instance_Methods/override_subtype_t10.dart
@@ -9,8 +9,6 @@
/// the class declaring m1 is not a direct subtype of the class declaring m2.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
foo(double? name) {}
}
diff --git a/Language/Classes/Instance_Methods/override_subtype_t11.dart b/Language/Classes/Instance_Methods/override_subtype_t11.dart
index d8ee579..b0a712d 100644
--- a/Language/Classes/Instance_Methods/override_subtype_t11.dart
+++ b/Language/Classes/Instance_Methods/override_subtype_t11.dart
@@ -9,8 +9,6 @@
/// parameters. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class Super {}
class Sub extends Super {}
diff --git a/Language/Classes/Instance_Methods/override_subtype_t12.dart b/Language/Classes/Instance_Methods/override_subtype_t12.dart
index 0390396..1312192 100644
--- a/Language/Classes/Instance_Methods/override_subtype_t12.dart
+++ b/Language/Classes/Instance_Methods/override_subtype_t12.dart
@@ -8,8 +8,6 @@
/// a subtype of type of m2. Checks instance methods with optional parameters.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class Whatever {}
class Super {}
class Sub extends Super {}
diff --git a/Language/Classes/Instance_Methods/same_name_getter_t03.dart b/Language/Classes/Instance_Methods/same_name_getter_t03.dart
index e5c8bb1..3ca1e41 100644
--- a/Language/Classes/Instance_Methods/same_name_getter_t03.dart
+++ b/Language/Classes/Instance_Methods/same_name_getter_t03.dart
@@ -14,8 +14,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
get foo {}
}
diff --git a/Language/Classes/Instance_Methods/same_name_setter_t03.dart b/Language/Classes/Instance_Methods/same_name_setter_t03.dart
index 60657c4..634cf85 100644
--- a/Language/Classes/Instance_Methods/same_name_setter_t03.dart
+++ b/Language/Classes/Instance_Methods/same_name_setter_t03.dart
@@ -14,7 +14,6 @@
/// instance method named n and inherits a setter named n=. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
set foo(int a) {}
}
diff --git a/Language/Classes/Instance_Methods/same_name_static_member_in_superclass_t10.dart b/Language/Classes/Instance_Methods/same_name_static_member_in_superclass_t10.dart
index 3617c37..bdab960 100644
--- a/Language/Classes/Instance_Methods/same_name_static_member_in_superclass_t10.dart
+++ b/Language/Classes/Instance_Methods/same_name_static_member_in_superclass_t10.dart
@@ -16,7 +16,6 @@
/// Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
static var f;
}
diff --git a/Language/Classes/Instance_Methods/same_name_static_member_in_superclass_t11.dart b/Language/Classes/Instance_Methods/same_name_static_member_in_superclass_t11.dart
index fbfdfb0..8d90a42 100644
--- a/Language/Classes/Instance_Methods/same_name_static_member_in_superclass_t11.dart
+++ b/Language/Classes/Instance_Methods/same_name_static_member_in_superclass_t11.dart
@@ -16,7 +16,6 @@
/// Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
static get f {}
}
diff --git a/Language/Classes/Instance_Variables/definition_t05.dart b/Language/Classes/Instance_Variables/definition_t05.dart
index 6ea534a..462c0a5 100644
--- a/Language/Classes/Instance_Variables/definition_t05.dart
+++ b/Language/Classes/Instance_Variables/definition_t05.dart
@@ -10,7 +10,6 @@
/// superclass. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../Utils/expect.dart';
class A {
diff --git a/Language/Classes/Instance_Variables/type_aliases_t01.dart b/Language/Classes/Instance_Variables/type_aliases_t01.dart
index 6c5ed88..0784abf 100644
--- a/Language/Classes/Instance_Variables/type_aliases_t01.dart
+++ b/Language/Classes/Instance_Variables/type_aliases_t01.dart
@@ -9,7 +9,6 @@
/// @description Checks that class may contain type alias as a member
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class C {
diff --git a/Language/Classes/Instance_Variables/type_aliases_t02.dart b/Language/Classes/Instance_Variables/type_aliases_t02.dart
index 3bd0fab..8c7398e 100644
--- a/Language/Classes/Instance_Variables/type_aliases_t02.dart
+++ b/Language/Classes/Instance_Variables/type_aliases_t02.dart
@@ -9,7 +9,6 @@
/// @description Checks that class may contain type alias as a member
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {
CAlias? c;
diff --git a/Language/Classes/Instance_Variables/type_aliases_t03.dart b/Language/Classes/Instance_Variables/type_aliases_t03.dart
index b5d97d6..f9a721c 100644
--- a/Language/Classes/Instance_Variables/type_aliases_t03.dart
+++ b/Language/Classes/Instance_Variables/type_aliases_t03.dart
@@ -9,7 +9,6 @@
/// @description Checks that class may contain type alias as a member
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {
}
diff --git a/Language/Classes/Setters/syntax_t06.dart b/Language/Classes/Setters/syntax_t06.dart
index 0401d0f..0a7aada 100644
--- a/Language/Classes/Setters/syntax_t06.dart
+++ b/Language/Classes/Setters/syntax_t06.dart
@@ -10,8 +10,6 @@
/// errors. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class A<U, V> {
void set s2(var x) {}
set s4(var x) {}
diff --git a/Language/Classes/Static_Methods/declaration_t04.dart b/Language/Classes/Static_Methods/declaration_t04.dart
index 0fbf881..fbd6029 100644
--- a/Language/Classes/Static_Methods/declaration_t04.dart
+++ b/Language/Classes/Static_Methods/declaration_t04.dart
@@ -11,7 +11,6 @@
/// Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class C {
diff --git a/Language/Classes/Static_Variables/inheritance_t02.dart b/Language/Classes/Static_Variables/inheritance_t02.dart
index e9f595e..67507b6 100644
--- a/Language/Classes/Static_Variables/inheritance_t02.dart
+++ b/Language/Classes/Static_Variables/inheritance_t02.dart
@@ -10,7 +10,6 @@
/// via subclass's name. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class S {
static var foo;
}
diff --git a/Language/Classes/Static_Variables/type_alias_t01.dart b/Language/Classes/Static_Variables/type_alias_t01.dart
index c890bf3..a1d13c5 100644
--- a/Language/Classes/Static_Variables/type_alias_t01.dart
+++ b/Language/Classes/Static_Variables/type_alias_t01.dart
@@ -9,7 +9,6 @@
/// @description Checks that static variables accessible via type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class C {
diff --git a/Language/Classes/Superclasses/Inheritance_and_Overriding/abstract_method_t02.dart b/Language/Classes/Superclasses/Inheritance_and_Overriding/abstract_method_t02.dart
index aee5329..246e825 100644
--- a/Language/Classes/Superclasses/Inheritance_and_Overriding/abstract_method_t02.dart
+++ b/Language/Classes/Superclasses/Inheritance_and_Overriding/abstract_method_t02.dart
@@ -8,8 +8,6 @@
/// inherits an abstract method. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class A {
foo();
}
diff --git a/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t07.dart b/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t07.dart
index 83e79df..c690844 100644
--- a/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t07.dart
+++ b/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t07.dart
@@ -12,7 +12,6 @@
/// superclass(es). Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../../Utils/expect.dart";
class A {
diff --git a/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t08.dart b/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t08.dart
index 8b9eff4..6e46dc0 100644
--- a/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t08.dart
+++ b/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t08.dart
@@ -14,7 +14,6 @@
/// @issue 27476
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class S {
static var v;
static int i = 0;
diff --git a/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t09.dart b/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t09.dart
index 731b090..defe756 100644
--- a/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t09.dart
+++ b/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t09.dart
@@ -12,8 +12,6 @@
/// of a class. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class S {
static var v;
static int i = 0;
diff --git a/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t10.dart b/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t10.dart
index 3027623..e84d1a9 100644
--- a/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t10.dart
+++ b/Language/Classes/Superclasses/Inheritance_and_Overriding/inheritance_t10.dart
@@ -11,8 +11,6 @@
/// @description Checks that static members are not inherited. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class S {
static var v;
static int i = 0;
diff --git a/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t06.dart b/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t06.dart
index 667ecf7..390fa87 100644
--- a/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t06.dart
+++ b/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t06.dart
@@ -12,7 +12,6 @@
/// alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../../Utils/expect.dart";
class A {
diff --git a/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t07.dart b/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t07.dart
index fa899e4..81df32c 100644
--- a/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t07.dart
+++ b/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t07.dart
@@ -12,8 +12,6 @@
/// names because of setter's = suffix). Test type aliases
/// @author sgrekhov@unipro
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
var a = 2;
}
diff --git a/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t08.dart b/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t08.dart
index 8bf2e63..69dd62b 100644
--- a/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t08.dart
+++ b/Language/Classes/Superclasses/Inheritance_and_Overriding/overriding_t08.dart
@@ -12,8 +12,6 @@
/// type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
import "overriding_t04_lib.dart";
diff --git a/Language/Classes/Superclasses/extends_clause_t02.dart b/Language/Classes/Superclasses/extends_clause_t02.dart
index fb6f332..5eacde5 100644
--- a/Language/Classes/Superclasses/extends_clause_t02.dart
+++ b/Language/Classes/Superclasses/extends_clause_t02.dart
@@ -11,7 +11,6 @@
/// superclass. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {}
diff --git a/Language/Classes/Superclasses/superclass_of_itself_t03.dart b/Language/Classes/Superclasses/superclass_of_itself_t03.dart
index a5c20ed..2ee5a8f 100644
--- a/Language/Classes/Superclasses/superclass_of_itself_t03.dart
+++ b/Language/Classes/Superclasses/superclass_of_itself_t03.dart
@@ -7,8 +7,6 @@
/// itself in its extends clause. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A extends AAlias {}
// ^
// [analyzer] unspecified
diff --git a/Language/Classes/Superclasses/superclass_of_itself_t04.dart b/Language/Classes/Superclasses/superclass_of_itself_t04.dart
index fbcb5a2..3b560c8 100644
--- a/Language/Classes/Superclasses/superclass_of_itself_t04.dart
+++ b/Language/Classes/Superclasses/superclass_of_itself_t04.dart
@@ -7,8 +7,6 @@
/// extend itself indirectly, by transition. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A extends DAlias {}
// ^
// [analyzer] unspecified
diff --git a/Language/Classes/Superclasses/transition_t02.dart b/Language/Classes/Superclasses/transition_t02.dart
index 9d2f465..7c370b4 100644
--- a/Language/Classes/Superclasses/transition_t02.dart
+++ b/Language/Classes/Superclasses/transition_t02.dart
@@ -9,7 +9,6 @@
/// Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {}
diff --git a/Language/Classes/Superinterfaces/dynamic_type_t03.dart b/Language/Classes/Superinterfaces/dynamic_type_t03.dart
index 82e8637..5e805c7 100644
--- a/Language/Classes/Superinterfaces/dynamic_type_t03.dart
+++ b/Language/Classes/Superinterfaces/dynamic_type_t03.dart
@@ -8,8 +8,6 @@
/// in the type list of a class's implements clause.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
typedef d = dynamic;
class A implements d {}
diff --git a/Language/Classes/Superinterfaces/implicit_interface_t03.dart b/Language/Classes/Superinterfaces/implicit_interface_t03.dart
index fa6f216..40ea21a 100644
--- a/Language/Classes/Superinterfaces/implicit_interface_t03.dart
+++ b/Language/Classes/Superinterfaces/implicit_interface_t03.dart
@@ -9,7 +9,6 @@
/// of declared instance member m is not a subtype of F. Test type aliases
/// @author ilya
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class I {
foo(var x);
}
diff --git a/Language/Classes/Superinterfaces/itself_t02.dart b/Language/Classes/Superinterfaces/itself_t02.dart
index ad140f6..4c3c3e7 100644
--- a/Language/Classes/Superinterfaces/itself_t02.dart
+++ b/Language/Classes/Superinterfaces/itself_t02.dart
@@ -10,7 +10,6 @@
/// included in its implements clause.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class I {}
class C implements I, CAlias {}
diff --git a/Language/Classes/Superinterfaces/more_than_once_t02.dart b/Language/Classes/Superinterfaces/more_than_once_t02.dart
index 5771ea2..49b48ff 100644
--- a/Language/Classes/Superinterfaces/more_than_once_t02.dart
+++ b/Language/Classes/Superinterfaces/more_than_once_t02.dart
@@ -9,7 +9,6 @@
/// @Issue 45526
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class I {}
abstract class J {}
diff --git a/Language/Classes/Superinterfaces/no_member_t06.dart b/Language/Classes/Superinterfaces/no_member_t06.dart
index 56e8937..08e1064 100644
--- a/Language/Classes/Superinterfaces/no_member_t06.dart
+++ b/Language/Classes/Superinterfaces/no_member_t06.dart
@@ -11,8 +11,6 @@
/// nor inherit an instance method declared in class' interface. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class I {
foo();
}
diff --git a/Language/Classes/Superinterfaces/no_member_t07.dart b/Language/Classes/Superinterfaces/no_member_t07.dart
index eb7ceb6..5807922 100644
--- a/Language/Classes/Superinterfaces/no_member_t07.dart
+++ b/Language/Classes/Superinterfaces/no_member_t07.dart
@@ -12,8 +12,6 @@
/// method declared in class interface. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class I {
foo();
}
diff --git a/Language/Classes/Superinterfaces/superclass_as_superinterface_t02.dart b/Language/Classes/Superinterfaces/superclass_as_superinterface_t02.dart
index f5eb2f2..5a1bb49 100644
--- a/Language/Classes/Superinterfaces/superclass_as_superinterface_t02.dart
+++ b/Language/Classes/Superinterfaces/superclass_as_superinterface_t02.dart
@@ -8,8 +8,6 @@
/// the same class as superclass and interface. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class A {}
typedef AAlias = A;
diff --git a/Language/Classes/Superinterfaces/superclass_as_superinterface_t03.dart b/Language/Classes/Superinterfaces/superclass_as_superinterface_t03.dart
index 7675310..bab302f 100644
--- a/Language/Classes/Superinterfaces/superclass_as_superinterface_t03.dart
+++ b/Language/Classes/Superinterfaces/superclass_as_superinterface_t03.dart
@@ -8,8 +8,6 @@
/// the same class as superclass and interface. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class A {}
typedef AAlias = A;
diff --git a/Language/Classes/Superinterfaces/superclass_as_superinterface_t04.dart b/Language/Classes/Superinterfaces/superclass_as_superinterface_t04.dart
index baade13..6b72e25 100644
--- a/Language/Classes/Superinterfaces/superclass_as_superinterface_t04.dart
+++ b/Language/Classes/Superinterfaces/superclass_as_superinterface_t04.dart
@@ -8,8 +8,6 @@
/// the same class as superclass and interface. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class A {}
typedef AAlias = A;
diff --git a/Language/Classes/Superinterfaces/syntax_t03.dart b/Language/Classes/Superinterfaces/syntax_t03.dart
index 4a760df..fdbdf23 100644
--- a/Language/Classes/Superinterfaces/syntax_t03.dart
+++ b/Language/Classes/Superinterfaces/syntax_t03.dart
@@ -14,8 +14,6 @@
/// superclasses' superinterfaces.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../Utils/expect.dart";
abstract class IA {}
diff --git a/Language/Enums/restrictions_t09.dart b/Language/Enums/restrictions_t09.dart
index 21c5589..b1db39d 100644
--- a/Language/Enums/restrictions_t09.dart
+++ b/Language/Enums/restrictions_t09.dart
@@ -8,7 +8,6 @@
/// type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
enum E {a, b, c}
typedef EAlias = E;
diff --git a/Language/Enums/restrictions_t10.dart b/Language/Enums/restrictions_t10.dart
index d1a0129..08047d9 100644
--- a/Language/Enums/restrictions_t10.dart
+++ b/Language/Enums/restrictions_t10.dart
@@ -8,7 +8,6 @@
/// type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
enum E {a, b, c}
typedef EAlias = E;
diff --git a/Language/Enums/restrictions_t11.dart b/Language/Enums/restrictions_t11.dart
index 72e9de8..76e1bca 100644
--- a/Language/Enums/restrictions_t11.dart
+++ b/Language/Enums/restrictions_t11.dart
@@ -8,8 +8,6 @@
/// an enum. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
enum E {a, b, c}
typedef EAlias = E;
diff --git a/Language/Enums/restrictions_t12.dart b/Language/Enums/restrictions_t12.dart
index 7a5f21f..e681e41 100644
--- a/Language/Enums/restrictions_t12.dart
+++ b/Language/Enums/restrictions_t12.dart
@@ -7,8 +7,6 @@
/// @description Checks that it is compile-time error to implement an enum
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
enum E {a, b, c}
typedef EAlias = E;
diff --git a/Language/Enums/syntax_t10.dart b/Language/Enums/syntax_t10.dart
index a274d15..3e20165 100644
--- a/Language/Enums/syntax_t10.dart
+++ b/Language/Enums/syntax_t10.dart
@@ -13,8 +13,6 @@
///
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../Utils/expect.dart";
const String some_metadata = "Some metadata";
diff --git a/Language/Expressions/Instance_Creation/New/type_t08.dart b/Language/Expressions/Instance_Creation/New/type_t08.dart
index 56a9681..11669f5 100644
--- a/Language/Expressions/Instance_Creation/New/type_t08.dart
+++ b/Language/Expressions/Instance_Creation/New/type_t08.dart
@@ -9,7 +9,6 @@
/// denote a class.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../../Utils/expect.dart';
class C {
diff --git a/Language/Expressions/Instance_Creation/New/type_t09.dart b/Language/Expressions/Instance_Creation/New/type_t09.dart
index da3c619..bdf6079 100644
--- a/Language/Expressions/Instance_Creation/New/type_t09.dart
+++ b/Language/Expressions/Instance_Creation/New/type_t09.dart
@@ -9,7 +9,6 @@
/// denote a class.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../../Utils/expect.dart';
class C<T1, T2> {
diff --git a/Language/Generics/Superbounded_types/typedef3_A01_t01.dart b/Language/Generics/Superbounded_types/typedef3_A01_t01.dart
index e97080d..21fa619 100644
--- a/Language/Generics/Superbounded_types/typedef3_A01_t01.dart
+++ b/Language/Generics/Superbounded_types/typedef3_A01_t01.dart
@@ -8,8 +8,6 @@
/// with not well bounded type parameter is declared
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<T extends A<T>> {}
typedef B1<X extends A> = A<X>;
diff --git a/Language/Generics/Superbounded_types/typedef3_A01_t02.dart b/Language/Generics/Superbounded_types/typedef3_A01_t02.dart
index ad997b5..804face 100644
--- a/Language/Generics/Superbounded_types/typedef3_A01_t02.dart
+++ b/Language/Generics/Superbounded_types/typedef3_A01_t02.dart
@@ -8,8 +8,6 @@
/// alias with well bounded type parameter is declared
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<T> {}
typedef B1<X extends Object?> = A<X>;
diff --git a/Language/Generics/Superbounded_types/typedef3_A01_t03.dart b/Language/Generics/Superbounded_types/typedef3_A01_t03.dart
index 9d25377..285fa14 100644
--- a/Language/Generics/Superbounded_types/typedef3_A01_t03.dart
+++ b/Language/Generics/Superbounded_types/typedef3_A01_t03.dart
@@ -9,8 +9,6 @@
/// @Issue 44830
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<T extends A<T>> {}
typedef B1<X> = A<X>;
diff --git a/Language/Generics/Superbounded_types/typedef3_A01_t04.dart b/Language/Generics/Superbounded_types/typedef3_A01_t04.dart
index 25a4785..a3b7a27 100644
--- a/Language/Generics/Superbounded_types/typedef3_A01_t04.dart
+++ b/Language/Generics/Superbounded_types/typedef3_A01_t04.dart
@@ -8,8 +8,6 @@
/// alias variable with well bounded type parameter is declared
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<T> {}
typedef B<X> = A<X>;
diff --git a/Language/Generics/Superbounded_types/typedef3_A01_t05.dart b/Language/Generics/Superbounded_types/typedef3_A01_t05.dart
index 57b2deb..f4651eb 100644
--- a/Language/Generics/Superbounded_types/typedef3_A01_t05.dart
+++ b/Language/Generics/Superbounded_types/typedef3_A01_t05.dart
@@ -8,8 +8,6 @@
/// alias variable with well bounded type parameter is declared
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<T> {}
typedef B<X> = A<X>;
diff --git a/Language/Generics/Superbounded_types/typedef3_A01_t06.dart b/Language/Generics/Superbounded_types/typedef3_A01_t06.dart
index d7e7015..ca9bc6d 100644
--- a/Language/Generics/Superbounded_types/typedef3_A01_t06.dart
+++ b/Language/Generics/Superbounded_types/typedef3_A01_t06.dart
@@ -9,8 +9,6 @@
/// @Issue 37031
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<T> {}
typedef B<X extends A<X>> = A<X>;
diff --git a/Language/Generics/parameter_A01_t03.dart b/Language/Generics/parameter_A01_t03.dart
index 4fa0b68..bfc3f72 100644
--- a/Language/Generics/parameter_A01_t03.dart
+++ b/Language/Generics/parameter_A01_t03.dart
@@ -11,8 +11,6 @@
/// for the class type parameter
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
class B extends A {}
class C extends B {}
diff --git a/Language/Generics/parameter_A02_t03.dart b/Language/Generics/parameter_A02_t03.dart
index c81db6c..7d0b830 100644
--- a/Language/Generics/parameter_A02_t03.dart
+++ b/Language/Generics/parameter_A02_t03.dart
@@ -11,8 +11,6 @@
/// absent.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
class B extends A {}
class C extends B {}
diff --git a/Language/Generics/parameter_A04_t03.dart b/Language/Generics/parameter_A04_t03.dart
index 0f60b5f..789e89c 100644
--- a/Language/Generics/parameter_A04_t03.dart
+++ b/Language/Generics/parameter_A04_t03.dart
@@ -13,8 +13,6 @@
/// parameter scope.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../Utils/expect.dart";
class A {}
diff --git a/Language/Generics/parameter_A09_t03.dart b/Language/Generics/parameter_A09_t03.dart
index ab4f1f6..c7b4893 100644
--- a/Language/Generics/parameter_A09_t03.dart
+++ b/Language/Generics/parameter_A09_t03.dart
@@ -7,8 +7,6 @@
/// generic type
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<T> {}
class B<T1, T2> {}
diff --git a/Language/Generics/syntax_t20.dart b/Language/Generics/syntax_t20.dart
index 9239fe6..7f45a4f 100644
--- a/Language/Generics/syntax_t20.dart
+++ b/Language/Generics/syntax_t20.dart
@@ -7,8 +7,6 @@
/// @description @description Checks various correct type alias declarations.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../Utils/expect.dart";
class A<T> {
diff --git a/Language/Generics/syntax_t21.dart b/Language/Generics/syntax_t21.dart
index ffd19f8..53f420e 100644
--- a/Language/Generics/syntax_t21.dart
+++ b/Language/Generics/syntax_t21.dart
@@ -8,8 +8,6 @@
/// type alias.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class Test<T> {}
typedef TAlias1<> = Test<X>;
// ^
diff --git a/Language/Generics/syntax_t22.dart b/Language/Generics/syntax_t22.dart
index d48a66d..810da9f 100644
--- a/Language/Generics/syntax_t22.dart
+++ b/Language/Generics/syntax_t22.dart
@@ -7,8 +7,6 @@
/// @description @description Checks various correct type alias declarations.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../Utils/expect.dart";
class B<T1, T2> {
diff --git a/Language/Generics/syntax_t23.dart b/Language/Generics/syntax_t23.dart
index 7f33013..d8f00e3 100644
--- a/Language/Generics/syntax_t23.dart
+++ b/Language/Generics/syntax_t23.dart
@@ -7,8 +7,6 @@
/// @description Checks various correct type alias declarations.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../Utils/expect.dart";
class A<T> {}
diff --git a/Language/Generics/syntax_t24.dart b/Language/Generics/syntax_t24.dart
index 67229e9..d5a0fd1 100644
--- a/Language/Generics/syntax_t24.dart
+++ b/Language/Generics/syntax_t24.dart
@@ -7,8 +7,6 @@
/// @description @description Checks various correct type alias declarations.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../Utils/expect.dart";
class B<T1, T2> {
diff --git a/Language/Generics/syntax_t25.dart b/Language/Generics/syntax_t25.dart
index aba62af..7210416 100644
--- a/Language/Generics/syntax_t25.dart
+++ b/Language/Generics/syntax_t25.dart
@@ -7,8 +7,6 @@
/// @description @description Checks various correct type alias declarations.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../Utils/expect.dart";
class B<T1, T2> {
diff --git a/Language/Generics/syntax_t31.dart b/Language/Generics/syntax_t31.dart
index 1363e3b..9c9e6d1 100644
--- a/Language/Generics/syntax_t31.dart
+++ b/Language/Generics/syntax_t31.dart
@@ -8,7 +8,6 @@
/// with typed parameter
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {}
void testme() {}
diff --git a/Language/Generics/typedef_A01_t01.dart b/Language/Generics/typedef_A01_t01.dart
index bdbe4ed..605a7d6 100644
--- a/Language/Generics/typedef_A01_t01.dart
+++ b/Language/Generics/typedef_A01_t01.dart
@@ -16,8 +16,6 @@
/// @Issue 42432
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../Utils/expect.dart";
const i = 1;
diff --git a/Language/Generics/typedef_A01_t02.dart b/Language/Generics/typedef_A01_t02.dart
index 7c09fbd..32ad1e9 100644
--- a/Language/Generics/typedef_A01_t02.dart
+++ b/Language/Generics/typedef_A01_t02.dart
@@ -15,8 +15,6 @@
/// @description Checks that exception is thrown if generic metadata is incorrect
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
int i = 1;
class C<T> {}
@i typedef CAlias<T> = C<T>;
diff --git a/Language/Generics/typedef_A01_t03.dart b/Language/Generics/typedef_A01_t03.dart
index a8267de..783e558 100644
--- a/Language/Generics/typedef_A01_t03.dart
+++ b/Language/Generics/typedef_A01_t03.dart
@@ -14,8 +14,6 @@
/// @description Checks that exception is thrown if generic metadata is incorrect
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A() {}
// ^
// [analyzer] unspecified
diff --git a/Language/Generics/typedef_A01_t04.dart b/Language/Generics/typedef_A01_t04.dart
index fd54d37..0fe957c 100644
--- a/Language/Generics/typedef_A01_t04.dart
+++ b/Language/Generics/typedef_A01_t04.dart
@@ -14,7 +14,6 @@
/// @description Checks that generic type alias declaration can contain metadata.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../Utils/expect.dart";
const i = 1;
diff --git a/Language/Generics/typedef_A01_t05.dart b/Language/Generics/typedef_A01_t05.dart
index a9173dc..f59e2cb 100644
--- a/Language/Generics/typedef_A01_t05.dart
+++ b/Language/Generics/typedef_A01_t05.dart
@@ -14,8 +14,6 @@
/// @description Checks that exception is thrown if generic metadata is incorrect
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
int i = 1;
class C<T> {}
diff --git a/Language/Generics/typedef_A01_t06.dart b/Language/Generics/typedef_A01_t06.dart
index 09ae4c9..ee4124e 100644
--- a/Language/Generics/typedef_A01_t06.dart
+++ b/Language/Generics/typedef_A01_t06.dart
@@ -14,8 +14,6 @@
/// @description Checks that [T] should be a type.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
static void callme<T>() { return null; }
}
diff --git a/Language/Generics/typedef_A01_t07.dart b/Language/Generics/typedef_A01_t07.dart
index 7628901..b77795c 100644
--- a/Language/Generics/typedef_A01_t07.dart
+++ b/Language/Generics/typedef_A01_t07.dart
@@ -14,8 +14,6 @@
/// @description Checks that T can be another type alias.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X> {}
typedef X1<T> = A<T>;
diff --git a/Language/Generics/typedef_A01_t08.dart b/Language/Generics/typedef_A01_t08.dart
index d94065d..a9d4d40 100644
--- a/Language/Generics/typedef_A01_t08.dart
+++ b/Language/Generics/typedef_A01_t08.dart
@@ -14,8 +14,6 @@
/// @description Checks that [T] can be [dynamic], [void], [Null], [FutureOr].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "dart:async";
typedef S1<T> = dynamic;
diff --git a/Language/Generics/typedef_A01_t10.dart b/Language/Generics/typedef_A01_t10.dart
index ee9f2fb..967881e 100644
--- a/Language/Generics/typedef_A01_t10.dart
+++ b/Language/Generics/typedef_A01_t10.dart
@@ -14,7 +14,6 @@
/// @description Checks that [T] can be another function type alias.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
typedef Alias1<T> = T Function(T);
typedef Alias2<T> = Alias1<T>;
diff --git a/Language/Generics/typedef_A04_t01.dart b/Language/Generics/typedef_A04_t01.dart
index 39c37cb..5456155 100644
--- a/Language/Generics/typedef_A04_t01.dart
+++ b/Language/Generics/typedef_A04_t01.dart
@@ -12,8 +12,6 @@
/// @Issue 42432
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../Utils/expect.dart";
class X {}
diff --git a/Language/Generics/typedef_A04_t02.dart b/Language/Generics/typedef_A04_t02.dart
index 8d389d1..6f7daa2 100644
--- a/Language/Generics/typedef_A04_t02.dart
+++ b/Language/Generics/typedef_A04_t02.dart
@@ -12,7 +12,6 @@
/// @Issue 42432
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../Utils/expect.dart";
class A<T1, T2, T3> {
diff --git a/Language/Generics/typedef_A06_t06.dart b/Language/Generics/typedef_A06_t06.dart
index 1aec845..813dd7d 100644
--- a/Language/Generics/typedef_A06_t06.dart
+++ b/Language/Generics/typedef_A06_t06.dart
@@ -14,7 +14,5 @@
/// @Issue 36874
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
typedef AAlias = void Function<X, Y extends X> ();
main() {}
diff --git a/Language/Generics/typedef_A06_t11.dart b/Language/Generics/typedef_A06_t11.dart
index 92aa34f..906b999 100644
--- a/Language/Generics/typedef_A06_t11.dart
+++ b/Language/Generics/typedef_A06_t11.dart
@@ -13,8 +13,6 @@
/// bounded.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X> {}
class C<X extends C<X>> {}
diff --git a/Language/Generics/typedef_A06_t12.dart b/Language/Generics/typedef_A06_t12.dart
index ba5196b..d59f933 100644
--- a/Language/Generics/typedef_A06_t12.dart
+++ b/Language/Generics/typedef_A06_t12.dart
@@ -13,8 +13,6 @@
/// @Issue 42436
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X extends A<X>> {}
typedef AAlias<X> = A;
// ^
diff --git a/Language/Generics/typedef_A06_t13.dart b/Language/Generics/typedef_A06_t13.dart
index 09a6c73..b319b3c 100644
--- a/Language/Generics/typedef_A06_t13.dart
+++ b/Language/Generics/typedef_A06_t13.dart
@@ -14,8 +14,6 @@
/// @Issue 42436
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X extends A<X>> {}
typedef AAlias<X> = A<A<int>>;
// ^
diff --git a/Language/Generics/typedef_A06_t14.dart b/Language/Generics/typedef_A06_t14.dart
index e192970..aa03ac6 100644
--- a/Language/Generics/typedef_A06_t14.dart
+++ b/Language/Generics/typedef_A06_t14.dart
@@ -13,8 +13,6 @@
/// class with two typed parameters
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X, Y> {}
typedef AAlias1<X, Y> = A<X, Y>;
typedef AAlias2<X extends num, Y extends String> = A<X, Y>;
diff --git a/Language/Generics/typedef_A07_t01.dart b/Language/Generics/typedef_A07_t01.dart
index 90f1618..50a4bf4 100644
--- a/Language/Generics/typedef_A07_t01.dart
+++ b/Language/Generics/typedef_A07_t01.dart
@@ -23,8 +23,6 @@
/// is incorrect for [typedef] which defines class.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<T> {}
class B<T1, T2> {}
diff --git a/Language/Generics/typedef_A07_t02.dart b/Language/Generics/typedef_A07_t02.dart
index 050f85d..7acb5c6 100644
--- a/Language/Generics/typedef_A07_t02.dart
+++ b/Language/Generics/typedef_A07_t02.dart
@@ -23,8 +23,6 @@
/// is incorrect for [typedef] which defines function.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
typedef AAlias<T> = T Function<T1 extends T>();
typedef BAlias<T1, T2> = void Function(T1, T2);
typedef CAlias<T1, T2, T3> = T1 Function<TT2 extends T2>(T3);
diff --git a/Language/Generics/typedef_A07_t03.dart b/Language/Generics/typedef_A07_t03.dart
index 92b39b8..6436d62 100644
--- a/Language/Generics/typedef_A07_t03.dart
+++ b/Language/Generics/typedef_A07_t03.dart
@@ -23,8 +23,6 @@
/// is incorrect for [typedef] which defines class.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
typedef void AAlias<T>(T);
typedef T1 BAlias<T1, T2>(T1, {T2});
typedef T1 CAlias<T1, T2, T3>(T2, [T3]);
diff --git a/Language/Generics/typedef_A08_t01.dart b/Language/Generics/typedef_A08_t01.dart
index 6154c6b..ae86c00 100644
--- a/Language/Generics/typedef_A08_t01.dart
+++ b/Language/Generics/typedef_A08_t01.dart
@@ -22,8 +22,6 @@
/// @description Checks that compile error is thrown if [U] is not well-bounded.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<T extends A<T>> {}
typedef AAlias<T> = A<T>;
// ^
diff --git a/Language/Generics/typedef_A08_t02.dart b/Language/Generics/typedef_A08_t02.dart
index 89cbe9d..5277a2f 100644
--- a/Language/Generics/typedef_A08_t02.dart
+++ b/Language/Generics/typedef_A08_t02.dart
@@ -23,8 +23,6 @@
/// @Issue 36959, 37050
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X extends A<X>> {}
typedef AAlias<T extends A<T>> = T Function<T>();
diff --git a/Language/Generics/typedef_A08_t03.dart b/Language/Generics/typedef_A08_t03.dart
index ebe6e36..500d1aa 100644
--- a/Language/Generics/typedef_A08_t03.dart
+++ b/Language/Generics/typedef_A08_t03.dart
@@ -23,8 +23,6 @@
/// @Issue 36959, 37050
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X extends A<X>> {}
typedef AAlias<T extends A<T>> = T Function<T1 extends T>();
diff --git a/Language/Generics/typedef_A08_t04.dart b/Language/Generics/typedef_A08_t04.dart
index fe08edc..f875dcb 100644
--- a/Language/Generics/typedef_A08_t04.dart
+++ b/Language/Generics/typedef_A08_t04.dart
@@ -23,8 +23,6 @@
/// @Issue 36959, 37050
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X extends A<X>> {}
typedef AAlias<T extends A<T>>(T);
diff --git a/Language/Generics/typedef_A09_t01.dart b/Language/Generics/typedef_A09_t01.dart
index 2401f19..bb4c354 100644
--- a/Language/Generics/typedef_A09_t01.dart
+++ b/Language/Generics/typedef_A09_t01.dart
@@ -24,8 +24,6 @@
/// @Issue 42436
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X extends num> {}
typedef F<Y extends String> = A<Y> Function();
// ^
diff --git a/Language/Generics/typedef_A09_t02.dart b/Language/Generics/typedef_A09_t02.dart
index 423738a..54c148a 100644
--- a/Language/Generics/typedef_A09_t02.dart
+++ b/Language/Generics/typedef_A09_t02.dart
@@ -24,9 +24,6 @@
/// @Issue 42436
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
-
class A<X extends void Function(num)> {}
typedef F<Y> = A<void Function(Y)> Function();
// ^
diff --git a/Language/Generics/typedef_A09_t04.dart b/Language/Generics/typedef_A09_t04.dart
index b728a4e..7cf109b 100644
--- a/Language/Generics/typedef_A09_t04.dart
+++ b/Language/Generics/typedef_A09_t04.dart
@@ -24,8 +24,6 @@
/// @Issue 42436
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X extends void Function(num)> {}
typedef A<Y> Testme<Y>();
// ^
diff --git a/Language/Generics/typedef_A09_t05.dart b/Language/Generics/typedef_A09_t05.dart
index 37e7d7d..5fdc7ca 100644
--- a/Language/Generics/typedef_A09_t05.dart
+++ b/Language/Generics/typedef_A09_t05.dart
@@ -24,8 +24,6 @@
/// @Issue 42436
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X extends num> {}
typedef AAlias<Y extends String> = A<Y>;
// ^
diff --git a/Language/Generics/typedef_A09_t06.dart b/Language/Generics/typedef_A09_t06.dart
index 456eeff..c34efeb 100644
--- a/Language/Generics/typedef_A09_t06.dart
+++ b/Language/Generics/typedef_A09_t06.dart
@@ -24,8 +24,6 @@
/// @Issue 42436
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X extends void Function(num)> {}
typedef AAlias<Y> = A<Y>;
// ^
diff --git a/Language/Generics/typedef_A10_t01.dart b/Language/Generics/typedef_A10_t01.dart
index 5a1ce2f..c408936 100644
--- a/Language/Generics/typedef_A10_t01.dart
+++ b/Language/Generics/typedef_A10_t01.dart
@@ -8,8 +8,6 @@
/// typedef with type parameter.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
typedef AAlias = A;
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t09.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t09.dart
index ca366a6..24fcfc1 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t09.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t09.dart
@@ -27,8 +27,6 @@
/// parameters are inherited then it is a compile error. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
class B extends A {}
class C {}
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t10.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t10.dart
index 5c478a2..0674490 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t10.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t10.dart
@@ -27,8 +27,6 @@
/// name but different number of arguments are inherited
/// @author rodionov
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class SI1 {
void foo(var v);
}
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t11.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t11.dart
index fa71087..19d89a1 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t11.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t11.dart
@@ -28,8 +28,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
class B extends A {}
class C {}
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t12.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t12.dart
index ed641c8..f88a201 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t12.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t12.dart
@@ -27,8 +27,6 @@
/// name but differing sets of named parameters are inherited. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class SI1 {
void foo(var v, {int foo, int bar});
}
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t13.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t13.dart
index a500f12..3ef1598 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t13.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t13.dart
@@ -31,7 +31,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../../Utils/expect.dart';
class C {}
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t14.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t14.dart
index 432b4be..0141739 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t14.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/inheritance_t14.dart
@@ -29,7 +29,6 @@
/// and maximum number of positional parameters. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class SI1 {
void foo(var v);
}
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/not_overriden_members_t03.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/not_overriden_members_t03.dart
index 0407380..47cf963 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/not_overriden_members_t03.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/not_overriden_members_t03.dart
@@ -11,7 +11,6 @@
/// by the subinterface. Test type aliases
/// @author sgrekhov@unopro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../../Utils/expect.dart';
abstract class I {
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/not_overriden_members_t04.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/not_overriden_members_t04.dart
index cc01c77..e387402 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/not_overriden_members_t04.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/not_overriden_members_t04.dart
@@ -10,8 +10,6 @@
/// member S via a subinterface, as specified in (Expressions/Getter Invocation)
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class S {
static int get foo => 1;
}
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_t03.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_t03.dart
index e752b7f..b7e7a59 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_t03.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_t03.dart
@@ -18,7 +18,6 @@
/// issued. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../../Utils/expect.dart';
abstract class SI1 {
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_t04.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_t04.dart
index 8c9af2c..90ae88b 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_t04.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_t04.dart
@@ -18,7 +18,6 @@
/// issued. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../../Utils/expect.dart';
abstract class SI1 {
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t10.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t10.dart
index d290078..8fd0bb9 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t10.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t10.dart
@@ -20,7 +20,6 @@
/// Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class SI1 {
int get m => 1;
}
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t11.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t11.dart
index 5fea84f..33134fa 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t11.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t11.dart
@@ -20,7 +20,6 @@
/// Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class SI1 {
int m() {
return 1;
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t12.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t12.dart
index f468e8e..3bf01a6 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t12.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_getters_type_t12.dart
@@ -21,7 +21,6 @@
/// error occurs. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class SI1 {
int m();
}
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_members_t03.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_members_t03.dart
index f22141f..ffe449d 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_members_t03.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_members_t03.dart
@@ -20,7 +20,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class SI1 {
int get m => 1;
}
diff --git a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_method_and_getter_t03.dart b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_method_and_getter_t03.dart
index c021ab6..91a5198 100644
--- a/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_method_and_getter_t03.dart
+++ b/Language/Interfaces/Superinterfaces/Inheritance_and_Overriding/same_name_method_and_getter_t03.dart
@@ -8,7 +8,6 @@
/// and its superinterface has a getter with the same name. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
int get m => 0;
}
diff --git a/Language/Interfaces/Superinterfaces/definition_t06.dart b/Language/Interfaces/Superinterfaces/definition_t06.dart
index b4bbb17..9d36232 100644
--- a/Language/Interfaces/Superinterfaces/definition_t06.dart
+++ b/Language/Interfaces/Superinterfaces/definition_t06.dart
@@ -10,8 +10,6 @@
/// superinterfaces forms a circular dependency. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class C implements A {}
// ^
// [analyzer] unspecified
diff --git a/Language/Interfaces/Superinterfaces/superinterface_of_itself_t04.dart b/Language/Interfaces/Superinterfaces/superinterface_of_itself_t04.dart
index 5490083..7b242f0 100644
--- a/Language/Interfaces/Superinterfaces/superinterface_of_itself_t04.dart
+++ b/Language/Interfaces/Superinterfaces/superinterface_of_itself_t04.dart
@@ -8,8 +8,6 @@
/// interface is a superinterface of itself. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class I implements IAlias {}
// ^
// [analyzer] unspecified
diff --git a/Language/Mixins/Mixin_Application/abstract_t09.dart b/Language/Mixins/Mixin_Application/abstract_t09.dart
index b19b99d..e2ff0d8 100644
--- a/Language/Mixins/Mixin_Application/abstract_t09.dart
+++ b/Language/Mixins/Mixin_Application/abstract_t09.dart
@@ -12,7 +12,6 @@
/// identifier. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class S {
}
diff --git a/Language/Mixins/Mixin_Application/abstract_t10.dart b/Language/Mixins/Mixin_Application/abstract_t10.dart
index 8fcc57c..a8969f0 100644
--- a/Language/Mixins/Mixin_Application/abstract_t10.dart
+++ b/Language/Mixins/Mixin_Application/abstract_t10.dart
@@ -12,7 +12,6 @@
/// type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class M {
}
diff --git a/Language/Mixins/Mixin_Application/abstract_t11.dart b/Language/Mixins/Mixin_Application/abstract_t11.dart
index 8279331..20e39b7 100644
--- a/Language/Mixins/Mixin_Application/abstract_t11.dart
+++ b/Language/Mixins/Mixin_Application/abstract_t11.dart
@@ -12,7 +12,6 @@
/// type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class M {
}
diff --git a/Language/Mixins/Mixin_Application/abstract_t12.dart b/Language/Mixins/Mixin_Application/abstract_t12.dart
index 5eaf0b3..0be82a6 100644
--- a/Language/Mixins/Mixin_Application/abstract_t12.dart
+++ b/Language/Mixins/Mixin_Application/abstract_t12.dart
@@ -12,7 +12,6 @@
/// application are abstract. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class M {
}
diff --git a/Language/Mixins/Mixin_Application/abstract_t13.dart b/Language/Mixins/Mixin_Application/abstract_t13.dart
index e47a323..4efdb42 100644
--- a/Language/Mixins/Mixin_Application/abstract_t13.dart
+++ b/Language/Mixins/Mixin_Application/abstract_t13.dart
@@ -12,7 +12,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class M {
int n();
}
diff --git a/Language/Mixins/Mixin_Application/deferred_t03.dart b/Language/Mixins/Mixin_Application/deferred_t03.dart
index 8f9f5bf..826a08d 100644
--- a/Language/Mixins/Mixin_Application/deferred_t03.dart
+++ b/Language/Mixins/Mixin_Application/deferred_t03.dart
@@ -9,8 +9,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 42031
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import 'deferred_lib.dart' deferred as d;
class B {
diff --git a/Language/Mixins/Mixin_Application/implicit_constructor_t03.dart b/Language/Mixins/Mixin_Application/implicit_constructor_t03.dart
index 190a6c8..0d6b4e8 100644
--- a/Language/Mixins/Mixin_Application/implicit_constructor_t03.dart
+++ b/Language/Mixins/Mixin_Application/implicit_constructor_t03.dart
@@ -10,7 +10,6 @@
/// declares constructor described in the assertion
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {
diff --git a/Language/Mixins/Mixin_Application/implicit_constructor_t04.dart b/Language/Mixins/Mixin_Application/implicit_constructor_t04.dart
index 20a99d9..ba68e8d 100644
--- a/Language/Mixins/Mixin_Application/implicit_constructor_t04.dart
+++ b/Language/Mixins/Mixin_Application/implicit_constructor_t04.dart
@@ -10,7 +10,6 @@
/// declares constructor described in the assertion. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {
diff --git a/Language/Mixins/Mixin_Application/initializers_t04.dart b/Language/Mixins/Mixin_Application/initializers_t04.dart
index 8319cba..cfdf482 100644
--- a/Language/Mixins/Mixin_Application/initializers_t04.dart
+++ b/Language/Mixins/Mixin_Application/initializers_t04.dart
@@ -9,7 +9,6 @@
/// and initialize corresponding fields of the class. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {
diff --git a/Language/Mixins/Mixin_Application/initializers_t05.dart b/Language/Mixins/Mixin_Application/initializers_t05.dart
index 96bdd78..7e5a76e 100644
--- a/Language/Mixins/Mixin_Application/initializers_t05.dart
+++ b/Language/Mixins/Mixin_Application/initializers_t05.dart
@@ -9,7 +9,6 @@
/// and initialize corresponding fields of the class. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {
diff --git a/Language/Mixins/Mixin_Application/initializers_t06.dart b/Language/Mixins/Mixin_Application/initializers_t06.dart
index e3d8b11..43d288f 100644
--- a/Language/Mixins/Mixin_Application/initializers_t06.dart
+++ b/Language/Mixins/Mixin_Application/initializers_t06.dart
@@ -9,7 +9,6 @@
/// and initialize corresponding fields of the class C.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {
diff --git a/Language/Mixins/Mixin_Application/interfaces_t06.dart b/Language/Mixins/Mixin_Application/interfaces_t06.dart
index 21be114..bf9cd33 100644
--- a/Language/Mixins/Mixin_Application/interfaces_t06.dart
+++ b/Language/Mixins/Mixin_Application/interfaces_t06.dart
@@ -9,7 +9,6 @@
/// static warning occurs. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class I {
num get g;
}
diff --git a/Language/Mixins/Mixin_Application/interfaces_t07.dart b/Language/Mixins/Mixin_Application/interfaces_t07.dart
index 904a486..f592ce1 100644
--- a/Language/Mixins/Mixin_Application/interfaces_t07.dart
+++ b/Language/Mixins/Mixin_Application/interfaces_t07.dart
@@ -10,7 +10,6 @@
/// mixin, partially in a superclass. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class I {
num get g1;
String get g2;
diff --git a/Language/Mixins/Mixin_Application/superclass_t03.dart b/Language/Mixins/Mixin_Application/superclass_t03.dart
index 13eb119..396288a 100644
--- a/Language/Mixins/Mixin_Application/superclass_t03.dart
+++ b/Language/Mixins/Mixin_Application/superclass_t03.dart
@@ -10,8 +10,6 @@
/// @issue 42254
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class Sstatic {
}
diff --git a/Language/Mixins/Mixin_Application/superclass_t04.dart b/Language/Mixins/Mixin_Application/superclass_t04.dart
index 990752a..79df0db 100644
--- a/Language/Mixins/Mixin_Application/superclass_t04.dart
+++ b/Language/Mixins/Mixin_Application/superclass_t04.dart
@@ -10,8 +10,6 @@
/// @issue 42254
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class Sstatic {
}
diff --git a/Language/Mixins/Mixin_Application/superinterfaces_t10.dart b/Language/Mixins/Mixin_Application/superinterfaces_t10.dart
index e4fab94..0199c1c 100644
--- a/Language/Mixins/Mixin_Application/superinterfaces_t10.dart
+++ b/Language/Mixins/Mixin_Application/superinterfaces_t10.dart
@@ -11,7 +11,6 @@
/// all the direct superinterfaces of M. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class A {
int get a;
}
diff --git a/Language/Mixins/Mixin_Application/superinterfaces_t11.dart b/Language/Mixins/Mixin_Application/superinterfaces_t11.dart
index 826596a..efc6655 100644
--- a/Language/Mixins/Mixin_Application/superinterfaces_t11.dart
+++ b/Language/Mixins/Mixin_Application/superinterfaces_t11.dart
@@ -11,7 +11,6 @@
/// direct superinterfaces of M. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class A {
int get a;
}
diff --git a/Language/Mixins/Mixin_Application/superinterfaces_t12.dart b/Language/Mixins/Mixin_Application/superinterfaces_t12.dart
index 5e5ac59..5c6f89d 100644
--- a/Language/Mixins/Mixin_Application/superinterfaces_t12.dart
+++ b/Language/Mixins/Mixin_Application/superinterfaces_t12.dart
@@ -11,7 +11,6 @@
/// its superinterfaces
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
int get a => 0;
}
diff --git a/Language/Mixins/Mixin_Application/superinterfaces_t13.dart b/Language/Mixins/Mixin_Application/superinterfaces_t13.dart
index 6f77048..0b3cf9a 100644
--- a/Language/Mixins/Mixin_Application/superinterfaces_t13.dart
+++ b/Language/Mixins/Mixin_Application/superinterfaces_t13.dart
@@ -12,7 +12,6 @@
/// @issue 26409
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
int get a => 0;
}
diff --git a/Language/Mixins/Mixin_Application/superinterfaces_t14.dart b/Language/Mixins/Mixin_Application/superinterfaces_t14.dart
index a788d76..9489d5e 100644
--- a/Language/Mixins/Mixin_Application/superinterfaces_t14.dart
+++ b/Language/Mixins/Mixin_Application/superinterfaces_t14.dart
@@ -11,7 +11,6 @@
/// and C does implement them. Test class C = S with M; syntax. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
abstract class A {
int get a;
}
diff --git a/Language/Mixins/Mixin_Application/syntax_t26.dart b/Language/Mixins/Mixin_Application/syntax_t26.dart
index c3b2a22..8164008 100644
--- a/Language/Mixins/Mixin_Application/syntax_t26.dart
+++ b/Language/Mixins/Mixin_Application/syntax_t26.dart
@@ -13,7 +13,6 @@
/// its mixins. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {
diff --git a/Language/Mixins/Mixin_Application/warning_t04.dart b/Language/Mixins/Mixin_Application/warning_t04.dart
index e57ab95..8f4d6ac 100644
--- a/Language/Mixins/Mixin_Application/warning_t04.dart
+++ b/Language/Mixins/Mixin_Application/warning_t04.dart
@@ -11,7 +11,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 23878
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class S {
}
diff --git a/Language/Mixins/Mixin_Application/wrong_mixin_type_t09.dart b/Language/Mixins/Mixin_Application/wrong_mixin_type_t09.dart
index e159427..2b0a9d3 100644
--- a/Language/Mixins/Mixin_Application/wrong_mixin_type_t09.dart
+++ b/Language/Mixins/Mixin_Application/wrong_mixin_type_t09.dart
@@ -12,7 +12,6 @@
/// application where M is malformed type. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class S {
}
diff --git a/Language/Mixins/Mixin_Composition/order_t02.dart b/Language/Mixins/Mixin_Composition/order_t02.dart
index a104b43..3564afd 100644
--- a/Language/Mixins/Mixin_Composition/order_t02.dart
+++ b/Language/Mixins/Mixin_Composition/order_t02.dart
@@ -20,7 +20,6 @@
/// order. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {
diff --git a/Language/Mixins/declaration_t01.dart b/Language/Mixins/declaration_t01.dart
index 958b100..ab1f1d6 100644
--- a/Language/Mixins/declaration_t01.dart
+++ b/Language/Mixins/declaration_t01.dart
@@ -9,7 +9,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 45505
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class C {}
typedef CAlias = C;
diff --git a/Language/Mixins/declaring_constructor_t11.dart b/Language/Mixins/declaring_constructor_t11.dart
index ba5d6c7..814d5ed 100644
--- a/Language/Mixins/declaring_constructor_t11.dart
+++ b/Language/Mixins/declaring_constructor_t11.dart
@@ -8,7 +8,6 @@
/// explicitly declares a constructor.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A {
}
diff --git a/Language/Types/Type_Aliases/built-in_types_t01.dart b/Language/Types/Type_Aliases/built-in_types_t01.dart
index 0c5c946..23ccd7a 100644
--- a/Language/Types/Type_Aliases/built-in_types_t01.dart
+++ b/Language/Types/Type_Aliases/built-in_types_t01.dart
@@ -7,7 +7,6 @@
/// literals
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../Utils/expect.dart';
typedef IntAlias = int;
diff --git a/Language/Types/Type_Aliases/built-in_types_t02.dart b/Language/Types/Type_Aliases/built-in_types_t02.dart
index 9e25f3d..88d0929 100644
--- a/Language/Types/Type_Aliases/built-in_types_t02.dart
+++ b/Language/Types/Type_Aliases/built-in_types_t02.dart
@@ -7,8 +7,6 @@
/// arguments
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
typedef IntAlias = int;
typedef NumAlias = num;
typedef DoubleAlias = double;
diff --git a/Language/Types/Type_Aliases/built-in_types_t03.dart b/Language/Types/Type_Aliases/built-in_types_t03.dart
index eddc301..c0d76df 100644
--- a/Language/Types/Type_Aliases/built-in_types_t03.dart
+++ b/Language/Types/Type_Aliases/built-in_types_t03.dart
@@ -6,7 +6,6 @@
/// @description Checks use of type aliases for built-in types as return values
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../Utils/expect.dart';
typedef IntAlias = int;
diff --git a/Language/Types/Type_Aliases/built-in_types_t04.dart b/Language/Types/Type_Aliases/built-in_types_t04.dart
index 9392b29..ee431a0 100644
--- a/Language/Types/Type_Aliases/built-in_types_t04.dart
+++ b/Language/Types/Type_Aliases/built-in_types_t04.dart
@@ -6,7 +6,6 @@
/// @description Checks first time initialization via type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../Utils/expect.dart';
typedef IntAlias = int;
diff --git a/Language/Types/Type_Aliases/built-in_types_t05.dart b/Language/Types/Type_Aliases/built-in_types_t05.dart
index af45105..61fc767 100644
--- a/Language/Types/Type_Aliases/built-in_types_t05.dart
+++ b/Language/Types/Type_Aliases/built-in_types_t05.dart
@@ -6,7 +6,6 @@
/// @description Checks initialization via constructor
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../Utils/expect.dart';
typedef IntAlias = int;
diff --git a/Language/Types/Type_Aliases/built-in_types_t06.dart b/Language/Types/Type_Aliases/built-in_types_t06.dart
index bf1ef46..71f1331 100644
--- a/Language/Types/Type_Aliases/built-in_types_t06.dart
+++ b/Language/Types/Type_Aliases/built-in_types_t06.dart
@@ -6,7 +6,6 @@
/// @description Checks arithmetic operations via type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../Utils/expect.dart';
typedef IntAlias = int;
diff --git a/Language/Types/Type_Aliases/built-in_types_t07.dart b/Language/Types/Type_Aliases/built-in_types_t07.dart
index 8c09f50..6493339 100644
--- a/Language/Types/Type_Aliases/built-in_types_t07.dart
+++ b/Language/Types/Type_Aliases/built-in_types_t07.dart
@@ -6,7 +6,6 @@
/// @description Checks string concatenation
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../Utils/expect.dart';
typedef StringAlias = String;
diff --git a/Language/Types/Type_Aliases/built-in_types_t08.dart b/Language/Types/Type_Aliases/built-in_types_t08.dart
index bdf8067..6272cec 100644
--- a/Language/Types/Type_Aliases/built-in_types_t08.dart
+++ b/Language/Types/Type_Aliases/built-in_types_t08.dart
@@ -6,7 +6,6 @@
/// @description Checks logical operations
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../Utils/expect.dart';
typedef BoolAlias = bool;
diff --git a/Language/Types/Type_Aliases/built-in_types_t09.dart b/Language/Types/Type_Aliases/built-in_types_t09.dart
index be93bf9..69c72ac 100644
--- a/Language/Types/Type_Aliases/built-in_types_t09.dart
+++ b/Language/Types/Type_Aliases/built-in_types_t09.dart
@@ -6,7 +6,6 @@
/// @description Checks left shift via type alias for int
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../Utils/expect.dart';
typedef IntAlias = int;
diff --git a/Language/Types/Type_Aliases/built-in_types_t10.dart b/Language/Types/Type_Aliases/built-in_types_t10.dart
index 3a4f8c5..234ea86 100644
--- a/Language/Types/Type_Aliases/built-in_types_t10.dart
+++ b/Language/Types/Type_Aliases/built-in_types_t10.dart
@@ -6,7 +6,6 @@
/// @description Checks right shift via type alias for int
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../Utils/expect.dart';
typedef IntAlias = int;
diff --git a/Language/Types/Type_Aliases/built-in_types_t12.dart b/Language/Types/Type_Aliases/built-in_types_t12.dart
index 2276b66..da4a1ac 100644
--- a/Language/Types/Type_Aliases/built-in_types_t12.dart
+++ b/Language/Types/Type_Aliases/built-in_types_t12.dart
@@ -6,7 +6,6 @@
/// @description Checks bitwise operations via type alias for int
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import '../../../Utils/expect.dart';
typedef IntAlias = int;
diff --git a/Language/Types/Type_Aliases/scope_t01.dart b/Language/Types/Type_Aliases/scope_t01.dart
index 736b247..457dca7 100644
--- a/Language/Types/Type_Aliases/scope_t01.dart
+++ b/Language/Types/Type_Aliases/scope_t01.dart
@@ -9,7 +9,6 @@
/// the name id, bound to the type T .
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {}
diff --git a/Language/Types/Type_Aliases/scope_t02.dart b/Language/Types/Type_Aliases/scope_t02.dart
index 5025066..4133db4 100644
--- a/Language/Types/Type_Aliases/scope_t02.dart
+++ b/Language/Types/Type_Aliases/scope_t02.dart
@@ -8,8 +8,6 @@
/// @description Checks that it is a compile error if id is not unique
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
class C<T> {}
diff --git a/Language/Types/Type_Aliases/scope_t03.dart b/Language/Types/Type_Aliases/scope_t03.dart
index f43df2d..55fc987 100644
--- a/Language/Types/Type_Aliases/scope_t03.dart
+++ b/Language/Types/Type_Aliases/scope_t03.dart
@@ -9,7 +9,6 @@
/// the name id into the scope of L, bound to the type T .
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
import "scope.lib.dart";
diff --git a/Language/Types/Type_Aliases/scope_t04.dart b/Language/Types/Type_Aliases/scope_t04.dart
index 5da87f8..e32421f 100644
--- a/Language/Types/Type_Aliases/scope_t04.dart
+++ b/Language/Types/Type_Aliases/scope_t04.dart
@@ -10,7 +10,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 42640
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "scope.lib.dart";
typedef AAlias = A;
diff --git a/Language/Types/Type_Aliases/self_reference_t18.dart b/Language/Types/Type_Aliases/self_reference_t18.dart
index 12f164c..b489fae 100644
--- a/Language/Types/Type_Aliases/self_reference_t18.dart
+++ b/Language/Types/Type_Aliases/self_reference_t18.dart
@@ -8,7 +8,6 @@
/// error. Test direct reference
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class C<T> {}
typedef CAlias1<T> = C<CAlias1>;
diff --git a/Language/Types/Type_Aliases/self_reference_t19.dart b/Language/Types/Type_Aliases/self_reference_t19.dart
index 7c544d1..ac93973 100644
--- a/Language/Types/Type_Aliases/self_reference_t19.dart
+++ b/Language/Types/Type_Aliases/self_reference_t19.dart
@@ -8,7 +8,6 @@
/// error. Test recursive reference
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class C<T> {}
typedef CAlias1<T extends CAlias2> = C<T>;
diff --git a/Language/Types/Type_Aliases/self_reference_t20.dart b/Language/Types/Type_Aliases/self_reference_t20.dart
index 3a11c89..0bbcef6 100644
--- a/Language/Types/Type_Aliases/self_reference_t20.dart
+++ b/Language/Types/Type_Aliases/self_reference_t20.dart
@@ -8,7 +8,6 @@
/// error. Test recursive reference
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class C<T1, T2> {}
typedef CAlias1<T1, T2> = C<T1, T2>;
diff --git a/Language/Types/Type_Aliases/self_reference_t21.dart b/Language/Types/Type_Aliases/self_reference_t21.dart
index 93a668d..176d98a 100644
--- a/Language/Types/Type_Aliases/self_reference_t21.dart
+++ b/Language/Types/Type_Aliases/self_reference_t21.dart
@@ -8,7 +8,6 @@
/// error.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class C<T1, T2> extends CAlias<T1, T2> {}
// ^
// [analyzer] unspecified
diff --git a/Language/Types/Type_Aliases/self_reference_t22.dart b/Language/Types/Type_Aliases/self_reference_t22.dart
index 7bfc90b..c4c13aa 100644
--- a/Language/Types/Type_Aliases/self_reference_t22.dart
+++ b/Language/Types/Type_Aliases/self_reference_t22.dart
@@ -8,7 +8,6 @@
/// error.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class C<T1, T2> implements CAlias<T1, T2> {}
// ^
// [analyzer] unspecified
diff --git a/Language/Types/Type_Aliases/self_reference_t24.dart b/Language/Types/Type_Aliases/self_reference_t24.dart
index 559d27e..d7dc099 100644
--- a/Language/Types/Type_Aliases/self_reference_t24.dart
+++ b/Language/Types/Type_Aliases/self_reference_t24.dart
@@ -8,7 +8,6 @@
/// error.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A extends CAlias {}
// ^
// [analyzer] unspecified
diff --git a/Language/Types/Type_Aliases/self_reference_t25.dart b/Language/Types/Type_Aliases/self_reference_t25.dart
index d3d8563..1f3d368 100644
--- a/Language/Types/Type_Aliases/self_reference_t25.dart
+++ b/Language/Types/Type_Aliases/self_reference_t25.dart
@@ -8,7 +8,6 @@
/// error.
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
class A implements CAlias {}
// ^
// [analyzer] unspecified
diff --git a/Language/Types/Type_Aliases/syntax_t01.dart b/Language/Types/Type_Aliases/syntax_t01.dart
index 392a0c0..2839f2c 100644
--- a/Language/Types/Type_Aliases/syntax_t01.dart
+++ b/Language/Types/Type_Aliases/syntax_t01.dart
@@ -12,7 +12,6 @@
/// non-function type alias with no type parameters
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
const int meta = 1;
diff --git a/Language/Types/Type_Aliases/syntax_t02.dart b/Language/Types/Type_Aliases/syntax_t02.dart
index b62939f..b3b9e4b 100644
--- a/Language/Types/Type_Aliases/syntax_t02.dart
+++ b/Language/Types/Type_Aliases/syntax_t02.dart
@@ -12,7 +12,6 @@
/// non-function type alias with type parameters
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
const int meta = 1;
diff --git a/Language/Types/Type_Aliases/syntax_t03.dart b/Language/Types/Type_Aliases/syntax_t03.dart
index 6fadf81..dca12aa 100644
--- a/Language/Types/Type_Aliases/syntax_t03.dart
+++ b/Language/Types/Type_Aliases/syntax_t03.dart
@@ -12,7 +12,6 @@
/// non-function type alias with type parameters
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
const int meta = 1;
diff --git a/Language/Types/Type_Aliases/syntax_t04.dart b/Language/Types/Type_Aliases/syntax_t04.dart
index 2651bea..b1619be 100644
--- a/Language/Types/Type_Aliases/syntax_t04.dart
+++ b/Language/Types/Type_Aliases/syntax_t04.dart
@@ -12,7 +12,6 @@
/// non-function type alias with type parameters
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../Utils/expect.dart";
class A {}
diff --git a/Language/Types/Type_Aliases/syntax_t05.dart b/Language/Types/Type_Aliases/syntax_t05.dart
index f973a9f..5636688 100644
--- a/Language/Types/Type_Aliases/syntax_t05.dart
+++ b/Language/Types/Type_Aliases/syntax_t05.dart
@@ -12,8 +12,6 @@
/// of type parameters
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
class C<T1, T2> {}
diff --git a/Language/Types/Type_Aliases/syntax_t06.dart b/Language/Types/Type_Aliases/syntax_t06.dart
index b154f29..1b5c423 100644
--- a/Language/Types/Type_Aliases/syntax_t06.dart
+++ b/Language/Types/Type_Aliases/syntax_t06.dart
@@ -12,8 +12,6 @@
/// placed
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
const int meta = 1;
class A {}
diff --git a/Language/Types/Type_Aliases/syntax_t20.dart b/Language/Types/Type_Aliases/syntax_t20.dart
index 0a57684..4cb2860 100644
--- a/Language/Types/Type_Aliases/syntax_t20.dart
+++ b/Language/Types/Type_Aliases/syntax_t20.dart
@@ -12,8 +12,6 @@
/// built-in types
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../Utils/expect.dart";
const int meta = 1;
diff --git a/Language/Types/Type_Aliases/syntax_t21.dart b/Language/Types/Type_Aliases/syntax_t21.dart
index a9d7f2e..4f94a82 100644
--- a/Language/Types/Type_Aliases/syntax_t21.dart
+++ b/Language/Types/Type_Aliases/syntax_t21.dart
@@ -12,8 +12,6 @@
/// built-in types
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "dart:async";
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t01.dart
index d4d8d87..f4e0570 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t01.dart
@@ -44,8 +44,6 @@
/// FutureOr<X>> = C<X>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "dart:async";
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t02.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t02.dart
index 49266cc..4aaeb78 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t02.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t02.dart
@@ -44,8 +44,6 @@
/// FutureOr<C<X>> = C<X>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "dart:async";
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t03.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t03.dart
index 26064bc..75f3b9c 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t03.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_FutureOr_l1_t03.dart
@@ -44,8 +44,6 @@
/// FutureOr<C<X>?> = C<X>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "dart:async";
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t01.dart
index 055eec9..e25bed7 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t01.dart
@@ -44,8 +44,6 @@
/// A<X extends C<X>> = C<X>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t02.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t02.dart
index 9521990..7365e8f 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t02.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t02.dart
@@ -44,8 +44,6 @@
/// C<C<X>>> = C<X>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t03.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t03.dart
index 2c12556..dd212da 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t03.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t03.dart
@@ -44,8 +44,6 @@
/// A<X>>; typedef B<X extends A<X>> = A<X>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class A<X extends A<X>> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t05.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t05.dart
index 010b5f1..f6e98d7 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t05.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t05.dart
@@ -45,8 +45,6 @@
/// @author iarkh@unipro.ru
/// @Issue 34726,41719
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class M<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t06.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t06.dart
index d1dc4b7..209354e 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t06.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t06.dart
@@ -44,8 +44,6 @@
/// M<M<M<M<M<M<X>>>>>>> = M<M<X>>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class M<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t07.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t07.dart
index f9b1540..e1e9f3f 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t07.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t07.dart
@@ -44,8 +44,6 @@
/// A<X extends C<X>?> = C<X>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t08.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t08.dart
index 894a61c..c516b9d 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t08.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l1_t08.dart
@@ -44,8 +44,6 @@
/// A<X extends C<X>> = C<X>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t01.dart
index 2ccc013..7b4b7f6 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t01.dart
@@ -44,8 +44,6 @@
/// [A<X1 extends X2, X2 extends C<X1, X2>>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X1, X2> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t02.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t02.dart
index 3869fb5..fc7a6af 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t02.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t02.dart
@@ -44,8 +44,6 @@
/// A<X1 extends C<X1, X2>, X2 extends X1>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X1, X2> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t03.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t03.dart
index 2592d06..f60506d 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t03.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t03.dart
@@ -45,8 +45,6 @@
/// C<Y, X>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X1, X2> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t05.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t05.dart
index 9ff8909..83ea0a1 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t05.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t05.dart
@@ -44,8 +44,6 @@
/// B<X extends B<X, Y>, Y>; typedef A<X1 extends B<X1, X2>, X2 extends X1>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class B<X extends B<X, Y>, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t06.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t06.dart
index 88786ae..1063b97 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t06.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t06.dart
@@ -44,8 +44,6 @@
/// B<X extends B<X, Y>, Y>; typedef A<X1 extends B<X1, X2>, X2>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class B<X extends B<X, Y>, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t08.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t08.dart
index df69256..b5772f0 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t08.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t08.dart
@@ -52,8 +52,6 @@
///
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class B<X extends B<X, Y>, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t09.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t09.dart
index 1362ef6..3d28980 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t09.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t09.dart
@@ -45,8 +45,6 @@
/// B<X2>> = C<X1, X2>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class B<X extends B<X>> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t10.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t10.dart
index aa4fbdf..c5e6c98 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t10.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l2_t10.dart
@@ -44,8 +44,6 @@
/// A<X1 extends B<X1, X2>, X2 extends B<X1, X2>>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class B<X, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l3_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l3_t01.dart
index 32d943a..c74934f 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l3_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l3_t01.dart
@@ -44,8 +44,6 @@
/// G<X1 extends X2, X2 extends X3, X3 extends A<X1, X2, X3>>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class A<X, Y, Z> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l4_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l4_t01.dart
index bc04b41..73a71bf 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l4_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_l4_t01.dart
@@ -45,8 +45,6 @@
/// A<X1>, X2 extends A<X1>, X3 extends B, X4 extends X2> = C<X1, X2, X3, X4>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class A<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t01.dart
index 79d0336..243196f 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t01.dart
@@ -45,8 +45,6 @@
/// class C<X>; typedef A<X extends G<С<X>>> = C<X>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = X Function();
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t02.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t02.dart
index 0224d67..b247d9f 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t02.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t02.dart
@@ -45,8 +45,6 @@
/// void Function(X); class C<X>; typedef A<X extends G<C<X>>> = C<X>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = void Function(X);
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t04.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t04.dart
index 436f442..867d3d2 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t04.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l1_t04.dart
@@ -45,8 +45,6 @@
/// void Function(); class C<X>; typedef A<X extends G<C<X>>> = C<X>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = void Function();
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t01.dart
index 2a082d2..e260c86 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t01.dart
@@ -44,8 +44,6 @@
/// X Function(); class C<X, Y>; typedef A<X extends G<C<X, Y>>, Y extends X>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = X Function();
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t02.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t02.dart
index 7b5a35c..72a0741 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t02.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t02.dart
@@ -45,8 +45,6 @@
/// C<X, Y>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = Function(X);
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t04.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t04.dart
index 4587340..bbd745a 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t04.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t04.dart
@@ -45,8 +45,6 @@
/// C<X, Y>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t05.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t05.dart
index 3a15e29..1b5d84b 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t05.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t05.dart
@@ -45,8 +45,6 @@
/// Y>>> = C<X, Y>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t06.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t06.dart
index 236a2e9..eebef7b 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t06.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t06.dart
@@ -45,8 +45,6 @@
/// Y>>> = C<X, Y>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t08.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t08.dart
index 42a09aa..7faccde 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t08.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/dynamic/nonfunction_typedef_l2_t08.dart
@@ -45,8 +45,6 @@
/// G<C<X, Y>>> = C<X, Y>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t01.dart
index ce82e94..eb0ed84 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t01.dart
@@ -44,8 +44,6 @@
/// A<X extends FutureOr<X>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
import "dart:async";
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t02.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t02.dart
index db4e783..8fe0335 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t02.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t02.dart
@@ -45,8 +45,6 @@
/// @Issue 44223, 45514, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
import "dart:async";
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t03.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t03.dart
index 73cba9a..31e2bf3 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t03.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t03.dart
@@ -45,8 +45,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
import "dart:async";
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t04.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t04.dart
index e2eb956..e71dcd6 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t04.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_FutureOr_l1_t04.dart
@@ -45,8 +45,6 @@
/// @Issue 44223, 45514, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
import "dart:async";
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t01.dart
index 6f1a554..4a58a52 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t01.dart
@@ -46,8 +46,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t02.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t02.dart
index fb21aa3..4fa491a 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t02.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t02.dart
@@ -45,8 +45,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t03.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t03.dart
index 70df80a..88a12b0 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t03.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t03.dart
@@ -45,8 +45,6 @@
/// @Issue 42446, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class A<X extends A<X>> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t04.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t04.dart
index c2f7dc3..13c919a 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t04.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t04.dart
@@ -45,8 +45,6 @@
/// @Issue 42446, 45117
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A<X extends A<X>> {}
typedef B<X extends A<A<X>>> = A<X>;
// ^
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t05.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t05.dart
index 32936b1..a1e438c 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t05.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t05.dart
@@ -45,8 +45,6 @@
/// @Issue 42446, 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class M<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t06.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t06.dart
index 311b302..9b75e40 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t06.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t06.dart
@@ -45,8 +45,6 @@
/// @Issue 42446, 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class M<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t07.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t07.dart
index d5d6da2..c1341fe 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t07.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t07.dart
@@ -45,8 +45,6 @@
/// @Issue 42446, 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t08.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t08.dart
index 83eccb1..ed70202 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t08.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l1_t08.dart
@@ -45,8 +45,6 @@
/// @Issue 44223, 45487, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t01.dart
index 263766e..a5810f9 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t01.dart
@@ -45,8 +45,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X1, X2> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t02.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t02.dart
index d610b60..c72f60e 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t02.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t02.dart
@@ -45,8 +45,6 @@
/// @Issue 44223
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X1, X2> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t03.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t03.dart
index cdb947c..10bfa49 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t03.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t03.dart
@@ -46,8 +46,6 @@
/// @Issue 44223
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X1, X2> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t04.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t04.dart
index 9af1335..54b6afc 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t04.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t04.dart
@@ -44,8 +44,6 @@
/// is not well-bounded.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class C<X, Y> {}
typedef A1<X extends A1<X, Y>, Y extends A1<dynamic, A1<X, Y>>>?>? = C<X, Y>;
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t05.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t05.dart
index 4663e1d..5701c91 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t05.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t05.dart
@@ -45,8 +45,6 @@
/// @Issue 42446, 445658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class B<X extends B<X, Y>, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t06.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t06.dart
index d935653..3b42a47 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t06.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t06.dart
@@ -45,8 +45,6 @@
/// @Issue 42446, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class B<X extends B<X, Y>, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t07.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t07.dart
index cfb16f3..fc39f5f 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t07.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t07.dart
@@ -45,8 +45,6 @@
/// @Issue 42446
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class B<X extends B<X, Y>, Y> {}
typedef A<X1, X2 extends B<X2, X1>> = B<X1, X2>;
// ^^^^
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t08.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t08.dart
index ca63aea..e453144 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t08.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t08.dart
@@ -53,8 +53,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class B<X extends B<X, Y>, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t09.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t09.dart
index 133c23c..912fe5c 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t09.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t09.dart
@@ -46,8 +46,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class B<X extends B<X>> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t10.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t10.dart
index 18337cb..5110b0c 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t10.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l2_t10.dart
@@ -45,8 +45,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class B<X, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l3_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l3_t01.dart
index f04dc98..0f3490a 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l3_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l3_t01.dart
@@ -46,8 +46,6 @@
/// @Issue 44223, 45514, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class A<X, Y, Z> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l4_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l4_t01.dart
index 095e1ee..c1b2df2 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l4_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_l4_t01.dart
@@ -46,8 +46,6 @@
/// @Issue 44223, 45118, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class A<X> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t01.dart
index f8f7e5d..9f337f1 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t01.dart
@@ -46,8 +46,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = X Function();
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t02.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t02.dart
index 8372b81..1875784 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t02.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t02.dart
@@ -46,8 +46,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = void Function(X);
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t03.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t03.dart
index dbf460e..bc092c3 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t03.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t03.dart
@@ -45,8 +45,6 @@
/// @Issue 41963, 41964, 44223, 45519, 45522
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = X Function(X);
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t04.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t04.dart
index 28e004e..e0a69cc 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t04.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l1_t04.dart
@@ -89,8 +89,6 @@
* class C<X>; typedef A<X extends G<С<X>>> = C<X>].
* @author iarkh@unipro.ru
*/
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = void Function();
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t01.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t01.dart
index af37556..eddc60e 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t01.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t01.dart
@@ -45,8 +45,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = X Function();
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t02.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t02.dart
index 8d7abac..d5deebe 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t02.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t02.dart
@@ -46,8 +46,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = Function(X);
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t03.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t03.dart
index 8a06cf0..94e4a75 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t03.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t03.dart
@@ -46,8 +46,6 @@
/// @Issue 44223, 45519, 45522
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t04.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t04.dart
index 65662df..df71728 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t04.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t04.dart
@@ -44,8 +44,6 @@
/// void Function(); typedef A<X extends G<C<X,Y>>, Y extends X>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t05.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t05.dart
index 9211bb3..9f39a83 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t05.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t05.dart
@@ -46,8 +46,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t06.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t06.dart
index dbcb516..df924b1 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t06.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t06.dart
@@ -46,8 +46,6 @@
/// @Issue 44223, 45658
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t07.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t07.dart
index be9fdd1..82e426b 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t07.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t07.dart
@@ -46,8 +46,6 @@
/// @Issue 41963, 41964, 44223, 45519, 45522
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t08.dart b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t08.dart
index 0757844..17cb1ec 100644
--- a/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t08.dart
+++ b/LanguageFeatures/Instantiate-to-bound/nonfunction_typedef/static/nonfunction_typedef_l2_t08.dart
@@ -45,8 +45,6 @@
/// G<C<X, Y>>> = C<X, Y>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_FutureOr_l1_t01.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_FutureOr_l1_t01.dart
index a82a6b9..227be61 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_FutureOr_l1_t01.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_FutureOr_l1_t01.dart
@@ -15,8 +15,6 @@
/// non-function type alias parameter is [FutureOr]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "dart:async";
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_FutureOr_l1_t02.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_FutureOr_l1_t02.dart
index 267d0c1..b2a5bcd 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_FutureOr_l1_t02.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_FutureOr_l1_t02.dart
@@ -15,8 +15,6 @@
/// alias parameter is [FutureOr<List>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "dart:async";
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t01.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t01.dart
index 3c517fc..85bbf76 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t01.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t01.dart
@@ -15,8 +15,6 @@
/// for the very simple case: [typedef A<X extends num> = C<X>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t02.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t02.dart
index 21169e5..12a750c 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t02.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t02.dart
@@ -15,8 +15,6 @@
/// for lists and maps parameters: [A<X extends List>], [B<X extends Map>].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t03.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t03.dart
index 20e3e8d..32e7d70 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t03.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t03.dart
@@ -15,8 +15,6 @@
/// for [A<X extends List<int>>], [B<X extends Map<int, int>>.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t04.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t04.dart
index 12f340a..26e7986 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t04.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t04.dart
@@ -15,8 +15,6 @@
/// for [A<X extends List<List>>], [B<X extends Map<Map, Map>>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t05.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t05.dart
index d8bff99..4d9b7d6 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t05.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t05.dart
@@ -15,8 +15,6 @@
/// for the very simple case: [typedef A<X extends num> = C<X>?]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t06.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t06.dart
index 38133b1..9ba0b6a 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t06.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t06.dart
@@ -15,8 +15,6 @@
/// for lists and maps parameters: [A<X extends List>?], [B<X extends Map>?].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t07.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t07.dart
index fbc5978..5540780 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t07.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l1_t07.dart
@@ -15,8 +15,6 @@
/// for [A<X extends List<int>?>], [B<X extends Map<int, int>?>.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t01.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t01.dart
index 9460952..622e447 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t01.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t01.dart
@@ -15,8 +15,6 @@
/// non-function type alias with two depending typed parameters.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t02.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t02.dart
index 135e86c..cc8747d 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t02.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t02.dart
@@ -15,8 +15,6 @@
/// non-function type alias with two depending typed parameters.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t03.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t03.dart
index a45b633..d9e439a 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t03.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_l2_t03.dart
@@ -15,8 +15,6 @@
/// non-function type alias with two depending typed parameters.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t01.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t01.dart
index f8b6838..601b3e8 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t01.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t01.dart
@@ -15,8 +15,6 @@
/// non-function type alias with function parameter (covariant)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t02.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t02.dart
index f2fa8be..13fc7db 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t02.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t02.dart
@@ -15,8 +15,6 @@
/// non-function type alias with function parameter (contravariant)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t03.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t03.dart
index e4e528b..521f8c7 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t03.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t03.dart
@@ -15,8 +15,6 @@
/// non-function type alias with function parameter (invariant)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t04.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t04.dart
index ba49bed..1dbb522 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t04.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t04.dart
@@ -15,8 +15,6 @@
/// non-function type alias with function parameter (not used)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t05.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t05.dart
index 885f4cd..6e70c7b 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t05.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t05.dart
@@ -15,8 +15,6 @@
/// non-function type alias with function parameter (covariant)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t06.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t06.dart
index 7a489f0..8c51488 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t06.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t06.dart
@@ -16,8 +16,6 @@
///
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t07.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t07.dart
index bbca075..3d6f2e9 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t07.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t07.dart
@@ -15,8 +15,6 @@
/// non-function type alias with function parameter (contravariant)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t08.dart b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t08.dart
index 03b73c3..4fea29e 100644
--- a/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t08.dart
+++ b/LanguageFeatures/Simple-bounds/dynamic/type-aliases/typedef1_typedef_l1_t08.dart
@@ -15,8 +15,6 @@
/// non-function type alias with function parameter (not used)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_FutureOr_l1_t01.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_FutureOr_l1_t01.dart
index 0ede38c..090308d 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_FutureOr_l1_t01.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_FutureOr_l1_t01.dart
@@ -15,8 +15,6 @@
/// non-function type alias parameter is [FutureOr]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "dart:async";
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_FutureOr_l1_t02.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_FutureOr_l1_t02.dart
index 7f1a9df..0a95019 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_FutureOr_l1_t02.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_FutureOr_l1_t02.dart
@@ -15,8 +15,6 @@
/// when type parameter is [FutureOr<List>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "dart:async";
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t01.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t01.dart
index 803f411..46ea290 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t01.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t01.dart
@@ -16,8 +16,6 @@
/// @Issue 42449
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t02.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t02.dart
index 5a968dd..b8f5de7 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t02.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t02.dart
@@ -15,8 +15,6 @@
/// aliases with list and map parameters: [A<X extends List>], [B<X extends Map>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t03.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t03.dart
index 151beb1..228116f 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t03.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t03.dart
@@ -15,8 +15,6 @@
/// aliases [A<X extends List<int>>], [B<X extends Map<int, int>>
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t04.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t04.dart
index ea233d2..1dc3d74 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t04.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t04.dart
@@ -15,8 +15,6 @@
/// aliases [A<X extends List<List>>], [B<X extends Map<Map, Map>>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t05.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t05.dart
index 583f9e3..dd3d17d 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t05.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t05.dart
@@ -16,8 +16,6 @@
/// @Issue 42449
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t06.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t06.dart
index c1ffa98..a5ff5d7 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t06.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l1_t06.dart
@@ -15,8 +15,6 @@
/// non-function type alias [A<X extends num>]
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t01.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t01.dart
index 58ad05d..8f3ceb9 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t01.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t01.dart
@@ -15,8 +15,6 @@
/// non-nullable non-function type alias with two depending type parameters.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t02.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t02.dart
index a873015..d6df983 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t02.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t02.dart
@@ -15,8 +15,6 @@
/// non-nullable non-function type alias with two depending type parameters.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t03.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t03.dart
index 56a7a79..37f9dfa 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t03.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_l2_t03.dart
@@ -15,8 +15,6 @@
/// non-nullable non-function type alias with two depending type parameters.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X, Y> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t01.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t01.dart
index a06aa46..1a48d30 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t01.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t01.dart
@@ -15,8 +15,6 @@
/// non-function type alias with function parameter (covariant)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t02.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t02.dart
index efdb033..1ace60e 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t02.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t02.dart
@@ -15,8 +15,6 @@
/// non-function alias with function parameter (contravariant)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t03.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t03.dart
index 5720a2b..36c757b 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t03.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t03.dart
@@ -15,8 +15,6 @@
/// non-function type alias with function parameter (invariant)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t04.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t04.dart
index 670f39d..2f9ab88 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t04.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t04.dart
@@ -16,8 +16,6 @@
/// Issue 41437
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = void Function();
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t05.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t05.dart
index b8a0893..8383176 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t05.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t05.dart
@@ -15,8 +15,6 @@
/// non-function type alias with function parameter (covariant)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef G<X> = X Function();
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t06.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t06.dart
index c235d67..66907ef 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t06.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t06.dart
@@ -16,8 +16,6 @@
/// @Issue 42449
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t07.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t07.dart
index 6271eba..ba84b76 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t07.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t07.dart
@@ -15,8 +15,6 @@
/// non-function type alias with function parameter (invariant)
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t08.dart b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t08.dart
index 0e13ad9..dbee8c7 100644
--- a/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t08.dart
+++ b/LanguageFeatures/Simple-bounds/static/type-aliases/typedef1_typedef_l1_t08.dart
@@ -16,8 +16,6 @@
/// Issue 41437
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
class C<X> {}
diff --git a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t02.dart b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t02.dart
index 7a94017..384fe4c 100644
--- a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t02.dart
+++ b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t02.dart
@@ -9,8 +9,6 @@
/// type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class T1 {}
typedef Neverland = Never;
diff --git a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t04.dart b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t04.dart
index de66e1d..bd11243 100644
--- a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t04.dart
+++ b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t04.dart
@@ -8,7 +8,6 @@
/// @description Check that if type T0 is Never then T0 is a subtype of T1
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
import "../../../../Utils/expect.dart";
class T1 {}
diff --git a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t06.dart b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t06.dart
index d7f7fb6..2c4fc1a 100644
--- a/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t06.dart
+++ b/LanguageFeatures/Subtyping/static/tests/left_bottom_A01_t06.dart
@@ -9,8 +9,6 @@
/// type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class C<X extends C<X>> {}
typedef Neverland = Never;
diff --git a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t01.dart b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t01.dart
index 875e140..bf59aa3 100644
--- a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t01.dart
+++ b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t01.dart
@@ -12,7 +12,6 @@
///
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t02.dart b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t02.dart
index 3e9979a..2f37d77 100644
--- a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t02.dart
+++ b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t02.dart
@@ -13,7 +13,6 @@
///
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t03.dart b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t03.dart
index b5a07ab..d724d76 100644
--- a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t03.dart
+++ b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t03.dart
@@ -13,7 +13,6 @@
///
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t01.dart b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t01.dart
index 2f136da..7f1b3f9 100644
--- a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t01.dart
+++ b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t01.dart
@@ -14,8 +14,6 @@
/// @Issue 42580
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
abstract class A<X> {
diff --git a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t02.dart b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t02.dart
index 97d9981..a360b14 100644
--- a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t02.dart
+++ b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t02.dart
@@ -13,8 +13,6 @@
///
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
typedef C<X> = Map<int, List<X>>;
diff --git a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t03.dart b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t03.dart
index ae9706d..250f6c2 100644
--- a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t03.dart
+++ b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t03.dart
@@ -14,8 +14,6 @@
/// @Issue 44070
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
import "dart:async";
diff --git a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t05.dart b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t05.dart
index 0b593e0..082ddc1 100644
--- a/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t05.dart
+++ b/LanguageFeatures/nnbd/Least-greatest-closure/nonfunction_typedef/nonfunction_static_t05.dart
@@ -36,8 +36,6 @@
/// @Issue 44073, 44092
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "../../../../Utils/expect.dart";
abstract class A<X extends A<X>> {}
diff --git a/LanguageFeatures/nnbd/type-aliases/assignability_A01_t01.dart b/LanguageFeatures/nnbd/type-aliases/assignability_A01_t01.dart
index 4143cd7..2c6ab73 100644
--- a/LanguageFeatures/nnbd/type-aliases/assignability_A01_t01.dart
+++ b/LanguageFeatures/nnbd/type-aliases/assignability_A01_t01.dart
@@ -10,7 +10,6 @@
///
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
class A {}
diff --git a/LanguageFeatures/nnbd/type-aliases/assignability_A01_t02.dart b/LanguageFeatures/nnbd/type-aliases/assignability_A01_t02.dart
index 1ca1cbb..06f0059 100644
--- a/LanguageFeatures/nnbd/type-aliases/assignability_A01_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/assignability_A01_t02.dart
@@ -10,8 +10,6 @@
///
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
class B extends A {}
class C extends A {}
diff --git a/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t05.dart b/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t05.dart
index 3482472..d07e345 100644
--- a/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t05.dart
+++ b/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t05.dart
@@ -13,7 +13,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 41349
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t06.dart b/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t06.dart
index 9e02198..191e728 100644
--- a/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t06.dart
+++ b/LanguageFeatures/nnbd/type-aliases/extension_method_resolution_A01_t06.dart
@@ -12,7 +12,6 @@
/// nullable type. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A01_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A01_t02.dart
index a19dc40..684e9b8 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A01_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A01_t02.dart
@@ -9,7 +9,6 @@
/// SHORT[EXP(e), fn[x] => x.f]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A02_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A02_t02.dart
index d5c4f4e..692839b 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A02_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A02_t02.dart
@@ -9,7 +9,6 @@
/// PASSTHRU[F, fn[x] => x.f]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A03_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A03_t02.dart
index f58c6d8..21ab34a 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A03_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A03_t02.dart
@@ -9,7 +9,6 @@
/// SHORT[EXP(e), fn[x] => x.m(ARGS(args))]
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A04_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A04_t02.dart
index d06fe6a..05a6c37 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A04_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A04_t02.dart
@@ -9,7 +9,6 @@
/// PASSTHRU[F, fn[x] => x.m(ARGS(args))]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A06_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A06_t02.dart
index 94c2836..c19a6af 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A06_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A06_t02.dart
@@ -9,7 +9,6 @@
/// SHORT[EXP(e1), fn[x] => x[EXP(e2)]]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A07_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A07_t02.dart
index 39afb72..a0b48f2 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A07_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A07_t02.dart
@@ -9,7 +9,6 @@
/// PASSTHRU[F, fn[x] => x[EXP(e2)]]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A08_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A08_t02.dart
index dd0d25a..b6e6648 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A08_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A08_t02.dart
@@ -9,7 +9,6 @@
/// SHORT[EXP(e1), fn[x] => x.f = EXP(e2)]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A10_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A10_t02.dart
index 961572c..2632c4b 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A10_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A10_t02.dart
@@ -9,7 +9,6 @@
/// PASSTHRU[F, fn[x] => x.f = EXP(e2)]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A12_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A12_t02.dart
index 718bce3..ef2d07e 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A12_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A12_t02.dart
@@ -9,7 +9,6 @@
/// to: SHORT[EXP(e1), fn[x] => x[EXP(e2)] = EXP(e3)]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A14_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A14_t02.dart
index 8c0e00d..b885e76 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A14_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A14_t02.dart
@@ -9,7 +9,6 @@
/// PASSTHRU[F, fn[x] => x[EXP(e2)] = EXP(e3)]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A16_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A16_t02.dart
index bfdc530..f3e57e9 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A16_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A16_t02.dart
@@ -20,7 +20,6 @@
/// Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t02.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t02.dart
index de7da81..b8b6ca1 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t02.dart
@@ -15,7 +15,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 39141
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t05.dart b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t05.dart
index b86171c..ddf0e11 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t05.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_aware_operator_A17_t05.dart
@@ -15,8 +15,6 @@
/// type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class C {
String test1 = "Let it be";
String test2 = "Show must go on";
diff --git a/LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t03.dart b/LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t03.dart
index 90cf583..0a7144c 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t03.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t03.dart
@@ -10,8 +10,6 @@
/// Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
foo() {}
}
diff --git a/LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t08.dart b/LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t08.dart
index ab8a912..f64e67c 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t08.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_promotion_A01_t08.dart
@@ -10,7 +10,6 @@
/// condition. Test type aliases.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
class A {
diff --git a/LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t03.dart b/LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t03.dart
index 0098f13..5f57849 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t03.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t03.dart
@@ -10,8 +10,6 @@
/// continuation. Test [e != null] expression. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
foo() {}
}
diff --git a/LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t04.dart b/LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t04.dart
index d23295a..2fc4fea 100644
--- a/LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t04.dart
+++ b/LanguageFeatures/nnbd/type-aliases/null_promotion_A02_t04.dart
@@ -11,7 +11,6 @@
/// @author iarkh@unipro.ru
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
class A {
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t03.dart b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t03.dart
index 9c5231a..6bd7c8e 100644
--- a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t03.dart
+++ b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t03.dart
@@ -15,7 +15,6 @@
/// some S. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
class C {}
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t07.dart b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t07.dart
index 71029d7..ab266de 100644
--- a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t07.dart
+++ b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A01_t07.dart
@@ -15,7 +15,6 @@
/// FutureOr<S> for some S where S is nullable
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "dart:async";
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t04.dart b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t04.dart
index aec787b..b0ff638 100644
--- a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t04.dart
+++ b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t04.dart
@@ -16,8 +16,6 @@
/// assigned to non-nullable type. Test interface type. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
abstract class A {
void foo(int i);
}
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t10.dart b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t10.dart
index b0bd876..e9e59fd 100644
--- a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t10.dart
+++ b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t10.dart
@@ -17,8 +17,6 @@
/// type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
import "dart:async";
class C {
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t14.dart b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t14.dart
index 3dffdfc..d90fac0 100644
--- a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t14.dart
+++ b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t14.dart
@@ -17,8 +17,6 @@
/// type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class S {}
typedef SAlias = S;
diff --git a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t17.dart b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t17.dart
index 331684b..f136a44 100644
--- a/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t17.dart
+++ b/LanguageFeatures/nnbd/type-aliases/nullability_definitions_A02_t17.dart
@@ -16,8 +16,6 @@
/// assigned to non-nullable type. Test X & S where S is non-nullable
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
class S extends A {}
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A01_t04.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A01_t04.dart
index b464769..c35b07b 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A01_t04.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A01_t04.dart
@@ -11,8 +11,6 @@
/// type alias for class A?
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
String m = "";
void foo() {}
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A01_t05.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A01_t05.dart
index 2c7a66b..ddffecd 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A01_t05.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A01_t05.dart
@@ -12,7 +12,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A02_t04.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A02_t04.dart
index 9368960..127f80d 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A02_t04.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A02_t04.dart
@@ -11,8 +11,6 @@
/// dynamic. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
final String s = "Lily was here";
void foo() {}
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A02_t05.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A02_t05.dart
index 2a83698..fc027cf 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A02_t05.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A02_t05.dart
@@ -11,7 +11,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A03_t03.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A03_t03.dart
index d20d3ef..467aee1 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A03_t03.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A03_t03.dart
@@ -9,8 +9,6 @@
/// whose type is potentially nullable and not dynamic. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
extension on int {
int call(int v) => this + v;
}
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A14_t11.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A14_t11.dart
index 42d7e0b..21805c9 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A14_t11.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A14_t11.dart
@@ -12,7 +12,6 @@
/// type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
class A {
void test() {}
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A15_t02.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A15_t02.dart
index 01ac85b..15b2542 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A15_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A15_t02.dart
@@ -10,8 +10,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 40949
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
class B {}
class C {}
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A16_t02.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A16_t02.dart
index 06966c1..6319990 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A16_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A16_t02.dart
@@ -9,8 +9,6 @@
/// or mixin the type Never. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
class B {}
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t02.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t02.dart
index 1500145..c7cbac3 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t02.dart
@@ -12,7 +12,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 39866
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
typedef Neverland = Never;
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t04.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t04.dart
index 648c66f..78c461a 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t04.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A17_t04.dart
@@ -13,7 +13,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 39866
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
typedef Neverland = Never;
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A18_t02.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A18_t02.dart
index 02eb98a..a089f40 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A18_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A18_t02.dart
@@ -10,7 +10,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 39866
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
typedef Neverland = Never;
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A19_t02.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A19_t02.dart
index b787bf5..8237a7b 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A19_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A19_t02.dart
@@ -9,8 +9,6 @@
/// expression throw e is not assignable to Object. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {
}
diff --git a/LanguageFeatures/nnbd/type-aliases/static_errors_A32_t03.dart b/LanguageFeatures/nnbd/type-aliases/static_errors_A32_t03.dart
index e3832ff..c73db54 100644
--- a/LanguageFeatures/nnbd/type-aliases/static_errors_A32_t03.dart
+++ b/LanguageFeatures/nnbd/type-aliases/static_errors_A32_t03.dart
@@ -10,7 +10,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 39598
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
class A {
test() {}
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A01_t04.dart b/LanguageFeatures/nnbd/type-aliases/syntax_A01_t04.dart
index e3d8b0a..0d91117 100644
--- a/LanguageFeatures/nnbd/type-aliases/syntax_A01_t04.dart
+++ b/LanguageFeatures/nnbd/type-aliases/syntax_A01_t04.dart
@@ -9,7 +9,6 @@
/// nullable version of that type. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
class A {}
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A02_t02.dart b/LanguageFeatures/nnbd/type-aliases/syntax_A02_t02.dart
index edb395b..e821d50 100644
--- a/LanguageFeatures/nnbd/type-aliases/syntax_A02_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/syntax_A02_t02.dart
@@ -8,7 +8,6 @@
/// @description Check new primitive type Never. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
typedef Neverland = Never;
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A02_t04.dart b/LanguageFeatures/nnbd/type-aliases/syntax_A02_t04.dart
index bb3fe00..8d72ba0 100644
--- a/LanguageFeatures/nnbd/type-aliases/syntax_A02_t04.dart
+++ b/LanguageFeatures/nnbd/type-aliases/syntax_A02_t04.dart
@@ -8,7 +8,6 @@
/// @description Check new primitive type Never
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A03_t02.dart b/LanguageFeatures/nnbd/type-aliases/syntax_A03_t02.dart
index 95b8ddf..8aaea59 100644
--- a/LanguageFeatures/nnbd/type-aliases/syntax_A03_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/syntax_A03_t02.dart
@@ -9,7 +9,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
class C {}
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A06_t02.dart b/LanguageFeatures/nnbd/type-aliases/syntax_A06_t02.dart
index a1e2b9e..b96bcfa 100644
--- a/LanguageFeatures/nnbd/type-aliases/syntax_A06_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/syntax_A06_t02.dart
@@ -11,7 +11,6 @@
/// e1 evaluates to null and otherwise evaluates as e1[e2]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
import "../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A07_t02.dart b/LanguageFeatures/nnbd/type-aliases/syntax_A07_t02.dart
index d8c3d8e..6cb688f 100644
--- a/LanguageFeatures/nnbd/type-aliases/syntax_A07_t02.dart
+++ b/LanguageFeatures/nnbd/type-aliases/syntax_A07_t02.dart
@@ -13,8 +13,6 @@
/// successive ? operators on a type. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class A {}
typedef AAlias = A;
diff --git a/LanguageFeatures/nnbd/type-aliases/syntax_A07_t06.dart b/LanguageFeatures/nnbd/type-aliases/syntax_A07_t06.dart
index 469b09a..5b9be6c 100644
--- a/LanguageFeatures/nnbd/type-aliases/syntax_A07_t06.dart
+++ b/LanguageFeatures/nnbd/type-aliases/syntax_A07_t06.dart
@@ -13,7 +13,6 @@
/// declaration. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-strong
class A {}
diff --git a/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t01.dart b/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t01.dart
index 9c4de61..28e63fc 100644
--- a/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t01.dart
+++ b/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t01.dart
@@ -12,7 +12,6 @@
///
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t02.dart b/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t02.dart
index b0d39e8..8716635 100644
--- a/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t02.dart
+++ b/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t02.dart
@@ -13,7 +13,6 @@
///
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t03.dart b/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t03.dart
index e7591cf..1c8c1fd 100644
--- a/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t03.dart
+++ b/LanguageFeatures/nnbd/weak/Least-greatest-closure/nonfunction_typedef/nonfunction_dynamic_t03.dart
@@ -13,7 +13,6 @@
///
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/assignability_A01_t01.dart b/LanguageFeatures/nnbd/weak/type-aliases/assignability_A01_t01.dart
index e332b74..1186393 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/assignability_A01_t01.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/assignability_A01_t01.dart
@@ -10,7 +10,6 @@
///
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
class A {}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t01.dart b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t01.dart
index abd4e8d..9ce27ff 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t01.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t01.dart
@@ -9,7 +9,6 @@
/// legacy library and then back to the opted in code retains its status.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "dart:async";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t02.dart
index aabc015..6a3658b 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t02.dart
@@ -10,7 +10,6 @@
/// assigned to non-null object.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t03.dart b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t03.dart
index e7ca0d4..cd40dfc 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t03.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t03.dart
@@ -10,7 +10,6 @@
/// assigned to [null].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t04.dart b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t04.dart
index 0c0adb0..a7c64c4 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t04.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t04.dart
@@ -10,7 +10,6 @@
/// status.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "dart:async";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t05.dart b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t05.dart
index 7aefcc8..cdaa750 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t05.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t05.dart
@@ -10,7 +10,6 @@
/// can be assigned to non-null object.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t06.dart b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t06.dart
index cf86439..df38f57 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t06.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t06.dart
@@ -10,7 +10,6 @@
/// cannot be assigned to [null].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "exports_A01_opted_out_aliases_lib.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t07.dart b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t07.dart
index efdbbd6..3ecce93 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t07.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t07.dart
@@ -10,7 +10,6 @@
/// retains its status.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t08.dart b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t08.dart
index c66829c..5f54de7 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t08.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t08.dart
@@ -10,7 +10,6 @@
/// assigned to any object.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "exports_A01_opted_out_aliases_lib.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t09.dart b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t09.dart
index b4a90ae..4058c89 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t09.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/exports_A01_typedef2_t09.dart
@@ -10,7 +10,6 @@
/// assigned to [null].
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "exports_A01_opted_out_aliases_lib.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t05.dart b/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t05.dart
index 17d7c40..be53026 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t05.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t05.dart
@@ -13,7 +13,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 41349
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t06.dart b/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t06.dart
index 0c7f7f9..5b4880a 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t06.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/extension_method_resolution_A01_t06.dart
@@ -12,7 +12,6 @@
/// nullable type. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t03.dart b/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t03.dart
index 6cde6c7..ce778c1 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t03.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t03.dart
@@ -12,7 +12,6 @@
/// @Issue 40367, 40368
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t04.dart b/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t04.dart
index e2e5807..98447f4 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t04.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/generics_A01_t04.dart
@@ -10,7 +10,6 @@
/// @Issue 40367, 40368
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A01_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A01_t02.dart
index 8bb1171..49616af 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A01_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A01_t02.dart
@@ -9,7 +9,6 @@
/// SHORT[EXP(e), fn[x] => x.f]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A02_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A02_t02.dart
index 8b01fae..4cd3e0e 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A02_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A02_t02.dart
@@ -9,7 +9,6 @@
/// PASSTHRU[F, fn[x] => x.f]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A03_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A03_t02.dart
index 87df60e..bc60ad8 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A03_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A03_t02.dart
@@ -9,7 +9,6 @@
/// SHORT[EXP(e), fn[x] => x.m(ARGS(args))]
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A04_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A04_t02.dart
index eb23a75..f5c632b 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A04_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A04_t02.dart
@@ -9,7 +9,6 @@
/// PASSTHRU[F, fn[x] => x.m(ARGS(args))]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A06_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A06_t02.dart
index 3e9148d..8de65b3 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A06_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A06_t02.dart
@@ -9,7 +9,6 @@
/// SHORT[EXP(e1), fn[x] => x[EXP(e2)]]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A07_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A07_t02.dart
index ee25e64..a8c4c24 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A07_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A07_t02.dart
@@ -9,7 +9,6 @@
/// PASSTHRU[F, fn[x] => x[EXP(e2)]]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A08_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A08_t02.dart
index 22ef2dc..2a5254b 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A08_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A08_t02.dart
@@ -9,7 +9,6 @@
/// SHORT[EXP(e1), fn[x] => x.f = EXP(e2)]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A10_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A10_t02.dart
index 5b1fd3b..223e19a 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A10_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A10_t02.dart
@@ -9,7 +9,6 @@
/// PASSTHRU[F, fn[x] => x.f = EXP(e2)]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A12_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A12_t02.dart
index f7662a6..70920bb 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A12_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A12_t02.dart
@@ -9,7 +9,6 @@
/// to: SHORT[EXP(e1), fn[x] => x[EXP(e2)] = EXP(e3)]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A14_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A14_t02.dart
index 5788644..48423b4 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A14_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A14_t02.dart
@@ -9,7 +9,6 @@
/// PASSTHRU[F, fn[x] => x[EXP(e2)] = EXP(e3)]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A16_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A16_t02.dart
index b29285b..3ddd4dd 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A16_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A16_t02.dart
@@ -20,7 +20,6 @@
/// Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A17_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A17_t02.dart
index 0fa5682..56ba54a 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A17_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_aware_operator_A17_t02.dart
@@ -15,7 +15,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 39141
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A01_t08.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A01_t08.dart
index c6d76d1..be6b0ba 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A01_t08.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A01_t08.dart
@@ -10,7 +10,6 @@
/// condition. Test type aliases.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
class A {
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A02_t04.dart b/LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A02_t04.dart
index 99cc3b9..179a74f 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A02_t04.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/null_promotion_A02_t04.dart
@@ -11,7 +11,6 @@
/// @author iarkh@unipro.ru
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
class A {
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t03.dart b/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t03.dart
index 3b70274..800d8f1 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t03.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t03.dart
@@ -15,7 +15,6 @@
/// some S. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
class C {}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t07.dart b/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t07.dart
index 9d6f366..50b7416 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t07.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A01_t07.dart
@@ -15,7 +15,6 @@
/// FutureOr<S> for some S where S is nullable
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "dart:async";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A02_t06.dart b/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A02_t06.dart
index c49194b..7384e2b 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A02_t06.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/nullability_definitions_A02_t06.dart
@@ -17,7 +17,6 @@
/// Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../legacy_lib.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A01_t05.dart b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A01_t05.dart
index bd2bfe6..c4e1899 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A01_t05.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A01_t05.dart
@@ -12,7 +12,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A02_t05.dart b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A02_t05.dart
index 12c475e..b01ce9b 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A02_t05.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A02_t05.dart
@@ -11,7 +11,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A14_t11.dart b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A14_t11.dart
index db07f7a..5941849 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A14_t11.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A14_t11.dart
@@ -12,7 +12,6 @@
/// type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
class A {
void test() {}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A15_t04.dart b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A15_t04.dart
index 80cdda2..6036c69 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A15_t04.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A15_t04.dart
@@ -12,7 +12,6 @@
/// @issue 40949
/// @issue 41501
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../legacy_lib.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t02.dart
index 69ab105..396b27e 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t02.dart
@@ -12,7 +12,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 39866
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
typedef Neverland = Never;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t04.dart b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t04.dart
index 7640b6f..4b94584 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t04.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A17_t04.dart
@@ -13,7 +13,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 39866
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
typedef Neverland = Never;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A18_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A18_t02.dart
index db3d487..289f639 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A18_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A18_t02.dart
@@ -10,7 +10,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 39866
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
typedef Neverland = Never;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A19_t03.dart b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A19_t03.dart
index 8a7fdb9..3a20c84 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A19_t03.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A19_t03.dart
@@ -9,7 +9,6 @@
/// expression throw e is not assignable to Object. Test legacy types
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../legacy_lib.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A32_t03.dart b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A32_t03.dart
index b3a77d4..f4113b7 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A32_t03.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/static_errors_A32_t03.dart
@@ -10,7 +10,6 @@
/// @author sgrekhov@unipro.ru
/// @issue 39598
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
class A {
test() {}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A01_t04.dart b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A01_t04.dart
index 281ce3e..d510b77 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A01_t04.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A01_t04.dart
@@ -9,7 +9,6 @@
/// nullable version of that type. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
class A {}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t02.dart
index 69d1088..152370e 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t02.dart
@@ -8,7 +8,6 @@
/// @description Check new primitive type Never. Test type alias
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
typedef Neverland = Never;
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t04.dart b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t04.dart
index df9691d..c10e7ad 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t04.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A02_t04.dart
@@ -8,7 +8,6 @@
/// @description Check new primitive type Never
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A03_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A03_t02.dart
index 9048b32..860ed10 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A03_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A03_t02.dart
@@ -9,7 +9,6 @@
/// aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
class C {}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A06_t02.dart b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A06_t02.dart
index ec68d89..ef8eb4f 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A06_t02.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A06_t02.dart
@@ -11,7 +11,6 @@
/// e1 evaluates to null and otherwise evaluates as e1[e2]. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A07_t06.dart b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A07_t06.dart
index 318e069..2522bed 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/syntax_A07_t06.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/syntax_A07_t06.dart
@@ -13,7 +13,6 @@
/// declaration. Test type aliases
/// @author sgrekhov@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
class A {}
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t05.dart b/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t05.dart
index b2a0ff7..2410211 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t05.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t05.dart
@@ -7,7 +7,6 @@
/// opted to legacy library is a legacy type.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
import "type_reification_legacy_aliases_lib.dart";
diff --git a/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t06.dart b/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t06.dart
index 227e558..349e633 100644
--- a/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t06.dart
+++ b/LanguageFeatures/nnbd/weak/type-aliases/type_reification_A01_t06.dart
@@ -7,7 +7,6 @@
/// opted to legacy library can be casted correctly in opted-in code.
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
// Requirements=nnbd-weak
import "../../../../Utils/expect.dart";
import "type_reification_legacy_aliases_lib.dart";
diff --git a/LanguageFeatures/regression/32903_t02.dart b/LanguageFeatures/regression/32903_t02.dart
index bb48f00..ec1cb3c 100644
--- a/LanguageFeatures/regression/32903_t02.dart
+++ b/LanguageFeatures/regression/32903_t02.dart
@@ -9,9 +9,7 @@
/// @Issue 32903
/// @author iarkh@unipro.ru
- // SharedOptions=--enable-experiment=nonfunction-type-aliases
-
-class C<X extends C<X>> {}
+ class C<X extends C<X>> {}
class D extends C<D> {}
typedef A<X> = C<X>;
diff --git a/LanguageFeatures/regression/34560_t02.dart b/LanguageFeatures/regression/34560_t02.dart
index d566b19..ee8d315 100644
--- a/LanguageFeatures/regression/34560_t02.dart
+++ b/LanguageFeatures/regression/34560_t02.dart
@@ -7,8 +7,6 @@
/// @Issue 34560, 45065
/// @author iarkh@unipro.ru
-// SharedOptions=--enable-experiment=nonfunction-type-aliases
-
class C<X> {}
typedef A<X extends num> = C<X>;
