Elements. Deprecate InstanceFragment.xyz2, use 'xyz' instead.

Change-Id: I18331cc6a2cd0c9f01de79d8d5ea0178cd39dc16
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/428881
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: scheglov

pkg/analyzer/CHANGELOG.md

@@ -27,6 +27,8 @@
 * Deprecate `InstanceElement.getGetter2`, use `getGetter` instead.
 * Deprecate `InstanceElement.getSetter2`, use `getSetter` instead.
 * Deprecate `InstanceElement.getMethod2`, use `getMethod` instead.
+* Deprecate `InstanceFragment.fields2`, use `fields` instead.
+* Deprecate `InstanceFragment.methods2`, use `methods` instead.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.

pkg/analyzer/api.txt

@@ -3392,11 +3392,13 @@ package:analyzer/dart/element/element.dart:
     new (constructor: InstanceFragment Function())
     element (getter: InstanceElement)
     enclosingFragment (getter: LibraryFragment?)
-    fields2 (getter: List<FieldFragment>)
+    fields (getter: List<FieldFragment>)
+    fields2 (getter: List<FieldFragment>, deprecated)
     getters (getter: List<GetterFragment>)
     isAugmentation (getter: bool)
     libraryFragment (getter: LibraryFragment)
-    methods2 (getter: List<MethodFragment>)
+    methods (getter: List<MethodFragment>)
+    methods2 (getter: List<MethodFragment>, deprecated)
     nextFragment (getter: InstanceFragment?)
     previousFragment (getter: InstanceFragment?)
     setters (getter: List<SetterFragment>)

pkg/analyzer/lib/dart/element/element.dart

@@ -1939,6 +1939,10 @@ abstract class InstanceFragment
   LibraryFragment? get enclosingFragment;
 
   /// The fields declared in this fragment.
+  List<FieldFragment> get fields;
+
+  /// The fields declared in this fragment.
+  @Deprecated('Use fields instead')
   List<FieldFragment> get fields2;
 
   /// The getters declared in this fragment.
@@ -1953,6 +1957,10 @@ abstract class InstanceFragment
   LibraryFragment get libraryFragment;
 
   /// The methods declared in this fragment.
+  List<MethodFragment> get methods;
+
+  /// The methods declared in this fragment.
+  @Deprecated('Use methods instead')
   List<MethodFragment> get methods2;
 
   @override

pkg/analyzer/lib/src/dart/element/element.dart

@@ -4883,7 +4883,7 @@ abstract class InstanceFragmentImpl extends _ExistingElementImpl
   @override
   LibraryFragment? get enclosingFragment => enclosingElement3;
 
-  /// The declared fields.
+  @override
   List<FieldFragmentImpl> get fields {
     if (!identical(_fields, _Sentinel.fieldElement)) {
       return _fields;
@@ -4900,20 +4900,21 @@ abstract class InstanceFragmentImpl extends _ExistingElementImpl
     _fields = fields;
   }
 
+  @Deprecated('Use fields instead')
   @override
   List<FieldFragment> get fields2 => fields.cast<FieldFragment>();
 
   @override
-  List<GetterFragment> get getters =>
-      accessors.where((e) => e.isGetter).cast<GetterFragment>().toList();
+  List<GetterFragmentImpl> get getters =>
+      accessors.whereType<GetterFragmentImpl>().toList();
 
   @override
   List<ElementAnnotationImpl> get metadata {
     linkedData?.read(this);
     return super.metadata;
   }
 
-  /// The declared methods.
+  @override
   List<MethodFragmentImpl> get methods {
     if (!identical(_methods, _Sentinel.methodElement)) {
       return _methods;
@@ -4930,15 +4931,16 @@ abstract class InstanceFragmentImpl extends _ExistingElementImpl
     _methods = methods;
   }
 
+  @Deprecated('Use methods instead')
   @override
   List<MethodFragment> get methods2 => methods.cast<MethodFragment>();
 
   @override
   int get offset => _nameOffset;
 
   @override
-  List<SetterFragment> get setters =>
-      accessors.where((e) => e.isSetter).cast<SetterFragment>().toList();
+  List<SetterFragmentImpl> get setters =>
+      accessors.whereType<SetterFragmentImpl>().toList();
 
   void setLinkedData(Reference reference, ElementLinkedData linkedData) {
     this.reference = reference;

pkg/analyzer/test/src/summary/element_text.dart

@@ -1011,7 +1011,7 @@ class _Element2Writer extends _AbstractElementWriter {
         case LibraryFragment():
           expect(enclosing.topLevelVariables2, contains(variable));
         case InterfaceFragment():
-          expect(enclosing.fields2, contains(variable));
+          expect(enclosing.fields, contains(variable));
       }
     }
 
@@ -1248,7 +1248,7 @@ class _Element2Writer extends _AbstractElementWriter {
         f.typeParameters2,
         _writeTypeParameterFragment,
       );
-      _writeFragmentList('fields', f, f.fields2, _writeFieldFragment);
+      _writeFragmentList('fields', f, f.fields, _writeFieldFragment);
       if (f is InterfaceFragment) {
         var constructors = f.constructors2;
         if (f is MixinElement) {
@@ -1264,7 +1264,7 @@ class _Element2Writer extends _AbstractElementWriter {
       }
       _writeFragmentList('getters', f, f.getters, _writeGetterFragment);
       _writeFragmentList('setters', f, f.setters, _writeSetterFragment);
-      _writeFragmentList('methods', f, f.methods2, _writeMethodFragment);
+      _writeFragmentList('methods', f, f.methods, _writeMethodFragment);
     });
   }
 
@@ -1616,7 +1616,7 @@ class _Element2Writer extends _AbstractElementWriter {
         case LibraryFragment():
           expect(enclosing.topLevelVariables2, contains(variable));
         case InterfaceFragment():
-          expect(enclosing.fields2, contains(variable));
+          expect(enclosing.fields, contains(variable));
       }
     }