Deprecate getters from constant

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

Author: fshcheglov

pkg/analyzer/CHANGELOG.md

@@ -7,6 +7,8 @@
 * Deprecate `AnalysisSession.getParsedLibraryByElement2`, use `getParsedLibraryByElement` instead.
 * Deprecate `AnalysisSession.getResolvedLibraryByElement2`, use `getResolvedLibraryByElement` instead.
 * Deprecate `resolveFile2`, use `resolveFile` instead.
+* Deprecate `DartObject.variable2`, use `variable` instead.
+* Deprecate `DartObject.toFunctionValue2`, use `toFunctionValue` instead.
 
 ## 8.0.0
 * Remove deprecated element model V1.

pkg/analyzer/api.txt

@@ -3259,11 +3259,13 @@ package:analyzer/dart/constant/value.dart:
     hasKnownValue (getter: bool)
     isNull (getter: bool)
     type (getter: DartType?)
-    variable2 (getter: VariableElement?)
+    variable (getter: VariableElement?)
+    variable2 (getter: VariableElement?, deprecated)
     getField (method: DartObject? Function(String))
     toBoolValue (method: bool? Function())
     toDoubleValue (method: double? Function())
-    toFunctionValue2 (method: ExecutableElement? Function(), experimental)
+    toFunctionValue (method: ExecutableElement? Function(), experimental)
+    toFunctionValue2 (method: ExecutableElement? Function(), deprecated, experimental)
     toIntValue (method: int? Function())
     toListValue (method: List<DartObject>? Function())
     toMapValue (method: Map<DartObject?, DartObject?>? Function())

pkg/analyzer/lib/dart/constant/value.dart

@@ -88,6 +88,10 @@ abstract class DartObject {
   DartType? get type;
 
   /// If this object is the value of a constant variable, the variable.
+  VariableElement? get variable;
+
+  /// If this object is the value of a constant variable, the variable.
+  @Deprecated('Use variable instead')
   VariableElement? get variable2;
 
   /// Return a representation of the value of the field with the given [name].
@@ -122,6 +126,16 @@ abstract class DartObject {
   /// * the value of the object being represented is not known, or
   /// * the value of the object being represented is `null`.
   @experimental
+  ExecutableElement? toFunctionValue();
+
+  /// Return an element corresponding to the value of the object being
+  /// represented, or `null`
+  /// if
+  /// * this object is not of a function type,
+  /// * the value of the object being represented is not known, or
+  /// * the value of the object being represented is `null`.
+  @Deprecated('Use toFunctionValue instead')
+  @experimental
   ExecutableElement? toFunctionValue2();
 
   /// Return an integer corresponding to the value of the object being

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

@@ -2138,7 +2138,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
     FunctionReferenceImpl node,
     DartObjectImpl value,
   ) {
-    var functionElement = value.toFunctionValue2();
+    var functionElement = value.toFunctionValue();
     if (functionElement is! ExecutableElement2OrMember) {
       return value;
     }
@@ -2173,7 +2173,7 @@ class ConstantVisitor extends UnifyingAstVisitor<Constant> {
   ) {
     // TODO(srawlins): When all code uses [FunctionReference]s generated via
     // generic function instantiation, remove this method and all call sites.
-    var functionElement = value.toFunctionValue2();
+    var functionElement = value.toFunctionValue();
     if (functionElement is! ExecutableElement2OrMember) {
       return value;
     }

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

@@ -173,7 +173,7 @@ class DartObjectImpl implements DartObject, Constant {
   final InstanceState state;
 
   @override
-  final VariableElementImpl? variable2;
+  final VariableElementImpl? variable;
 
   /// Initialize a newly created object to have the given [type] and [state].
   factory DartObjectImpl(
@@ -183,7 +183,7 @@ class DartObjectImpl implements DartObject, Constant {
     VariableElementImpl? variable,
   }) {
     type = type.extensionTypeErasure;
-    return DartObjectImpl._(typeSystem, type, state, variable2: variable);
+    return DartObjectImpl._(typeSystem, type, state, variable: variable);
   }
 
   /// Creates a duplicate instance of [other], tied to [variable].
@@ -238,7 +238,7 @@ class DartObjectImpl implements DartObject, Constant {
   }
 
   /// Initialize a newly created object to have the given [type] and [state].
-  DartObjectImpl._(this._typeSystem, this.type, this.state, {this.variable2}) {
+  DartObjectImpl._(this._typeSystem, this.type, this.state, {this.variable}) {
     if (state case GenericState state) {
       state._object = this;
     }
@@ -284,6 +284,10 @@ class DartObjectImpl implements DartObject, Constant {
   @visibleForTesting
   List<DartType>? get typeArguments => (state as FunctionState).typeArguments;
 
+  @override
+  @Deprecated('Use variable instead')
+  VariableElement? get variable2 => variable;
+
   @override
   bool operator ==(Object other) {
     if (other is DartObjectImpl) {
@@ -940,11 +944,17 @@ class DartObjectImpl implements DartObject, Constant {
   }
 
   @override
-  ExecutableElement2OrMember? toFunctionValue2() {
+  ExecutableElement2OrMember? toFunctionValue() {
     var state = this.state;
     return state is FunctionState ? state.element : null;
   }
 
+  @override
+  @Deprecated('Use toFunctionValue instead')
+  ExecutableElement? toFunctionValue2() {
+    return toFunctionValue();
+  }
+
   @override
   int? toIntValue() {
     var state = this.state;

pkg/analyzer/test/id_tests/constant_test.dart

@@ -135,7 +135,7 @@ class ConstantsDataExtractor extends AstDataExtractor<String> {
       }
       // TODO(paulberry): Support object constants.
     } else if (type is FunctionType) {
-      var element = value.toFunctionValue2()!;
+      var element = value.toFunctionValue()!;
       return 'Function(${element.name},type=${_stringifyType(value.type!)})';
     }
     throw UnimplementedError('_stringify for type $type');

pkg/analyzer/test/src/dart/resolution/dart_object_printer.dart

@@ -249,7 +249,7 @@ class DartObjectPrinter {
   }
 
   void _writeVariable(DartObjectImpl object) {
-    var variable = object.variable2;
+    var variable = object.variable;
     if (variable != null) {
       _sink.withIndent(() {
         _elementPrinter.writeNamedElement2('variable', variable);