Elements. Migrate lib/src/generated/resolver.dart

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

Author: scheglov

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

@@ -8287,24 +8287,16 @@ sealed class FunctionBodyImpl extends AstNodeImpl implements FunctionBody {
 
   @override
   bool isPotentiallyMutatedInScope(VariableElement variable) {
-    if (localVariableInfo == null) {
-      throw StateError('Resolution has not been performed');
-    }
-    return localVariableInfo!.potentiallyMutatedInScope.contains(variable);
+    var v2 = (variable as VariableElementImpl).element;
+    return isPotentiallyMutatedInScope2(v2);
   }
 
-  @experimental
   @override
   bool isPotentiallyMutatedInScope2(VariableElement2 variable) {
-    return switch (variable) {
-      LocalVariableElementImpl2() =>
-        isPotentiallyMutatedInScope(variable.wrappedElement),
-      VariableElement() =>
-        isPotentiallyMutatedInScope(variable as VariableElement),
-      FormalParameterElement(:VariableElement firstFragment) =>
-        isPotentiallyMutatedInScope(firstFragment),
-      _ => false,
-    };
+    if (localVariableInfo == null) {
+      throw StateError('Resolution has not been performed');
+    }
+    return localVariableInfo!.potentiallyMutatedInScope.contains(variable);
   }
 
   /// Dispatch this function body to the resolver, imposing [imposedType] as the
@@ -9156,6 +9148,10 @@ final class GenericFunctionTypeImpl extends TypeAnnotationImpl
   @override
   Token get beginToken => _returnType?.beginToken ?? functionKeyword;
 
+  GenericFunctionTypeElementImpl? get declaredFragment {
+    return declaredElement;
+  }
+
   @override
   Token get endToken => question ?? _parameters.endToken;
 
@@ -11480,7 +11476,7 @@ sealed class LiteralImpl extends ExpressionImpl implements Literal {
 class LocalVariableInfo {
   /// The set of local variables and parameters that are potentially mutated
   /// within the scope of their declarations.
-  final Set<VariableElement> potentiallyMutatedInScope = <VariableElement>{};
+  final Set<VariableElement2> potentiallyMutatedInScope = {};
 }
 
 /// A logical-and pattern.
@@ -14075,13 +14071,11 @@ final class PatternFieldImpl extends AstNodeImpl implements PatternField {
   @experimental
   @override
   Element2? get element2 {
-    var element = this.element;
-    if (element case Fragment fragment) {
-      return fragment.element;
-    } else if (element case Element2 element) {
-      return element;
-    }
-    return null;
+    return element?.asElement2;
+  }
+
+  set element2(Element2? value) {
+    element = value?.asElement;
   }
 
   @override
@@ -15355,6 +15349,10 @@ final class RelationalPatternImpl extends DartPatternImpl
     return null;
   }
 
+  set element2(MethodElement2? value) {
+    element = value?.asElement;
+  }
+
   @override
   Token get endToken => operand.endToken;
 

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

@@ -5446,7 +5446,7 @@ class GenericFunctionTypeElementImpl extends _ExistingElementImpl
   }
 
   @override
-  GenericFunctionTypeElement2 get element => _element2;
+  GenericFunctionTypeElementImpl2 get element => _element2;
 
   @override
   Fragment? get enclosingFragment => enclosingElement3 as Fragment;
@@ -9869,6 +9869,10 @@ class PatternVariableElementImpl2 extends LocalVariableElementImpl2
     ];
   }
 
+  /// This flag is set to `true` while we are visiting the [WhenClause] of
+  /// the [GuardedPattern] that declares this variable.
+  bool get isVisitingWhenClause => _wrappedElement.isVisitingWhenClause;
+
   /// This flag is set to `true` while we are visiting the [WhenClause] of
   /// the [GuardedPattern] that declares this variable.
   set isVisitingWhenClause(bool value) =>

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

@@ -12,6 +12,7 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/generated/utilities_dart.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer/src/utilities/extensions/string.dart';
 import 'package:meta/meta_meta.dart';
 
@@ -79,7 +80,7 @@ extension Element2Extension on Element2 {
             (this is FormalParameterElement &&
                 this is! FieldFormalParameterElement2 &&
                 this is! SuperFormalParameterElement2)) &&
-        library2.hasWildcardVariablesFeatureEnabled2;
+        library2.hasWildcardVariablesFeatureEnabled;
   }
 }
 
@@ -193,7 +194,7 @@ extension ElementExtension on Element {
             (this is ParameterElement &&
                 this is! FieldFormalParameterElement &&
                 this is! SuperFormalParameterElement)) &&
-        library.hasWildcardVariablesFeatureEnabled;
+        library.asElement2.hasWildcardVariablesFeatureEnabled;
   }
 }
 
@@ -252,15 +253,8 @@ extension InterfaceTypeExtension on InterfaceType {
   }
 }
 
-extension LibraryExtension on LibraryElement? {
-  bool get hasWildcardVariablesFeatureEnabled {
-    var self = this;
-    return self?.featureSet.isEnabled(Feature.wildcard_variables) ?? false;
-  }
-}
-
 extension LibraryExtension2 on LibraryElement2? {
-  bool get hasWildcardVariablesFeatureEnabled2 =>
+  bool get hasWildcardVariablesFeatureEnabled =>
       this?.featureSet.isEnabled(Feature.wildcard_variables) ?? false;
 }