Elements. Remove HasSinceSdkVersion, move 'sinceSdkVersion' into Element.

This simplifies both API and implementation; and unblocks another
simplification with removing `TypeDefiningElementImpl`.

There are no uses of `HasSinceSdkVersion` interface, and even
`sinceSdkVersion` at all in google3. So, we might consider removing it
at all. But I imagine that it might be theoretically useful, so maybe
not. OTOH, given that its use it so spare, I think that it does not
deserve the complexity.

To be landed after 7.7.0 from
https://dart-review.googlesource.com/c/sdk/+/440683 is published.

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

Author: scheglov

pkg/analyzer/CHANGELOG.md

@@ -14,6 +14,7 @@
 * Remove deprecated `VariableElement.constantInitializer2`.
 * Remove deprecated `VariableFragment.initializer`.
 * Remove deprecated `ConstantInitializer`.
+* Remove deprecated `HasSinceSdkVersion`.
 * `LibraryFragment` is not `Annotatable` anymore.
 * Stop implementing `ConstantEvaluationTarget` by `ElementAnnotation`.
   This is an internal interface that should not have been exposed.

pkg/analyzer/api.txt

@@ -3302,7 +3302,7 @@ package:analyzer/dart/element/element.dart:
     element (getter: ClassElement)
     nextFragment (getter: ClassFragment?)
     previousFragment (getter: ClassFragment?)
-  ConstructorElement (class extends Object implements ExecutableElement, HasSinceSdkVersion):
+  ConstructorElement (class extends Object implements ExecutableElement):
     new (constructor: ConstructorElement Function())
     baseElement (getter: ConstructorElement)
     enclosingElement (getter: InterfaceElement)
@@ -3373,6 +3373,7 @@ package:analyzer/dart/element/element.dart:
     nonSynthetic (getter: Element)
     nonSynthetic2 (getter: Element, deprecated)
     session (getter: AnalysisSession?)
+    sinceSdkVersion (getter: Version?)
     accept (method: T? Function<T>(ElementVisitor2<T>))
     accept2 (method: T? Function<T>(ElementVisitor2<T>), deprecated)
     displayString (method: String Function({bool multiline, bool preferTypeAlias}))
@@ -3591,7 +3592,7 @@ package:analyzer/dart/element/element.dart:
     nextFragment (getter: FieldFragment?)
     offset (getter: int)
     previousFragment (getter: FieldFragment?)
-  FormalParameterElement (class extends Object implements VariableElement, Annotatable, HasSinceSdkVersion, LocalElement):
+  FormalParameterElement (class extends Object implements VariableElement, Annotatable, LocalElement):
     new (constructor: FormalParameterElement Function())
     baseElement (getter: FormalParameterElement)
     defaultValueCode (getter: String?)
@@ -3670,13 +3671,10 @@ package:analyzer/dart/element/element.dart:
     nextFragment (getter: GetterFragment?)
     offset (getter: int)
     previousFragment (getter: GetterFragment?)
-  HasSinceSdkVersion (class extends Object):
-    new (constructor: HasSinceSdkVersion Function())
-    sinceSdkVersion (getter: Version?)
   HideElementCombinator (class extends Object implements NamespaceCombinator):
     new (constructor: HideElementCombinator Function())
     hiddenNames (getter: List<String>)
-  InstanceElement (class extends Object implements TypeDefiningElement, TypeParameterizedElement, HasSinceSdkVersion):
+  InstanceElement (class extends Object implements TypeDefiningElement, TypeParameterizedElement):
     new (constructor: InstanceElement Function())
     baseElement (getter: InstanceElement)
     enclosingElement (getter: LibraryElement)
@@ -3782,7 +3780,7 @@ package:analyzer/dart/element/element.dart:
     element (getter: LabelElement)
     nextFragment (getter: LabelFragment?)
     previousFragment (getter: LabelFragment?)
-  LibraryElement (class extends Object implements Element, Annotatable, HasSinceSdkVersion):
+  LibraryElement (class extends Object implements Element, Annotatable):
     new (constructor: LibraryElement Function())
     classes (getter: List<ClassElement>)
     entryPoint (getter: TopLevelFunctionElement?)
@@ -3945,7 +3943,7 @@ package:analyzer/dart/element/element.dart:
     hasVisibleForTesting (getter: bool)
     hasVisibleOutsideTemplate (getter: bool)
     hasWidgetFactory (getter: bool)
-  MethodElement (class extends Object implements ExecutableElement, HasSinceSdkVersion):
+  MethodElement (class extends Object implements ExecutableElement):
     CALL_METHOD_NAME (static getter: String)
     NO_SUCH_METHOD_METHOD_NAME (static getter: String)
     new (constructor: MethodElement Function())
@@ -4048,7 +4046,7 @@ package:analyzer/dart/element/element.dart:
     element (getter: PropertyAccessorElement)
     nextFragment (getter: PropertyAccessorFragment?)
     previousFragment (getter: PropertyAccessorFragment?)
-  PropertyInducingElement (class extends Object implements VariableElement, Annotatable, HasSinceSdkVersion):
+  PropertyInducingElement (class extends Object implements VariableElement, Annotatable):
     new (constructor: PropertyInducingElement Function())
     firstFragment (getter: PropertyInducingFragment)
     fragments (getter: List<PropertyInducingFragment>)
@@ -4095,7 +4093,7 @@ package:analyzer/dart/element/element.dart:
     element (getter: SuperFormalParameterElement)
     nextFragment (getter: SuperFormalParameterFragment?)
     previousFragment (getter: SuperFormalParameterFragment?)
-  TopLevelFunctionElement (class extends Object implements ExecutableElement, HasSinceSdkVersion):
+  TopLevelFunctionElement (class extends Object implements ExecutableElement):
     LOAD_LIBRARY_NAME (static getter: String)
     MAIN_FUNCTION_NAME (static getter: String)
     new (constructor: TopLevelFunctionElement Function())
@@ -4120,7 +4118,7 @@ package:analyzer/dart/element/element.dart:
     element (getter: TopLevelVariableElement)
     nextFragment (getter: TopLevelVariableFragment?)
     previousFragment (getter: TopLevelVariableFragment?)
-  TypeAliasElement (class extends Object implements TypeParameterizedElement, TypeDefiningElement, HasSinceSdkVersion):
+  TypeAliasElement (class extends Object implements TypeParameterizedElement, TypeDefiningElement):
     new (constructor: TypeAliasElement Function())
     aliasedElement (getter: Element?)
     aliasedElement2 (getter: Element?, deprecated)
@@ -4264,7 +4262,6 @@ package:analyzer/dart/element/element2.dart:
   GenericFunctionTypeFragment (see above)
   GetterElement (see above)
   GetterFragment (see above)
-  HasSinceSdkVersion (see above)
   HideElementCombinator (see above)
   InstanceElement (see above)
   InstanceFragment (see above)

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

@@ -362,8 +362,7 @@ abstract class ClassFragment implements InterfaceFragment {
 /// type.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class ConstructorElement
-    implements ExecutableElement, HasSinceSdkVersion {
+abstract class ConstructorElement implements ExecutableElement {
   @override
   ConstructorElement get baseElement;
 
@@ -716,6 +715,23 @@ abstract class Element {
   /// The analysis session in which this element is defined.
   AnalysisSession? get session;
 
+  /// The version where the associated SDK API was added.
+  ///
+  /// A `@Since()` annotation can be applied to a library declaration,
+  /// any public declaration in a library, or in a class, or to an optional
+  /// parameter, etc.
+  ///
+  /// The returned version is "effective", so that if a library is annotated
+  /// then all elements of the library inherit it; or if a class is annotated
+  /// then all members and constructors of the class inherit it.
+  ///
+  /// If multiple `@Since()` annotations apply to the same element, the latest
+  /// version takes precedence.
+  ///
+  /// Returns `null` if the element is not declared in the SDK, or doesn't have
+  /// a `@Since()` annotation applied to it.
+  Version? get sinceSdkVersion;
+
   /// Uses the given [visitor] to visit this element.
   ///
   /// Returns the value returned by the visitor as a result of visiting this
@@ -1565,7 +1581,7 @@ abstract class FieldFragment implements PropertyInducingFragment {
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class FormalParameterElement
-    implements VariableElement, Annotatable, HasSinceSdkVersion, LocalElement {
+    implements VariableElement, Annotatable, LocalElement {
   @override
   FormalParameterElement get baseElement;
 
@@ -1958,27 +1974,6 @@ abstract class GetterFragment implements PropertyAccessorFragment {
   GetterFragment? get previousFragment;
 }
 
-/// The interface that is implemented by elements that can have `@Since()`
-/// annotation.
-abstract class HasSinceSdkVersion {
-  /// The version where the associated SDK API was added.
-  ///
-  /// A `@Since()` annotation can be applied to a library declaration,
-  /// any public declaration in a library, or in a class, or to an optional
-  /// parameter, etc.
-  ///
-  /// The returned version is "effective", so that if a library is annotated
-  /// then all elements of the library inherit it; or if a class is annotated
-  /// then all members and constructors of the class inherit it.
-  ///
-  /// If multiple `@Since()` annotations apply to the same element, the latest
-  /// version takes precedence.
-  ///
-  /// Returns `null` if the element is not declared in the SDK, or doesn't have
-  /// a `@Since()` annotation applied to it.
-  Version? get sinceSdkVersion;
-}
-
 /// A combinator that causes some of the names in a namespace to be hidden when
 /// being imported.
 ///
@@ -1993,10 +1988,7 @@ abstract class HideElementCombinator implements NamespaceCombinator {
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class InstanceElement
-    implements
-        TypeDefiningElement,
-        TypeParameterizedElement,
-        HasSinceSdkVersion {
+    implements TypeDefiningElement, TypeParameterizedElement {
   @override
   InstanceElement get baseElement;
 
@@ -2572,8 +2564,7 @@ abstract class LabelFragment implements Fragment {
 /// A library.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class LibraryElement
-    implements Element, Annotatable, HasSinceSdkVersion {
+abstract class LibraryElement implements Element, Annotatable {
   /// The classes defined in this library.
   ///
   /// There is no guarantee of the order in which the classes will be returned.
@@ -3193,7 +3184,7 @@ abstract class Metadata {
 /// method.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class MethodElement implements ExecutableElement, HasSinceSdkVersion {
+abstract class MethodElement implements ExecutableElement {
   /// The name of the method that can be implemented by a class to allow its
   /// instances to be invoked as if they were a function.
   static final String CALL_METHOD_NAME = "call";
@@ -3532,8 +3523,7 @@ abstract class PropertyAccessorFragment implements ExecutableFragment {
 ///   [PropertyInducingElement].
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class PropertyInducingElement
-    implements VariableElement, Annotatable, HasSinceSdkVersion {
+abstract class PropertyInducingElement implements VariableElement, Annotatable {
   @override
   PropertyInducingFragment get firstFragment;
 
@@ -3730,8 +3720,7 @@ abstract class SuperFormalParameterFragment implements FormalParameterFragment {
 /// A top-level function.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class TopLevelFunctionElement
-    implements ExecutableElement, HasSinceSdkVersion {
+abstract class TopLevelFunctionElement implements ExecutableElement {
   /// The name of the function used as an entry point.
   static const String MAIN_FUNCTION_NAME = "main";
 
@@ -3808,10 +3797,7 @@ abstract class TopLevelVariableFragment implements PropertyInducingFragment {
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class TypeAliasElement
-    implements
-        TypeParameterizedElement,
-        TypeDefiningElement,
-        HasSinceSdkVersion {
+    implements TypeParameterizedElement, TypeDefiningElement {
   /// If the aliased type has structure, return the corresponding element.
   /// For example, it could be [GenericFunctionTypeElement].
   ///