Elements. Stop implementing ConstantEvaluationTarget by ElementAnnotation.

This is an internal interface that should not have been exposed.

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

Author: scheglov

pkg/analyzer/CHANGELOG.md

@@ -6,6 +6,8 @@
 * Remove `ElementLocation` class; its values are not returned anymore.
 * Remove deprecated `AnalysisContext.analysisOptions`.
 * `LibraryFragment` is not `Annotatable` anymore.
+* Stop implementing `ConstantEvaluationTarget` by `ElementAnnotation`.
+  This is an internal interface that should not have been exposed.
 * Deprecate `element2.dart` library; import `element.dart`.
 * Deprecate `XyzElement2` classes; use `XyzElement` instead.
 * Deprecate `AnalysisError.correction` field; use

pkg/analyzer/api.txt

@@ -291,8 +291,8 @@ package:analyzer/analysis_rule/rule_visitor_registry.dart:
     addYieldStatement (method: void Function(AbstractAnalysisRule, AstVisitor<dynamic>))
     afterLibrary (method: void Function(AbstractAnalysisRule, void Function()))
 package:analyzer/dart/analysis/analysis_context.dart:
-  AnalysisContext@1 (class extends Object):
-    new (constructor: AnalysisContext@1 Function())
+  AnalysisContext (class extends Object):
+    new (constructor: AnalysisContext Function())
     contextRoot (getter: ContextRoot)
     currentSession (getter: AnalysisSession)
     sdkRoot (getter: Folder?)
@@ -302,8 +302,8 @@ package:analyzer/dart/analysis/analysis_context.dart:
 package:analyzer/dart/analysis/analysis_context_collection.dart:
   AnalysisContextCollection (class extends Object):
     new (constructor: AnalysisContextCollection Function({List<String>? excludedPaths, required List<String> includedPaths, ResourceProvider? resourceProvider, String? sdkPath}))
-    contexts (getter: List<AnalysisContext@1>)
-    contextFor (method: AnalysisContext@1 Function(String))
+    contexts (getter: List<AnalysisContext>)
+    contextFor (method: AnalysisContext Function(String))
     dispose (method: Future<void> Function())
 package:analyzer/dart/analysis/analysis_options.dart:
   AnalysisOptions (class extends Object):
@@ -543,7 +543,7 @@ package:analyzer/dart/analysis/results.dart:
 package:analyzer/dart/analysis/session.dart:
   AnalysisSession (class extends Object):
     new (constructor: AnalysisSession Function())
-    analysisContext (getter: AnalysisContext@1)
+    analysisContext (getter: AnalysisContext)
     declaredVariables (getter: DeclaredVariables)
     resourceProvider (getter: ResourceProvider)
     uriConverter (getter: UriConverter)
@@ -3384,7 +3384,7 @@ package:analyzer/dart/element/element.dart:
     thisOrAncestorMatching2 (method: Element? Function(bool Function(Element)))
     thisOrAncestorOfType2 (method: E? Function<E extends Element>())
     visitChildren2 (method: void Function<T>(ElementVisitor2<T>))
-  ElementAnnotation (class extends Object implements ConstantEvaluationTarget):
+  ElementAnnotation (class extends Object):
     new (constructor: ElementAnnotation Function())
     constantEvaluationErrors (getter: List<Diagnostic>?)
     element2 (getter: Element?)
@@ -3420,6 +3420,7 @@ package:analyzer/dart/element/element.dart:
     isVisibleForTesting (getter: bool)
     isVisibleOutsideTemplate (getter: bool)
     isWidgetFactory (getter: bool)
+    libraryFragment (getter: LibraryFragment)
     computeConstantValue (method: DartObject? Function())
     toSource (method: String Function())
   ElementDirective (class extends Object implements Annotatable):
@@ -5152,15 +5153,6 @@ package:analyzer/src/dart/ast/ast.dart:
   AttemptedConstantEvaluationResult (class extends Object):
     diagnostics (getter: List<Diagnostic>)
     value (getter: DartObject?)
-package:analyzer/src/dart/constant/evaluation.dart:
-  ConstantEvaluationTarget (class extends Object):
-    new (constructor: ConstantEvaluationTarget Function())
-    context (getter: AnalysisContext@2)
-    isConstantEvaluated (getter: bool)
-    library (getter: LibraryElement?)
-    library2 (getter: LibraryElement?, deprecated)
-    librarySource (getter: Source?)
-    source (getter: Source?)
 package:analyzer/src/dart/resolver/scope.dart:
   Namespace (class extends Object):
     EMPTY (static getter: Namespace)
@@ -5169,14 +5161,6 @@ package:analyzer/src/dart/resolver/scope.dart:
     definedNames2 (getter: Map<String, Element>)
     get2 (method: Element? Function(String))
     getPrefixed2 (method: Element? Function(String, String))
-package:analyzer/src/generated/engine.dart:
-  AnalysisContext@2 (class extends Object):
-    new (constructor: AnalysisContext@2 Function())
-    declaredVariables (getter: DeclaredVariables)
-    sourceFactory (getter: SourceFactory)
-    getAnalysisOptionsForFile (method: AnalysisOptions Function(File), experimental)
-package:analyzer/src/generated/source.dart:
-  SourceFactory (non-public)
 package:analyzer/src/generated/timestamped_data.dart:
   TimestampedData (class<E> extends Object):
     new (constructor: TimestampedData<E> Function(int, E))

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

@@ -57,7 +57,6 @@ import 'package:analyzer/dart/element/type_system.dart';
 import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/source/source.dart';
-import 'package:analyzer/src/dart/constant/evaluation.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart' show Name;
 import 'package:analyzer/src/dart/resolver/scope.dart';
 import 'package:meta/meta.dart';
@@ -754,7 +753,7 @@ abstract class Element {
 /// A single annotation associated with an element.
 ///
 /// Clients may not extend, implement or mix-in this class.
-abstract class ElementAnnotation implements ConstantEvaluationTarget {
+abstract class ElementAnnotation {
   /// The errors that were produced while computing a value for this
   /// annotation, or `null` if no value has been computed.
   ///
@@ -887,6 +886,9 @@ abstract class ElementAnnotation implements ConstantEvaluationTarget {
   /// factory.
   bool get isWidgetFactory;
 
+  /// The library fragment that contains this annotation.
+  LibraryFragment get libraryFragment;
+
   /// Returns a representation of the value of this annotation, forcing the
   /// value to be computed if it had not previously been computed, or `null`
   /// if the value of this annotation could not be computed because of errors.

pkg/analyzer/lib/src/dart/constant/evaluation.dart

@@ -4,7 +4,6 @@
 
 import 'dart:collection';
 
-import 'package:_fe_analyzer_shared/src/base/analyzer_public_api.dart';
 import 'package:analyzer/dart/analysis/declared_variables.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
@@ -540,10 +539,6 @@ class ConstantEvaluationEngine {
 }
 
 /// Interface for constant evaluation targets.
-@AnalyzerPublicApi(
-  message: 'exposed because it is implemented by various elements',
-)
-// TODO(scheglov): consider implementing only in Impl or removing
 abstract class ConstantEvaluationTarget {
   /// Return the [AnalysisContext] which should be used to evaluate this
   /// constant.

pkg/analyzer/lib/src/dart/constant/utilities.dart

@@ -117,7 +117,7 @@ class ConstantFinder extends RecursiveAstVisitor<void> {
   ConstantFinder({required this.configuration});
 
   @override
-  void visitAnnotation(Annotation node) {
+  void visitAnnotation(covariant AnnotationImpl node) {
     super.visitAnnotation(node);
     var elementAnnotation = node.elementAnnotation;
     if (elementAnnotation == null) {

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

@@ -1545,7 +1545,8 @@ class DynamicFragmentImpl extends FragmentImpl implements TypeDefiningFragment {
 }
 
 /// A concrete implementation of an [ElementAnnotation].
-class ElementAnnotationImpl implements ElementAnnotation {
+class ElementAnnotationImpl
+    implements ElementAnnotation, ConstantEvaluationTarget {
   /// The name of the top-level variable used to mark that a function always
   /// throws, for dead code purposes.
   static const String _alwaysThrowsVariableName = 'alwaysThrows';
@@ -1909,6 +1910,9 @@ class ElementAnnotationImpl implements ElementAnnotation {
   @override
   LibraryElementImpl get library2 => compilationUnit.library;
 
+  @override
+  LibraryFragmentImpl get libraryFragment => compilationUnit;
+
   @override
   Source get librarySource => compilationUnit.librarySource;