Elements. Migrate class/enum/etc tests by moving forPromotableFields.
Change-Id: I90d8c48ea3b53adcd214f5d6ee0ee243a4d91acc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/402886
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/analyzer_use_new_elements.txt b/pkg/analyzer/analyzer_use_new_elements.txt
index 4a1ab72..ccf5f25 100644
--- a/pkg/analyzer/analyzer_use_new_elements.txt
+++ b/pkg/analyzer/analyzer_use_new_elements.txt
@@ -71,7 +71,6 @@
lib/src/dart/resolver/invocation_inference_helper.dart
lib/src/dart/resolver/invocation_inferrer.dart
lib/src/dart/resolver/lexical_lookup.dart
-lib/src/dart/resolver/list_pattern_resolver.dart
lib/src/dart/resolver/method_invocation_resolver.dart
lib/src/dart/resolver/named_type_resolver.dart
lib/src/dart/resolver/postfix_expression_resolver.dart
@@ -181,15 +180,11 @@
test/src/dart/element/upper_lower_bound_test.dart
test/src/dart/micro/simple_file_resolver_test.dart
test/src/dart/resolution/constant_test.dart
-test/src/dart/resolution/generic_type_alias_test.dart
test/src/dart/resolution/prefix_element_test.dart
test/src/dart/resolution/resolution.dart
test/src/dart/resolution/scope_test.dart
test/src/dart/resolution/super_formal_parameter_test.dart
test/src/summary/element_text.dart
-test/src/summary/elements/class_test.dart
-test/src/summary/elements/enum_test.dart
-test/src/summary/elements/extension_type_test.dart
test/src/summary/elements/metadata_test.dart
test/src/summary/elements/top_level_variable_test.dart
test/src/summary/elements/type_inference_test.dart
@@ -198,7 +193,6 @@
test/src/summary/resolved_ast_printer.dart
test/src/task/strong/dart2_inference_test.dart
test/src/task/strong/inferred_type_test.dart
-test/src/utilities/extensions/analysis_session_test.dart
test/src/utilities/extensions/library_element_test.dart
test/util/element_printer.dart
test/util/id_testing_helper.dart
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index 6cbfbf2..df08784 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -6372,6 +6372,7 @@
@override
List<ConstructorElement2> get constructors2 {
+ firstFragment.constructors; // TODO(scheglov): remove eventually
return constructors
.map((constructor) =>
(constructor.declaration as ConstructorElementImpl).element)
diff --git a/pkg/analyzer/test/src/summary/element_text.dart b/pkg/analyzer/test/src/summary/element_text.dart
index 83cfe54..932b9aa 100644
--- a/pkg/analyzer/test/src/summary/element_text.dart
+++ b/pkg/analyzer/test/src/summary/element_text.dart
@@ -78,6 +78,35 @@
this.filter = _filterTrue,
});
+ void forPromotableFields({
+ Set<String> classNames = const {},
+ Set<String> enumNames = const {},
+ Set<String> extensionTypeNames = const {},
+ Set<String> mixinNames = const {},
+ Set<String> fieldNames = const {},
+ }) {
+ filter = (e) {
+ if (e is ClassElement) {
+ return classNames.contains(e.name);
+ } else if (e is ConstructorElement) {
+ return false;
+ } else if (e is EnumElement) {
+ return enumNames.contains(e.name);
+ } else if (e is ExtensionTypeElement) {
+ return extensionTypeNames.contains(e.name);
+ } else if (e is FieldElement) {
+ return fieldNames.isEmpty || fieldNames.contains(e.name);
+ } else if (e is MixinElement) {
+ return mixinNames.contains(e.name);
+ } else if (e is PartElement) {
+ return false;
+ } else if (e is PropertyAccessorElement) {
+ return false;
+ }
+ return true;
+ };
+ }
+
static bool _filterTrue(Object element) => true;
}
diff --git a/pkg/analyzer/test/src/summary/elements/class_test.dart b/pkg/analyzer/test/src/summary/elements/class_test.dart
index a4a9b05..35e7627 100644
--- a/pkg/analyzer/test/src/summary/elements/class_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/class_test.dart
@@ -2,12 +2,10 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-import 'package:analyzer/dart/element/element.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../../dart/resolution/node_text_expectations.dart';
-import '../element_text.dart';
import '../elements_base.dart';
main() {
@@ -27181,8 +27179,8 @@
class X = A with M;
''');
- var X = library.getClass('X')!;
- expect(X.constructors, hasLength(1));
+ var X = library.getClass2('X')!;
+ expect(X.constructors2, hasLength(1));
}
test_classAlias_constructors_default() async {
@@ -43717,35 +43715,3 @@
@override
bool get keepLinkingLibraries => true;
}
-
-// TODO(scheglov): This is duplicate.
-extension on ElementTextConfiguration {
- void forPromotableFields({
- Set<String> classNames = const {},
- Set<String> enumNames = const {},
- Set<String> extensionTypeNames = const {},
- Set<String> mixinNames = const {},
- Set<String> fieldNames = const {},
- }) {
- filter = (e) {
- if (e is ClassElement) {
- return classNames.contains(e.name);
- } else if (e is ConstructorElement) {
- return false;
- } else if (e is EnumElement) {
- return enumNames.contains(e.name);
- } else if (e is ExtensionTypeElement) {
- return extensionTypeNames.contains(e.name);
- } else if (e is FieldElement) {
- return fieldNames.isEmpty || fieldNames.contains(e.name);
- } else if (e is MixinElement) {
- return mixinNames.contains(e.name);
- } else if (e is PartElement) {
- return false;
- } else if (e is PropertyAccessorElement) {
- return false;
- }
- return true;
- };
- }
-}
diff --git a/pkg/analyzer/test/src/summary/elements/enum_test.dart b/pkg/analyzer/test/src/summary/elements/enum_test.dart
index 0ac1d45..856de4b 100644
--- a/pkg/analyzer/test/src/summary/elements/enum_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/enum_test.dart
@@ -2,11 +2,9 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-import 'package:analyzer/dart/element/element.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../../dart/resolution/node_text_expectations.dart';
-import '../element_text.dart';
import '../elements_base.dart';
main() {
@@ -21829,35 +21827,3 @@
@override
bool get keepLinkingLibraries => true;
}
-
-// TODO(scheglov): This is duplicate.
-extension on ElementTextConfiguration {
- void forPromotableFields({
- Set<String> classNames = const {},
- Set<String> enumNames = const {},
- Set<String> extensionTypeNames = const {},
- Set<String> mixinNames = const {},
- Set<String> fieldNames = const {},
- }) {
- filter = (e) {
- if (e is ClassElement) {
- return classNames.contains(e.name);
- } else if (e is ConstructorElement) {
- return false;
- } else if (e is EnumElement) {
- return enumNames.contains(e.name);
- } else if (e is ExtensionTypeElement) {
- return extensionTypeNames.contains(e.name);
- } else if (e is FieldElement) {
- return fieldNames.isEmpty || fieldNames.contains(e.name);
- } else if (e is MixinElement) {
- return mixinNames.contains(e.name);
- } else if (e is PartElement) {
- return false;
- } else if (e is PropertyAccessorElement) {
- return false;
- }
- return true;
- };
- }
-}
diff --git a/pkg/analyzer/test/src/summary/elements/extension_type_test.dart b/pkg/analyzer/test/src/summary/elements/extension_type_test.dart
index 8ab4506..997d65f 100644
--- a/pkg/analyzer/test/src/summary/elements/extension_type_test.dart
+++ b/pkg/analyzer/test/src/summary/elements/extension_type_test.dart
@@ -2,11 +2,9 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-import 'package:analyzer/dart/element/element.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import '../../dart/resolution/node_text_expectations.dart';
-import '../element_text.dart';
import '../elements_base.dart';
main() {
@@ -10502,35 +10500,3 @@
@override
bool get keepLinkingLibraries => true;
}
-
-// TODO(scheglov): This is duplicate.
-extension on ElementTextConfiguration {
- void forPromotableFields({
- Set<String> classNames = const {},
- Set<String> enumNames = const {},
- Set<String> extensionTypeNames = const {},
- Set<String> mixinNames = const {},
- Set<String> fieldNames = const {},
- }) {
- filter = (e) {
- if (e is ClassElement) {
- return classNames.contains(e.name);
- } else if (e is ConstructorElement) {
- return false;
- } else if (e is EnumElement) {
- return enumNames.contains(e.name);
- } else if (e is ExtensionTypeElement) {
- return extensionTypeNames.contains(e.name);
- } else if (e is FieldElement) {
- return fieldNames.isEmpty || fieldNames.contains(e.name);
- } else if (e is MixinElement) {
- return mixinNames.contains(e.name);
- } else if (e is PartElement) {
- return false;
- } else if (e is PropertyAccessorElement) {
- return false;
- }
- return true;
- };
- }
-}
