Elements. Remove V1 InstanceElement.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -3186,14 +3186,6 @@ package:analyzer/dart/element/element.dart:
   ImportElementPrefix (class extends Object, deprecated):
     new (constructor: ImportElementPrefix Function())
     element (getter: PrefixElement)
-  InstanceElement (class extends Object implements TypeDefiningElement, TypeParameterizedElement, deprecated):
-    new (constructor: InstanceElement Function())
-    accessors (getter: List<PropertyAccessorElement>)
-    enclosingElement3 (getter: CompilationUnitElement, deprecated)
-    fields (getter: List<FieldElement>)
-    isAugmentation (getter: bool)
-    methods (getter: List<MethodElement>)
-    thisType (getter: DartType)
   JoinPatternVariableElement (class extends Object implements PatternVariableElement, deprecated):
     new (constructor: JoinPatternVariableElement Function())
     isConsistent (getter: bool)

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

@@ -955,36 +955,6 @@ abstract class ImportElementPrefix {
   PrefixElement get element;
 }
 
-/// An element that has `this`.
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated('Use InstanceElement2 instead')
-abstract class InstanceElement
-    implements TypeDefiningElement, TypeParameterizedElement {
-  /// The declared accessors (getters and setters).
-  List<PropertyAccessorElement> get accessors;
-
-  @Deprecated(elementModelDeprecationMsg)
-  @override
-  CompilationUnitElement get enclosingElement3;
-
-  /// The declared fields.
-  List<FieldElement> get fields;
-
-  /// Whether the element is an augmentation.
-  ///
-  /// If `true`, declaration has the explicit `augment` modifier.
-  bool get isAugmentation;
-
-  /// The declared methods.
-  List<MethodElement> get methods;
-
-  /// The type of `this` expression.
-  ///
-  /// Same as `augmented.thisType`.
-  DartType get thisType;
-}
-
 /// A pattern variable that is a join of other pattern variables, created
 /// for a logical-or patterns, or shared `case` bodies in `switch` statements.
 ///

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

@@ -1419,8 +1419,7 @@ class ConstructorElementImpl extends ExecutableElementImpl
       return result as InterfaceTypeImpl;
     }
 
-    var augmentedDeclaration = enclosingElement3.element.firstFragment;
-    result = augmentedDeclaration.thisType;
+    result = enclosingElement3.element.thisType;
     return _returnType = result as InterfaceTypeImpl;
   }
 
@@ -3815,9 +3814,6 @@ class ExtensionElementImpl extends InstanceElementImpl
   ExtensionElementImpl? get previousFragment =>
       super.previousFragment as ExtensionElementImpl?;
 
-  @override
-  DartType get thisType => extendedType;
-
   @override
   void appendTo(ElementDisplayStringBuilder builder) {
     builder.writeExtensionElement(this);
@@ -5385,13 +5381,8 @@ class ImportElementPrefixImpl
 }
 
 abstract class InstanceElementImpl extends _ExistingElementImpl
-    with
-        AugmentableFragment,
-        TypeParameterizedElementMixin
-    implements
-        // ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
-        InstanceElement,
-        InstanceFragment {
+    with AugmentableFragment, TypeParameterizedElementMixin
+    implements InstanceFragment {
   @override
   ElementLinkedData? linkedData;
 
@@ -5416,7 +5407,7 @@ abstract class InstanceElementImpl extends _ExistingElementImpl
 
   InstanceElementImpl(super.name, super.nameOffset);
 
-  @override
+  /// The declared accessors (getters and setters).
   List<PropertyAccessorElementImpl> get accessors {
     if (!identical(_accessors, _Sentinel.propertyAccessorElement)) {
       return _accessors;
@@ -5444,7 +5435,7 @@ abstract class InstanceElementImpl extends _ExistingElementImpl
   @override
   LibraryFragment? get enclosingFragment => enclosingElement3;
 
-  @override
+  /// The declared fields.
   List<FieldElementImpl> get fields {
     if (!identical(_fields, _Sentinel.fieldElement)) {
       return _fields;
@@ -5474,7 +5465,7 @@ abstract class InstanceElementImpl extends _ExistingElementImpl
     return super.metadata;
   }
 
-  @override
+  /// The declared methods.
   List<MethodElementImpl> get methods {
     if (!identical(_methods, _Sentinel.methodElement)) {
       return _methods;
@@ -5922,11 +5913,6 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
     _supertype = value as InterfaceTypeImpl?;
   }
 
-  @override
-  InterfaceTypeImpl get thisType {
-    return element.thisType;
-  }
-
   InterfaceTypeImpl instantiateImpl({
     required List<TypeImpl> typeArguments,
     required NullabilitySuffix nullabilitySuffix,

pkg/analyzer/lib/src/summary2/types_builder.dart

@@ -406,7 +406,7 @@ class _MixinInference {
   _MixinInference(this.element, this.featureSet,
       {required this.typeSystemOperations})
       : typeSystem = element.library.typeSystem,
-        classType = element.thisType {
+        classType = element.element.thisType {
     interfacesMerger = InterfacesMerger(typeSystem);
     interfacesMerger.addWithSupertypes(element.supertype);
   }

pkg/analyzer/test/src/dart/element/function_type_test.dart

@@ -260,7 +260,8 @@ class FunctionTypeTest extends AbstractTypeSystemTest {
 
   test_hash_nullabilitySuffix() {
     _testHashesSometimesDifferPairwise((i) {
-      var c = class_(name: 'C$i');
+      var cf = class_(name: 'C$i');
+      var c = cf.element;
       return (
         FunctionTypeImpl(
             typeFormals: const [],
@@ -294,7 +295,8 @@ class FunctionTypeTest extends AbstractTypeSystemTest {
     _testHashesSometimesDiffer((i) => FunctionTypeImpl(
             typeFormals: const [],
             parameters: [
-              namedParameter(name: 'x', type: class_(name: 'C$i').thisType)
+              namedParameter(
+                      name: 'x', type: class_(name: 'C$i').element.thisType)
                   .asElement
             ],
             returnType: typeProvider.voidType,
@@ -317,7 +319,8 @@ class FunctionTypeTest extends AbstractTypeSystemTest {
     _testHashesAlwaysEqual((i) => FunctionTypeImpl(
             typeFormals: const [],
             parameters: [
-              positionalParameter(name: 'x', type: class_(name: 'C$i').thisType)
+              positionalParameter(
+                      name: 'x', type: class_(name: 'C$i').element.thisType)
                   .asElement
             ],
             returnType: typeProvider.voidType,
@@ -361,7 +364,7 @@ class FunctionTypeTest extends AbstractTypeSystemTest {
             typeFormals: const [],
             parameters: [
               namedRequiredParameter(
-                      name: 'x', type: class_(name: 'C$i').thisType)
+                      name: 'x', type: class_(name: 'C$i').element.thisType)
                   .asElement
             ],
             returnType: typeProvider.voidType,
@@ -384,7 +387,8 @@ class FunctionTypeTest extends AbstractTypeSystemTest {
     _testHashesAlwaysEqual((i) => FunctionTypeImpl(
             typeFormals: const [],
             parameters: [
-              requiredParameter(name: 'x', type: class_(name: 'C$i').thisType)
+              requiredParameter(
+                      name: 'x', type: class_(name: 'C$i').element.thisType)
                   .asElement
             ],
             returnType: typeProvider.voidType,
@@ -395,7 +399,7 @@ class FunctionTypeTest extends AbstractTypeSystemTest {
     _testHashesSometimesDiffer((i) => FunctionTypeImpl(
         typeFormals: const [],
         parameters: const [],
-        returnType: class_(name: 'C$i').thisType,
+        returnType: class_(name: 'C$i').element.thisType,
         nullabilitySuffix: NullabilitySuffix.none));
   }