Elements. Move everything from element2.dart into element.dart, re-export.

I do not deprecate element2.dart in this CL, to make the change smaller, but I will in a following CL.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -2966,6 +2966,74 @@ package:analyzer/dart/constant/value.dart:
     toSymbolValue (method: String? Function())
     toTypeValue (method: DartType? Function())
 package:analyzer/dart/element/element.dart:
+  Annotatable (class extends Object):
+    new (constructor: Annotatable Function())
+    documentationComment (getter: String?)
+    metadata2 (getter: Metadata)
+  BindPatternVariableElement2 (class extends Object implements PatternVariableElement2):
+    new (constructor: BindPatternVariableElement2 Function())
+    firstFragment (getter: BindPatternVariableFragment)
+    fragments (getter: List<BindPatternVariableFragment>)
+  BindPatternVariableFragment (class extends Object implements PatternVariableFragment):
+    new (constructor: BindPatternVariableFragment Function())
+    element (getter: BindPatternVariableElement2)
+    nextFragment (getter: BindPatternVariableFragment?)
+    previousFragment (getter: BindPatternVariableFragment?)
+  ClassElement2 (class extends Object implements InterfaceElement2):
+    new (constructor: ClassElement2 Function())
+    firstFragment (getter: ClassFragment)
+    fragments (getter: List<ClassFragment>)
+    hasNonFinalField (getter: bool)
+    isAbstract (getter: bool)
+    isBase (getter: bool)
+    isConstructable (getter: bool)
+    isDartCoreEnum (getter: bool)
+    isDartCoreObject (getter: bool)
+    isExhaustive (getter: bool)
+    isFinal (getter: bool)
+    isInterface (getter: bool)
+    isMixinApplication (getter: bool)
+    isMixinClass (getter: bool)
+    isSealed (getter: bool)
+    isValidMixin (getter: bool)
+    isExtendableIn2 (method: bool Function(LibraryElement2))
+    isImplementableIn2 (method: bool Function(LibraryElement2))
+    isMixableIn2 (method: bool Function(LibraryElement2))
+  ClassFragment (class extends Object implements InterfaceFragment):
+    new (constructor: ClassFragment Function())
+    element (getter: ClassElement2)
+    nextFragment (getter: ClassFragment?)
+    previousFragment (getter: ClassFragment?)
+  ConstantInitializer (class extends Object):
+    new (constructor: ConstantInitializer Function())
+    expression (getter: Expression)
+    fragment (getter: VariableFragment)
+    evaluate (method: DartObject? Function())
+  ConstructorElement2 (class extends Object implements ExecutableElement2, HasSinceSdkVersion):
+    new (constructor: ConstructorElement2 Function())
+    baseElement (getter: ConstructorElement2)
+    enclosingElement2 (getter: InterfaceElement2)
+    firstFragment (getter: ConstructorFragment)
+    fragments (getter: List<ConstructorFragment>)
+    isConst (getter: bool)
+    isDefaultConstructor (getter: bool)
+    isFactory (getter: bool)
+    isGenerative (getter: bool)
+    name3 (getter: String?)
+    redirectedConstructor2 (getter: ConstructorElement2?)
+    returnType (getter: InterfaceType)
+    superConstructor2 (getter: ConstructorElement2?)
+  ConstructorFragment (class extends Object implements ExecutableFragment):
+    new (constructor: ConstructorFragment Function())
+    element (getter: ConstructorElement2)
+    enclosingFragment (getter: InstanceFragment?)
+    name2 (getter: String)
+    nextFragment (getter: ConstructorFragment?)
+    offset (getter: int)
+    periodOffset (getter: int?)
+    previousFragment (getter: ConstructorFragment?)
+    typeName (getter: String?)
+    typeNameOffset (getter: int?)
   DirectiveUri (class extends Object):
     new (constructor: DirectiveUri Function())
   DirectiveUriWithLibrary (class extends DirectiveUriWithSource):
@@ -2983,6 +3051,31 @@ package:analyzer/dart/element/element.dart:
   DirectiveUriWithUnit (class extends DirectiveUriWithSource):
     new (constructor: DirectiveUriWithUnit Function())
     libraryFragment (getter: LibraryFragment, experimental)
+  Element2 (class extends Object):
+    new (constructor: Element2 Function())
+    baseElement (getter: Element2)
+    children2 (getter: List<Element2>)
+    displayName (getter: String)
+    enclosingElement2 (getter: Element2?)
+    firstFragment (getter: Fragment)
+    fragments (getter: List<Fragment>)
+    id (getter: int)
+    isPrivate (getter: bool)
+    isPublic (getter: bool)
+    isSynthetic (getter: bool)
+    kind (getter: ElementKind)
+    library2 (getter: LibraryElement2?)
+    lookupName (getter: String?)
+    name3 (getter: String?)
+    nonSynthetic2 (getter: Element2)
+    session (getter: AnalysisSession?)
+    accept2 (method: T? Function<T>(ElementVisitor2<T>))
+    displayString2 (method: String Function({bool multiline, bool preferTypeAlias}))
+    getExtendedDisplayName2 (method: String Function({String? shortName}))
+    isAccessibleIn2 (method: bool Function(LibraryElement2))
+    thisOrAncestorMatching2 (method: Element2? Function(bool Function(Element2)))
+    thisOrAncestorOfType2 (method: E? Function<E extends Element2>())
+    visitChildren2 (method: void Function<T>(ElementVisitor2<T>))
   ElementAnnotation (class extends Object implements ConstantEvaluationTarget):
     new (constructor: ElementAnnotation Function())
     constantEvaluationErrors (getter: List<AnalysisError>?)
@@ -3020,6 +3113,9 @@ package:analyzer/dart/element/element.dart:
     isWidgetFactory (getter: bool)
     computeConstantValue (method: DartObject? Function())
     toSource (method: String Function())
+  ElementDirective (class extends Object implements Annotatable, sealed (immediate subtypes: LibraryExport, LibraryImport, PartInclude)):
+    libraryFragment (getter: LibraryFragment)
+    uri (getter: DirectiveUri)
   ElementKind (class extends Object implements Comparable<ElementKind>):
     AUGMENTATION_IMPORT (static getter: ElementKind)
     CLASS (static getter: ElementKind)
@@ -3066,126 +3162,6 @@ package:analyzer/dart/element/element.dart:
     new (constructor: ElementLocation Function())
     components (getter: List<String>)
     encoding (getter: String)
-  HideElementCombinator (class extends Object implements NamespaceCombinator):
-    new (constructor: HideElementCombinator Function())
-    hiddenNames (getter: List<String>)
-  LibraryLanguageVersion (class extends Object):
-    new (constructor: LibraryLanguageVersion Function({required Version? override, required Version package}))
-    effective (getter: Version)
-    override (getter: Version?)
-    package (getter: Version)
-  NamespaceCombinator (class extends Object, sealed (immediate subtypes: HideElementCombinator, ShowElementCombinator)):
-    end (getter: int)
-    offset (getter: int)
-  ShowElementCombinator (class extends Object implements NamespaceCombinator):
-    new (constructor: ShowElementCombinator Function())
-    shownNames (getter: List<String>)
-package:analyzer/dart/element/element2.dart:
-  Annotatable (class extends Object):
-    new (constructor: Annotatable Function())
-    documentationComment (getter: String?)
-    metadata2 (getter: Metadata)
-  BindPatternVariableElement2 (class extends Object implements PatternVariableElement2):
-    new (constructor: BindPatternVariableElement2 Function())
-    firstFragment (getter: BindPatternVariableFragment)
-    fragments (getter: List<BindPatternVariableFragment>)
-  BindPatternVariableFragment (class extends Object implements PatternVariableFragment):
-    new (constructor: BindPatternVariableFragment Function())
-    element (getter: BindPatternVariableElement2)
-    nextFragment (getter: BindPatternVariableFragment?)
-    previousFragment (getter: BindPatternVariableFragment?)
-  ClassElement2 (class extends Object implements InterfaceElement2):
-    new (constructor: ClassElement2 Function())
-    firstFragment (getter: ClassFragment)
-    fragments (getter: List<ClassFragment>)
-    hasNonFinalField (getter: bool)
-    isAbstract (getter: bool)
-    isBase (getter: bool)
-    isConstructable (getter: bool)
-    isDartCoreEnum (getter: bool)
-    isDartCoreObject (getter: bool)
-    isExhaustive (getter: bool)
-    isFinal (getter: bool)
-    isInterface (getter: bool)
-    isMixinApplication (getter: bool)
-    isMixinClass (getter: bool)
-    isSealed (getter: bool)
-    isValidMixin (getter: bool)
-    isExtendableIn2 (method: bool Function(LibraryElement2))
-    isImplementableIn2 (method: bool Function(LibraryElement2))
-    isMixableIn2 (method: bool Function(LibraryElement2))
-  ClassFragment (class extends Object implements InterfaceFragment):
-    new (constructor: ClassFragment Function())
-    element (getter: ClassElement2)
-    nextFragment (getter: ClassFragment?)
-    previousFragment (getter: ClassFragment?)
-  ConstantInitializer (class extends Object):
-    new (constructor: ConstantInitializer Function())
-    expression (getter: Expression)
-    fragment (getter: VariableFragment)
-    evaluate (method: DartObject? Function())
-  ConstructorElement2 (class extends Object implements ExecutableElement2, HasSinceSdkVersion):
-    new (constructor: ConstructorElement2 Function())
-    baseElement (getter: ConstructorElement2)
-    enclosingElement2 (getter: InterfaceElement2)
-    firstFragment (getter: ConstructorFragment)
-    fragments (getter: List<ConstructorFragment>)
-    isConst (getter: bool)
-    isDefaultConstructor (getter: bool)
-    isFactory (getter: bool)
-    isGenerative (getter: bool)
-    name3 (getter: String?)
-    redirectedConstructor2 (getter: ConstructorElement2?)
-    returnType (getter: InterfaceType)
-    superConstructor2 (getter: ConstructorElement2?)
-  ConstructorFragment (class extends Object implements ExecutableFragment):
-    new (constructor: ConstructorFragment Function())
-    element (getter: ConstructorElement2)
-    enclosingFragment (getter: InstanceFragment?)
-    name2 (getter: String)
-    nextFragment (getter: ConstructorFragment?)
-    offset (getter: int)
-    periodOffset (getter: int?)
-    previousFragment (getter: ConstructorFragment?)
-    typeName (getter: String?)
-    typeNameOffset (getter: int?)
-  DirectiveUri (see above)
-  DirectiveUriWithLibrary (see above)
-  DirectiveUriWithRelativeUri (see above)
-  DirectiveUriWithRelativeUriString (see above)
-  DirectiveUriWithSource (see above)
-  DirectiveUriWithUnit (see above)
-  Element2 (class extends Object):
-    new (constructor: Element2 Function())
-    baseElement (getter: Element2)
-    children2 (getter: List<Element2>)
-    displayName (getter: String)
-    enclosingElement2 (getter: Element2?)
-    firstFragment (getter: Fragment)
-    fragments (getter: List<Fragment>)
-    id (getter: int)
-    isPrivate (getter: bool)
-    isPublic (getter: bool)
-    isSynthetic (getter: bool)
-    kind (getter: ElementKind)
-    library2 (getter: LibraryElement2?)
-    lookupName (getter: String?)
-    name3 (getter: String?)
-    nonSynthetic2 (getter: Element2)
-    session (getter: AnalysisSession?)
-    accept2 (method: T? Function<T>(ElementVisitor2<T>))
-    displayString2 (method: String Function({bool multiline, bool preferTypeAlias}))
-    getExtendedDisplayName2 (method: String Function({String? shortName}))
-    isAccessibleIn2 (method: bool Function(LibraryElement2))
-    thisOrAncestorMatching2 (method: Element2? Function(bool Function(Element2)))
-    thisOrAncestorOfType2 (method: E? Function<E extends Element2>())
-    visitChildren2 (method: void Function<T>(ElementVisitor2<T>))
-  ElementAnnotation (see above)
-  ElementDirective (class extends Object implements Annotatable, sealed (immediate subtypes: LibraryExport, LibraryImport, PartInclude)):
-    libraryFragment (getter: LibraryFragment)
-    uri (getter: DirectiveUri)
-  ElementKind (see above)
-  ElementLocation (see above)
   ElementVisitor2 (class<R> extends Object):
     new (constructor: ElementVisitor2<R> Function())
     visitClassElement (method: R? Function(ClassElement2))
@@ -3372,7 +3348,9 @@ package:analyzer/dart/element/element2.dart:
   HasSinceSdkVersion (class extends Object):
     new (constructor: HasSinceSdkVersion Function())
     sinceSdkVersion (getter: Version?)
-  HideElementCombinator (see above)
+  HideElementCombinator (class extends Object implements NamespaceCombinator):
+    new (constructor: HideElementCombinator Function())
+    hiddenNames (getter: List<String>)
   InstanceElement2 (class extends Object implements TypeDefiningElement2, TypeParameterizedElement2, HasSinceSdkVersion):
     new (constructor: InstanceElement2 Function())
     baseElement (getter: InstanceElement2)
@@ -3538,6 +3516,11 @@ package:analyzer/dart/element/element2.dart:
     isSynthetic (getter: bool)
     namespace (getter: Namespace)
     prefix2 (getter: PrefixFragment?)
+  LibraryLanguageVersion (class extends Object):
+    new (constructor: LibraryLanguageVersion Function({required Version? override, required Version package}))
+    effective (getter: Version)
+    override (getter: Version?)
+    package (getter: Version)
   LocalElement2 (class extends Object implements Element2):
     new (constructor: LocalElement2 Function())
   LocalFragment (class extends Object implements Fragment):
@@ -3648,7 +3631,9 @@ package:analyzer/dart/element/element2.dart:
     == (method: bool Function(Object))
     isAccessibleFor (method: bool Function(Uri))
     toString (method: String Function())
-  NamespaceCombinator (see above)
+  NamespaceCombinator (class extends Object, sealed (immediate subtypes: HideElementCombinator, ShowElementCombinator)):
+    end (getter: int)
+    offset (getter: int)
   PartInclude (class extends Object implements ElementDirective):
     new (constructor: PartInclude Function())
     includedFragment (getter: LibraryFragment?)
@@ -3731,7 +3716,9 @@ package:analyzer/dart/element/element2.dart:
     nextFragment (getter: SetterFragment?)
     offset (getter: int)
     previousFragment (getter: SetterFragment?)
-  ShowElementCombinator (see above)
+  ShowElementCombinator (class extends Object implements NamespaceCombinator):
+    new (constructor: ShowElementCombinator Function())
+    shownNames (getter: List<String>)
   SuperFormalParameterElement2 (class extends Object implements FormalParameterElement):
     new (constructor: SuperFormalParameterElement2 Function())
     firstFragment (getter: SuperFormalParameterFragment)
@@ -3834,6 +3821,108 @@ package:analyzer/dart/element/element2.dart:
     initializer (getter: Expression?)
     nextFragment (getter: VariableFragment?)
     previousFragment (getter: VariableFragment?)
+package:analyzer/dart/element/element2.dart:
+  Annotatable (see above)
+  BindPatternVariableElement2 (see above)
+  BindPatternVariableFragment (see above)
+  ClassElement2 (see above)
+  ClassFragment (see above)
+  ConstantInitializer (see above)
+  ConstructorElement2 (see above)
+  ConstructorFragment (see above)
+  DirectiveUri (see above)
+  DirectiveUriWithLibrary (see above)
+  DirectiveUriWithRelativeUri (see above)
+  DirectiveUriWithRelativeUriString (see above)
+  DirectiveUriWithSource (see above)
+  DirectiveUriWithUnit (see above)
+  Element2 (see above)
+  ElementAnnotation (see above)
+  ElementDirective (see above)
+  ElementKind (see above)
+  ElementLocation (see above)
+  ElementVisitor2 (see above)
+  EnumElement2 (see above)
+  EnumFragment (see above)
+  ExecutableElement2 (see above)
+  ExecutableFragment (see above)
+  ExtensionElement2 (see above)
+  ExtensionFragment (see above)
+  ExtensionTypeElement2 (see above)
+  ExtensionTypeFragment (see above)
+  FieldElement2 (see above)
+  FieldFormalParameterElement2 (see above)
+  FieldFormalParameterFragment (see above)
+  FieldFragment (see above)
+  FormalParameterElement (see above)
+  FormalParameterFragment (see above)
+  Fragment (see above)
+  FunctionTypedElement2 (see above)
+  FunctionTypedFragment (see above)
+  GenericFunctionTypeElement2 (see above)
+  GenericFunctionTypeFragment (see above)
+  GetterElement (see above)
+  GetterFragment (see above)
+  HasSinceSdkVersion (see above)
+  HideElementCombinator (see above)
+  InstanceElement2 (see above)
+  InstanceFragment (see above)
+  InterfaceElement2 (see above)
+  InterfaceFragment (see above)
+  JoinPatternVariableElement2 (see above)
+  JoinPatternVariableFragment (see above)
+  LabelElement2 (see above)
+  LabelFragment (see above)
+  LibraryElement2 (see above)
+  LibraryExport (see above)
+  LibraryFragment (see above)
+  LibraryImport (see above)
+  LibraryLanguageVersion (see above)
+  LocalElement2 (see above)
+  LocalFragment (see above)
+  LocalFunctionElement (see above)
+  LocalFunctionFragment (see above)
+  LocalVariableElement2 (see above)
+  LocalVariableFragment (see above)
+  Metadata (see above)
+  MethodElement2 (see above)
+  MethodFragment (see above)
+  MixinElement2 (see above)
+  MixinFragment (see above)
+  MultiplyDefinedElement2 (see above)
+  MultiplyDefinedFragment (see above)
+  Name (see above)
+  NamespaceCombinator (see above)
+  PartInclude (see above)
+  PatternVariableElement2 (see above)
+  PatternVariableFragment (see above)
+  PrefixElement2 (see above)
+  PrefixFragment (see above)
+  PromotableElement2 (see above)
+  PromotableFragment (see above)
+  PropertyAccessorElement2 (see above)
+  PropertyAccessorFragment (see above)
+  PropertyInducingElement2 (see above)
+  PropertyInducingFragment (see above)
+  SetterElement (see above)
+  SetterFragment (see above)
+  ShowElementCombinator (see above)
+  SuperFormalParameterElement2 (see above)
+  SuperFormalParameterFragment (see above)
+  TopLevelFunctionElement (see above)
+  TopLevelFunctionFragment (see above)
+  TopLevelVariableElement2 (see above)
+  TopLevelVariableFragment (see above)
+  TypeAliasElement2 (see above)
+  TypeAliasFragment (see above)
+  TypeDefiningElement2 (see above)
+  TypeDefiningFragment (see above)
+  TypeParameterElement2 (see above)
+  TypeParameterFragment (see above)
+  TypeParameterizedElement2 (see above)
+  TypeParameterizedFragment (see above)
+  VariableElement2 (see above)
+  VariableFragment (see above)
 package:analyzer/dart/element/nullability_suffix.dart:
   NullabilitySuffix (enum):
     none (static getter: NullabilitySuffix)