Elements. Remove FragmentImpl.kind, implement non-redirect ElementImpl.kind

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

Author: scheglov

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

@@ -145,14 +145,14 @@ class ElementDisplayStringBuilder {
       _write('augment ');
     }
 
-    if (fragment.kind != ElementKind.SETTER) {
+    if (fragment is! SetterFragmentImpl) {
       _writeType(fragment.returnType);
       _write(' ');
     }
 
     _write(name);
 
-    if (fragment.kind != ElementKind.GETTER) {
+    if (fragment is! GetterFragmentImpl) {
       _writeTypeParameters(fragment.typeParameters);
       _writeFormalParameters(
         fragment.parameters,

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

@@ -368,6 +368,9 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
   @trackedIncludedIntoId
   bool get isValidMixin => firstFragment.isValidMixin;
 
+  @override
+  ElementKind get kind => ElementKind.CLASS;
+
   @override
   @trackedDirectlyDisable
   T? accept<T>(ElementVisitor2<T> visitor) {
@@ -667,9 +670,6 @@ class ClassFragmentImpl extends ClassOrMixinFragmentImpl
     return true;
   }
 
-  @override
-  ElementKind get kind => ElementKind.CLASS;
-
   @override
   ClassFragmentImpl? get nextFragment {
     return super.nextFragment as ClassFragmentImpl?;
@@ -1069,9 +1069,6 @@ class ConstructorFragmentImpl extends ExecutableFragmentImpl
     return !isFactory;
   }
 
-  @override
-  ElementKind get kind => ElementKind.CONSTRUCTOR;
-
   @override
   int get nameLength {
     var nameEnd = this.nameEnd;
@@ -1351,9 +1348,6 @@ class DynamicFragmentImpl extends FragmentImpl implements TypeDefiningFragment {
   @override
   Null get enclosingFragment => null;
 
-  @override
-  ElementKind get kind => ElementKind.DYNAMIC;
-
   @override
   Null get library => null;
 
@@ -2008,6 +2002,9 @@ class EnumElementImpl extends InterfaceElementImpl implements EnumElement {
     ];
   }
 
+  @override
+  ElementKind get kind => ElementKind.ENUM;
+
   @override
   T? accept<T>(ElementVisitor2<T> visitor) => visitor.visitEnumElement(this);
 
@@ -2038,9 +2035,6 @@ class EnumFragmentImpl extends InterfaceFragmentImpl implements EnumFragment {
     return augmentedInternal;
   }
 
-  @override
-  ElementKind get kind => ElementKind.ENUM;
-
   @override
   EnumFragmentImpl? get nextFragment => super.nextFragment as EnumFragmentImpl?;
 
@@ -2415,6 +2409,9 @@ class ExtensionElementImpl extends InstanceElementImpl
     ];
   }
 
+  @override
+  ElementKind get kind => ElementKind.EXTENSION;
+
   @override
   DartType get thisType => extendedType;
 
@@ -2468,9 +2465,6 @@ class ExtensionFragmentImpl extends InstanceFragmentImpl
   @override
   bool get isSimplyBounded => true;
 
-  @override
-  ElementKind get kind => ElementKind.EXTENSION;
-
   @override
   MetadataImpl get metadata {
     _ensureReadResolution();
@@ -2549,6 +2543,9 @@ class ExtensionTypeElementImpl extends InterfaceElementImpl
     firstFragment.hasRepresentationSelfReference = value;
   }
 
+  @override
+  ElementKind get kind => ElementKind.EXTENSION_TYPE;
+
   @override
   ConstructorElement get primaryConstructor {
     return firstFragment.primaryConstructor.element;
@@ -2606,11 +2603,6 @@ class ExtensionTypeFragmentImpl extends InterfaceFragmentImpl
     return augmentedInternal;
   }
 
-  @override
-  ElementKind get kind {
-    return ElementKind.EXTENSION_TYPE;
-  }
-
   @override
   ExtensionTypeFragmentImpl? get nextFragment =>
       super.nextFragment as ExtensionTypeFragmentImpl?;
@@ -2925,9 +2917,6 @@ class FieldFragmentImpl extends PropertyInducingFragmentImpl
         element.setter2 == null;
   }
 
-  @override
-  ElementKind get kind => ElementKind.FIELD;
-
   @override
   MetadataImpl get metadata {
     _ensureReadResolution();
@@ -3331,9 +3320,6 @@ class FormalParameterFragmentImpl extends VariableFragmentImpl
   /// Whether the parameter is a super formal parameter.
   bool get isSuperFormal => false;
 
-  @override
-  ElementKind get kind => ElementKind.PARAMETER;
-
   @override
   LibraryElementImpl? get library {
     var library = libraryFragment?.element;
@@ -3689,10 +3675,6 @@ abstract class FragmentImpl implements Fragment {
     setModifier(Modifier.SYNTHETIC, isSynthetic);
   }
 
-  /// The kind of element that this is.
-  // TODO(scheglov): remove it
-  ElementKind get kind;
-
   LibraryElementImpl? get library;
 
   /// If this target is associated with a library, return the source of the
@@ -3865,9 +3847,6 @@ sealed class FunctionFragmentImpl extends ExecutableFragmentImpl
     // Local functions cannot be augmented.
     throw UnsupportedError('This is not a fragment');
   }
-
-  @override
-  ElementKind get kind => ElementKind.FUNCTION;
 }
 
 abstract class FunctionTypedElementImpl extends TypeParameterizedElementImpl
@@ -3946,7 +3925,7 @@ class GenericFunctionTypeElementImpl extends FunctionTypedElementImpl
   bool get isSynthetic => _wrappedElement.isSynthetic;
 
   @override
-  ElementKind get kind => _wrappedElement.kind;
+  ElementKind get kind => ElementKind.GENERIC_FUNCTION_TYPE;
 
   @override
   LibraryElementImpl get library => _wrappedElement.library;
@@ -4025,9 +4004,6 @@ class GenericFunctionTypeFragmentImpl extends _ExistingFragmentImpl
   @override
   List<FormalParameterFragmentImpl> get formalParameters => parameters;
 
-  @override
-  ElementKind get kind => ElementKind.GENERIC_FUNCTION_TYPE;
-
   @override
   String? get name2 => null;
 
@@ -4199,11 +4175,6 @@ class GetterFragmentImpl extends PropertyAccessorFragmentImpl
 
   GetterFragmentImpl.forVariable(super.variable) : super.forVariable();
 
-  @override
-  ElementKind get kind {
-    return ElementKind.GETTER;
-  }
-
   void addFragment(GetterFragmentImpl fragment) {
     fragment.element = element;
     fragment.previousFragment = this;
@@ -4320,9 +4291,6 @@ abstract class InstanceElementImpl extends ElementImpl
   @override
   bool get isSynthetic => firstFragment.isSynthetic;
 
-  @override
-  ElementKind get kind => firstFragment.kind;
-
   @override
   LibraryElementImpl get library => firstFragment.library;
 
@@ -5482,6 +5450,9 @@ class LabelElementImpl extends ElementImpl
   /// or `default`).
   bool get isOnSwitchMember => _wrappedElement.isOnSwitchMember;
 
+  @override
+  ElementKind get kind => ElementKind.LABEL;
+
   @override
   LibraryElement get library => _wrappedElement.library;
 
@@ -5543,9 +5514,6 @@ class LabelFragmentImpl extends FragmentImpl implements LabelFragment {
   /// or `default`).
   bool get isOnSwitchMember => _onSwitchMember;
 
-  @override
-  ElementKind get kind => ElementKind.LABEL;
-
   @override
   LibraryElementImpl get library {
     return libraryFragment.element;
@@ -6332,9 +6300,6 @@ class LibraryFragmentImpl extends _ExistingFragmentImpl
         .toList();
   }
 
-  @override
-  ElementKind get kind => ElementKind.COMPILATION_UNIT;
-
   /// The libraries exported by this unit.
   List<LibraryExportImpl> get libraryExports {
     _ensureReadResolution();
@@ -6782,6 +6747,9 @@ class LocalFunctionElementImpl extends ExecutableElementImpl
   @override
   bool get isStatic => _wrappedElement.isStatic;
 
+  @override
+  ElementKind get kind => ElementKind.FUNCTION;
+
   @override
   MetadataImpl get metadata => _wrappedElement.metadata;
 
@@ -6880,6 +6848,9 @@ class LocalVariableElementImpl extends PromotableElementImpl
   @override
   bool get isStatic => _wrappedElement.isStatic;
 
+  @override
+  ElementKind get kind => ElementKind.LOCAL_VARIABLE;
+
   @override
   LibraryElementImpl get library => _wrappedElement.library;
 
@@ -6951,9 +6922,6 @@ class LocalVariableFragmentImpl extends NonParameterVariableFragmentImpl
     enclosingElement3 = value as FragmentImpl;
   }
 
-  @override
-  ElementKind get kind => ElementKind.LOCAL_VARIABLE;
-
   @override
   LibraryFragmentImpl get libraryFragment => enclosingUnit;
 
@@ -7532,9 +7500,6 @@ class MethodFragmentImpl extends ExecutableFragmentImpl
         first == 0x24);
   }
 
-  @override
-  ElementKind get kind => ElementKind.METHOD;
-
   @override
   String? get lookupName {
     if (name2 == '-' && formalParameters.isEmpty) {
@@ -7577,6 +7542,9 @@ class MixinElementImpl extends InterfaceElementImpl implements MixinElement {
   @override
   bool get isBase => firstFragment.isBase;
 
+  @override
+  ElementKind get kind => ElementKind.MIXIN;
+
   @override
   List<InterfaceTypeImpl> get superclassConstraints {
     return [for (var fragment in fragments) ...fragment.superclassConstraints];
@@ -7632,9 +7600,6 @@ class MixinFragmentImpl extends ClassOrMixinFragmentImpl
     return hasModifier(Modifier.BASE);
   }
 
-  @override
-  ElementKind get kind => ElementKind.MIXIN;
-
   @override
   List<InterfaceTypeImpl> get mixins => const [];
 
@@ -8080,9 +8045,6 @@ class NeverFragmentImpl extends FragmentImpl implements TypeDefiningFragment {
   @override
   Null get enclosingFragment => null;
 
-  @override
-  ElementKind get kind => ElementKind.NEVER;
-
   @override
   Null get library => null;
 
@@ -8827,11 +8789,6 @@ class SetterFragmentImpl extends PropertyAccessorFragmentImpl
 
   SetterFragmentImpl.forVariable(super.variable) : super.forVariable();
 
-  @override
-  ElementKind get kind {
-    return ElementKind.SETTER;
-  }
-
   @override
   String? get lookupName {
     if (name2 case var name?) {
@@ -9271,9 +9228,6 @@ class TopLevelVariableFragmentImpl extends PropertyInducingFragmentImpl
   @override
   bool get isStatic => true;
 
-  @override
-  ElementKind get kind => ElementKind.TOP_LEVEL_VARIABLE;
-
   @override
   LibraryFragmentImpl get libraryFragment => enclosingUnit;
 
@@ -9606,15 +9560,6 @@ class TypeAliasFragmentImpl extends _ExistingFragmentImpl
     setModifier(Modifier.SIMPLY_BOUNDED, isSimplyBounded);
   }
 
-  @override
-  ElementKind get kind {
-    if (isNonFunctionTypeAliasesEnabled) {
-      return ElementKind.TYPE_ALIAS;
-    } else {
-      return ElementKind.FUNCTION_TYPE_ALIAS;
-    }
-  }
-
   @override
   MetadataImpl get metadata {
     _ensureReadResolution();
@@ -9843,9 +9788,6 @@ class TypeParameterFragmentImpl extends FragmentImpl
     return _variance == null;
   }
 
-  @override
-  ElementKind get kind => ElementKind.TYPE_PARAMETER;
-
   @override
   LibraryElementImpl? get library {
     var library = libraryFragment?.element;
@@ -10205,9 +10147,6 @@ mixin WrappedElementMixin implements ElementImpl {
   @override
   bool get isSynthetic => _wrappedElement.isSynthetic;
 
-  @override
-  ElementKind get kind => _wrappedElement.kind;
-
   @override
   String? get name3 => _wrappedElement.name2;
 

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

@@ -45,9 +45,9 @@ class InstanceMemberInferrer {
     ExecutableFragmentImpl element,
     List<ExecutableFragmentImpl> elements,
   ) {
-    var elementKind = element.kind;
+    var elementKind = element.element.kind;
     for (int i = 0; i < elements.length; i++) {
-      if (elements[i].kind != elementKind) {
+      if (elements[i].element.kind != elementKind) {
         return false;
       }
     }