Elements. Migrate FromEnvironmentEvaluator and FromEnvironmentEvaluatorTest.

Change-Id: Ic0d0026647a907dc50811ae331add07f042cb78d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/396423
Reviewed-by: Phil Quitslund <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

@@ -1623,7 +1623,7 @@ class DeclarationHelper {
 
       var suggestion = ConstructorSuggestion(
         importData: importData,
-        element: element.asElement2 as ConstructorElement2,
+        element: element.asElement2,
         hasClassName: hasClassName,
         isTearOff: isTearOff,
         isRedirect: isConstructorRedirect,

pkg/analyzer/analyzer_use_new_elements.txt

@@ -24,7 +24,6 @@ lib/src/dart/ast/extensions.dart
 lib/src/dart/ast/utilities.dart
 lib/src/dart/constant/constant_verifier.dart
 lib/src/dart/constant/evaluation.dart
-lib/src/dart/constant/from_environment_evaluator.dart
 lib/src/dart/constant/potentially_constant.dart
 lib/src/dart/constant/utilities.dart
 lib/src/dart/constant/value.dart
@@ -170,7 +169,6 @@ lib/src/utilities/extensions/library_element.dart
 lib/src/wolf/ir/ast_to_ir.dart
 lib/src/wolf/ir/call_descriptor.dart
 lib/src/wolf/ir/coded_ir.dart
-test/dart/analysis/from_environment_evaluator_test.dart
 test/dart/sdk/build_sdk_summary_test.dart
 test/error/error_reporter_test.dart
 test/generated/element_resolver_test.dart

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

@@ -1270,6 +1270,9 @@ abstract class InterfaceElement2 implements InstanceElement2 {
   /// constructor will be returned.
   ConstructorElement2? get unnamedConstructor2;
 
+  /// Returns the constructor from [constructors2] that has the given [name].
+  ConstructorElement2? getNamedConstructor2(String name);
+
   /// Create the [InterfaceType] for this element with the given
   /// [typeArguments] and [nullabilitySuffix].
   InterfaceType instantiate({

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -4459,8 +4459,7 @@ final class ConstructorNameImpl extends AstNodeImpl implements ConstructorName {
 
   @experimental
   @override
-  ConstructorElement2? get element =>
-      staticElement?.asElement2 as ConstructorElement2?;
+  ConstructorElement2? get element => staticElement?.asElement2;
 
   @override
   Token get endToken {
@@ -5621,7 +5620,7 @@ final class EnumConstantDeclarationImpl extends DeclarationImpl
   @experimental
   @override
   ConstructorElement2? get constructorElement2 =>
-      constructorElement?.asElement2 as ConstructorElement2?;
+      constructorElement?.asElement2;
 
   @experimental
   @override
@@ -15077,8 +15076,7 @@ final class RedirectingConstructorInvocationImpl
 
   @experimental
   @override
-  ConstructorElement2? get element =>
-      staticElement?.asElement2 as ConstructorElement2?;
+  ConstructorElement2? get element => staticElement?.asElement2;
 
   @override
   Token get endToken => _argumentList.endToken;
@@ -16629,8 +16627,7 @@ final class SuperConstructorInvocationImpl extends ConstructorInitializerImpl
 
   @experimental
   @override
-  ConstructorElement2? get element =>
-      staticElement?.asElement2 as ConstructorElement2?;
+  ConstructorElement2? get element => staticElement?.asElement2;
 
   @override
   Token get endToken => _argumentList.endToken;

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

@@ -33,6 +33,7 @@ import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/task/api/model.dart';
 import 'package:analyzer/src/utilities/extensions/collection.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer/src/utilities/extensions/object.dart';
 
 class ConstantEvaluationConfiguration {
@@ -2503,13 +2504,13 @@ class _InstanceCreationEvaluator {
           );
         }
         return FromEnvironmentEvaluator(typeSystem, _declaredVariables)
-            .getBool2(variableName, _namedValues, _constructor);
+            .getBool2(variableName, _namedValues, _constructor.asElement2);
       } else if (definingClass == typeProvider.intElement) {
         return FromEnvironmentEvaluator(typeSystem, _declaredVariables)
-            .getInt2(variableName, _namedValues, _constructor);
+            .getInt2(variableName, _namedValues, _constructor.asElement2);
       } else if (definingClass == typeProvider.stringElement) {
         return FromEnvironmentEvaluator(typeSystem, _declaredVariables)
-            .getString2(variableName, _namedValues, _constructor);
+            .getString2(variableName, _namedValues, _constructor.asElement2);
       }
     } else if (_constructor.name == 'hasEnvironment' &&
         definingClass == typeProvider.boolElement) {

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

@@ -4,7 +4,7 @@
 
 import 'package:analyzer/dart/analysis/declared_variables.dart';
 import 'package:analyzer/dart/constant/value.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/constant/value.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 
@@ -25,7 +25,7 @@ class FromEnvironmentEvaluator {
   DartObjectImpl getBool2(
     String? name,
     Map<String, DartObjectImpl> namedValues,
-    ConstructorElement constructor,
+    ConstructorElement2 constructor,
   ) {
     var str = name != null ? _declaredVariables.get(name) : null;
     if (str == 'true') {
@@ -55,7 +55,7 @@ class FromEnvironmentEvaluator {
   DartObjectImpl getInt2(
     String? name,
     Map<String, DartObjectImpl> namedValues,
-    ConstructorElement constructor,
+    ConstructorElement2 constructor,
   ) {
     var str = name != null ? _declaredVariables.get(name) : null;
     if (str != null) {
@@ -98,7 +98,7 @@ class FromEnvironmentEvaluator {
   DartObjectImpl getString2(
     String? name,
     Map<String, DartObjectImpl> namedValues,
-    ConstructorElement constructor,
+    ConstructorElement2 constructor,
   ) {
     var str = name != null ? _declaredVariables.get(name) : null;
     if (str != null) {
@@ -138,9 +138,9 @@ class FromEnvironmentEvaluator {
   }
 
   static DartObjectImpl _defaultValueDefaultValue(
-      ConstructorElement constructor) {
-    return constructor.parameters
-        .singleWhere((parameter) => parameter.name == _defaultValue)
+      ConstructorElement2 constructor) {
+    return constructor.formalParameters
+        .singleWhere((parameter) => parameter.name3 == _defaultValue)
         .computeConstantValue() as DartObjectImpl;
   }
 }

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

@@ -6245,6 +6245,11 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
     return constructors.firstWhereOrNull((element) => element.name == name);
   }
 
+  @override
+  ConstructorElement2? getNamedConstructor2(String name) {
+    return constructors2.firstWhereOrNull((e) => e.name3 == name);
+  }
+
   @override
   InterfaceType instantiate({
     required List<DartType> typeArguments,

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

@@ -115,8 +115,7 @@ class ConstructorMember extends ExecutableMember
       superConstructor.asElement2 as ConstructorElement2;
 
   @override
-  ConstructorElement2 get _element2 =>
-      declaration.asElement2 as ConstructorElement2;
+  ConstructorElement2 get _element2 => declaration.asElement2;
 
   @override
   T? accept<T>(ElementVisitor<T> visitor) =>

pkg/analyzer/lib/src/test_utilities/mock_sdk_elements.dart

@@ -14,6 +14,7 @@ import 'package:analyzer/src/generated/engine.dart' as engine;
 import 'package:analyzer/src/generated/testing/element_factory.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
 import 'package:analyzer/src/summary2/reference.dart';
+import 'package:analyzer/src/utilities/extensions/string.dart';
 
 class MockSdkElements {
   final LibraryElementImpl coreLibrary;
@@ -992,6 +993,7 @@ class _MockSdkElementsBuilder {
     List<ParameterElement> parameters = const [],
   }) {
     var element = ConstructorElementImpl(name, 0);
+    element.name2 = name.ifNotEmptyOrElse('new');
     element.isFactory = isFactory;
     element.isConst = isConst;
     element.parameters = parameters;

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

@@ -28,6 +28,16 @@ extension CompilationUnitElementExtension on CompilationUnitElement {
   }
 }
 
+extension ConstructorElementExtension on ConstructorElement {
+  ConstructorElement2 get asElement2 {
+    return switch (this) {
+      ConstructorFragment(:var element) => element,
+      ConstructorMember member => member,
+      _ => throw UnsupportedError('Unsupported type: $runtimeType'),
+    };
+  }
+}
+
 extension Element2OrNullExtension on Element2? {
   Element? get asElement {
     var self = this;