Rework ElementImpl and AugmentationElementImpl hierarchies to use XyzOrAugmentationElementMixin(s).

Add ClassAugmentationElementImpl, no any tests yet because it
required parsing, AST, etc. And it is also not ready yet.

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

Author: scheglov

pkg/analysis_server/test/protocol_server_test.dart

@@ -240,6 +240,7 @@ class EnumTest {
         .run(convertElementKind, exceptions: {
       // TODO(paulberry): do any of the exceptions below constitute bugs?
       engine.ElementKind.AUGMENTATION_IMPORT: ElementKind.UNKNOWN,
+      engine.ElementKind.CLASS_AUGMENTATION: ElementKind.UNKNOWN,
       engine.ElementKind.DYNAMIC: ElementKind.UNKNOWN,
       engine.ElementKind.ERROR: ElementKind.UNKNOWN,
       engine.ElementKind.EXPORT: ElementKind.UNKNOWN,

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

@@ -961,81 +961,85 @@ class ElementKind implements Comparable<ElementKind> {
 
   static const ElementKind CLASS = ElementKind('CLASS', 1, "class");
 
+  static const ElementKind CLASS_AUGMENTATION =
+      ElementKind('CLASS_AUGMENTATION', 2, "class augmentation");
+
   static const ElementKind COMPILATION_UNIT =
-      ElementKind('COMPILATION_UNIT', 2, "compilation unit");
+      ElementKind('COMPILATION_UNIT', 3, "compilation unit");
 
   static const ElementKind CONSTRUCTOR =
-      ElementKind('CONSTRUCTOR', 3, "constructor");
+      ElementKind('CONSTRUCTOR', 4, "constructor");
 
-  static const ElementKind DYNAMIC = ElementKind('DYNAMIC', 4, "<dynamic>");
+  static const ElementKind DYNAMIC = ElementKind('DYNAMIC', 5, "<dynamic>");
 
-  static const ElementKind ENUM = ElementKind('ENUM', 5, "enum");
+  static const ElementKind ENUM = ElementKind('ENUM', 6, "enum");
 
-  static const ElementKind ERROR = ElementKind('ERROR', 6, "<error>");
+  static const ElementKind ERROR = ElementKind('ERROR', 7, "<error>");
 
   static const ElementKind EXPORT =
-      ElementKind('EXPORT', 7, "export directive");
+      ElementKind('EXPORT', 8, "export directive");
 
-  static const ElementKind EXTENSION = ElementKind('EXTENSION', 8, "extension");
+  static const ElementKind EXTENSION = ElementKind('EXTENSION', 9, "extension");
 
-  static const ElementKind FIELD = ElementKind('FIELD', 9, "field");
+  static const ElementKind FIELD = ElementKind('FIELD', 10, "field");
 
-  static const ElementKind FUNCTION = ElementKind('FUNCTION', 10, "function");
+  static const ElementKind FUNCTION = ElementKind('FUNCTION', 11, "function");
 
   static const ElementKind GENERIC_FUNCTION_TYPE =
-      ElementKind('GENERIC_FUNCTION_TYPE', 11, 'generic function type');
+      ElementKind('GENERIC_FUNCTION_TYPE', 12, 'generic function type');
 
-  static const ElementKind GETTER = ElementKind('GETTER', 12, "getter");
+  static const ElementKind GETTER = ElementKind('GETTER', 13, "getter");
 
   static const ElementKind IMPORT =
-      ElementKind('IMPORT', 13, "import directive");
+      ElementKind('IMPORT', 14, "import directive");
 
   static const ElementKind INLINE_CLASS =
-      ElementKind('INLINE_CLASS', 14, "inline class");
+      ElementKind('INLINE_CLASS', 15, "inline class");
 
-  static const ElementKind LABEL = ElementKind('LABEL', 15, "label");
+  static const ElementKind LABEL = ElementKind('LABEL', 16, "label");
 
-  static const ElementKind LIBRARY = ElementKind('LIBRARY', 16, "library");
+  static const ElementKind LIBRARY = ElementKind('LIBRARY', 17, "library");
 
   static const ElementKind LIBRARY_AUGMENTATION =
-      ElementKind('LIBRARY_AUGMENTATION', 17, "library augmentation");
+      ElementKind('LIBRARY_AUGMENTATION', 18, "library augmentation");
 
   static const ElementKind LOCAL_VARIABLE =
-      ElementKind('LOCAL_VARIABLE', 18, "local variable");
+      ElementKind('LOCAL_VARIABLE', 19, "local variable");
 
-  static const ElementKind METHOD = ElementKind('METHOD', 19, "method");
+  static const ElementKind METHOD = ElementKind('METHOD', 20, "method");
 
-  static const ElementKind NAME = ElementKind('NAME', 20, "<name>");
+  static const ElementKind NAME = ElementKind('NAME', 21, "<name>");
 
-  static const ElementKind NEVER = ElementKind('NEVER', 21, "<never>");
+  static const ElementKind NEVER = ElementKind('NEVER', 22, "<never>");
 
   static const ElementKind PARAMETER =
-      ElementKind('PARAMETER', 22, "parameter");
+      ElementKind('PARAMETER', 23, "parameter");
 
-  static const ElementKind PART = ElementKind('PART', 23, "part");
+  static const ElementKind PART = ElementKind('PART', 24, "part");
 
-  static const ElementKind PREFIX = ElementKind('PREFIX', 24, "import prefix");
+  static const ElementKind PREFIX = ElementKind('PREFIX', 25, "import prefix");
 
-  static const ElementKind RECORD = ElementKind('RECORD', 25, "record");
+  static const ElementKind RECORD = ElementKind('RECORD', 26, "record");
 
-  static const ElementKind SETTER = ElementKind('SETTER', 26, "setter");
+  static const ElementKind SETTER = ElementKind('SETTER', 27, "setter");
 
   static const ElementKind TOP_LEVEL_VARIABLE =
-      ElementKind('TOP_LEVEL_VARIABLE', 27, "top level variable");
+      ElementKind('TOP_LEVEL_VARIABLE', 28, "top level variable");
 
   static const ElementKind FUNCTION_TYPE_ALIAS =
-      ElementKind('FUNCTION_TYPE_ALIAS', 28, "function type alias");
+      ElementKind('FUNCTION_TYPE_ALIAS', 29, "function type alias");
 
   static const ElementKind TYPE_PARAMETER =
-      ElementKind('TYPE_PARAMETER', 29, "type parameter");
+      ElementKind('TYPE_PARAMETER', 30, "type parameter");
 
   static const ElementKind TYPE_ALIAS =
-      ElementKind('TYPE_ALIAS', 30, "type alias");
+      ElementKind('TYPE_ALIAS', 31, "type alias");
 
-  static const ElementKind UNIVERSE = ElementKind('UNIVERSE', 31, "<universe>");
+  static const ElementKind UNIVERSE = ElementKind('UNIVERSE', 32, "<universe>");
 
   static const List<ElementKind> values = [
     CLASS,
+    CLASS_AUGMENTATION,
     COMPILATION_UNIT,
     CONSTRUCTOR,
     DYNAMIC,
@@ -1124,6 +1128,8 @@ abstract class ElementLocation {
 abstract class ElementVisitor<R> {
   R? visitAugmentationImportElement(AugmentationImportElement element);
 
+  R? visitClassAugmentationElement(ClassAugmentationElement element);
+
   R? visitClassElement(ClassElement element);
 
   R? visitCompilationUnitElement(CompilationUnitElement element);
@@ -2188,7 +2194,14 @@ abstract class MultiplyInheritedExecutableElement implements ExecutableElement {
 /// Clients may not extend, implement or mix-in this class.
 @experimental
 abstract class NamedInstanceElement
-    implements NamedInstanceOrAugmentationElement, InstanceElement {}
+    implements NamedInstanceOrAugmentationElement, InstanceElement {
+  /// Create the [DartType] for this element with the given [typeArguments]
+  /// and [nullabilitySuffix].
+  DartType instantiate({
+    required List<DartType> typeArguments,
+    required NullabilitySuffix nullabilitySuffix,
+  });
+}
 
 /// [InstanceOrAugmentationElement] with a name.
 ///
@@ -2203,13 +2216,6 @@ abstract class NamedInstanceOrAugmentationElement
 
   @override
   String get name;
-
-  /// Create the [DartType] for this element with the given [typeArguments]
-  /// and [nullabilitySuffix].
-  DartType instantiate({
-    required List<DartType> typeArguments,
-    required NullabilitySuffix nullabilitySuffix,
-  });
 }
 
 /// An object that controls how namespaces are combined.

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

@@ -88,6 +88,10 @@ class GeneralizingElementVisitor<R> implements ElementVisitor<R> {
   R? visitAugmentationImportElement(AugmentationImportElement element) =>
       visitElement(element);
 
+  @override
+  R? visitClassAugmentationElement(ClassAugmentationElement element) =>
+      visitElement(element);
+
   @override
   R? visitClassElement(ClassElement element) => visitElement(element);
 
@@ -228,6 +232,12 @@ class RecursiveElementVisitor<R> implements ElementVisitor<R> {
     return null;
   }
 
+  @override
+  R? visitClassAugmentationElement(ClassAugmentationElement element) {
+    element.visitChildren(this);
+    return null;
+  }
+
   @override
   R? visitClassElement(ClassElement element) {
     element.visitChildren(this);
@@ -398,6 +408,9 @@ class SimpleElementVisitor<R> implements ElementVisitor<R> {
   @override
   R? visitAugmentationImportElement(AugmentationImportElement element) => null;
 
+  @override
+  R? visitClassAugmentationElement(ClassAugmentationElement element) => null;
+
   @override
   R? visitClassElement(ClassElement element) => null;
 
@@ -496,6 +509,10 @@ class ThrowingElementVisitor<R> implements ElementVisitor<R> {
   R? visitAugmentationImportElement(AugmentationImportElement element) =>
       _throw(element);
 
+  @override
+  R? visitClassAugmentationElement(ClassAugmentationElement element) =>
+      _throw(element);
+
   @override
   R? visitClassElement(ClassElement element) => _throw(element);
 

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -87,7 +87,7 @@ import 'package:analyzer/src/utilities/uri_cache.dart';
 /// TODO(scheglov) Clean up the list of implicitly analyzed files.
 class AnalysisDriver implements AnalysisDriverGeneric {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 278;
+  static const int DATA_VERSION = 279;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.