[Elements.migrate] Migrate add_extension_override.dart

Change-Id: Id70be814e55899f62fffeb5d435ded3ba85d1278
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/398540
Commit-Queue: Keerti Parthasarathy <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: keertip

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -32,7 +32,6 @@ lib/src/services/completion/dart/declaration_helper.dart
 lib/src/services/completion/dart/identifier_helper.dart
 lib/src/services/completion/dart/in_scope_completion_pass.dart
 lib/src/services/completion/dart/visibility_tracker.dart
-lib/src/services/correction/dart/add_extension_override.dart
 lib/src/services/correction/dart/create_extension_member.dart
 lib/src/services/correction/dart/import_library.dart
 lib/src/services/correction/dart/use_different_division_operator.dart

pkg/analysis_server/lib/src/services/correction/dart/add_extension_override.dart

@@ -30,15 +30,15 @@ class AddExtensionOverride extends MultiCorrectionProducer {
     var dartFixContext = context.dartFixContext;
     if (dartFixContext == null) return const [];
 
-    var libraryFragment = dartFixContext.unitResult.unit.declaredElement!;
-    var libraryElement = libraryFragment.library;
+    var libraryFragment = dartFixContext.unitResult.unit.declaredFragment!;
+    var libraryElement = libraryFragment.element;
 
-    var nodeName = Name(libraryElement.source.uri, node.name);
-    var extensions = libraryFragment.accessibleExtensions
+    var nodeName = Name(libraryElement.uri, node.name);
+    var extensions = libraryFragment.accessibleExtensions2
         .havingMemberWithBaseName(nodeName);
     var producers = <ResolvedCorrectionProducer>[];
     for (var extension in extensions) {
-      var name = extension.extension.name;
+      var name = extension.extension.name3;
       if (name != null) {
         producers.add(_AddOverride(target, name, context: context));
       }

pkg/analyzer/lib/src/dart/resolver/applicable_extensions.dart

@@ -4,6 +4,7 @@
 
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/generic_inferrer.dart';
@@ -14,6 +15,7 @@ import 'package:analyzer/src/dart/element/type_algebra.dart';
 import 'package:analyzer/src/dart/resolver/extension_member_resolver.dart';
 import 'package:analyzer/src/dart/resolver/flow_analysis_visitor.dart';
 import 'package:analyzer/src/generated/inference_log.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 class InstantiatedExtensionWithMember {
   final _NotInstantiatedExtensionWithMember candidate;
@@ -49,6 +51,40 @@ class InstantiatedExtensionWithMember {
   }
 }
 
+class InstantiatedExtensionWithMember2 {
+  final _NotInstantiatedExtensionWithMember2 candidate;
+  final MapSubstitution substitution;
+  final DartType extendedType;
+
+  InstantiatedExtensionWithMember2(
+    this.candidate,
+    this.substitution,
+    this.extendedType,
+  );
+
+  ExtensionResolutionResult get asResolutionResult {
+    return SingleExtensionResolutionResult(getter: getter, setter: setter);
+  }
+
+  ExtensionElement2 get extension => candidate.extension;
+
+  ExecutableElement? get getter {
+    var getter = candidate.getter.asElement;
+    if (getter == null) {
+      return null;
+    }
+    return ExecutableMember.from2(getter, substitution);
+  }
+
+  ExecutableElement? get setter {
+    var setter = candidate.setter.asElement;
+    if (setter == null) {
+      return null;
+    }
+    return ExecutableMember.from2(setter, substitution);
+  }
+}
+
 class InstantiatedExtensionWithoutMember {
   final ExtensionElement extension;
   final MapSubstitution substitution;
@@ -72,6 +108,17 @@ abstract class _NotInstantiatedExtension<R> {
   });
 }
 
+abstract class _NotInstantiatedExtension2<R> {
+  final ExtensionElement2 extension;
+
+  _NotInstantiatedExtension2(this.extension);
+
+  R instantiate({
+    required MapSubstitution substitution,
+    required DartType extendedType,
+  });
+}
+
 class _NotInstantiatedExtensionWithMember
     extends _NotInstantiatedExtension<InstantiatedExtensionWithMember> {
   final ExecutableElement? getter;
@@ -90,6 +137,24 @@ class _NotInstantiatedExtensionWithMember
   }
 }
 
+class _NotInstantiatedExtensionWithMember2
+    extends _NotInstantiatedExtension2<InstantiatedExtensionWithMember2> {
+  final ExecutableElement2? getter;
+  final ExecutableElement2? setter;
+
+  _NotInstantiatedExtensionWithMember2(super.extension,
+      {this.getter, this.setter})
+      : assert(getter != null || setter != null);
+
+  @override
+  InstantiatedExtensionWithMember2 instantiate({
+    required MapSubstitution substitution,
+    required DartType extendedType,
+  }) {
+    return InstantiatedExtensionWithMember2(this, substitution, extendedType);
+  }
+}
+
 /// [_NotInstantiatedExtension] for any [ExtensionElement].
 class _NotInstantiatedExtensionWithoutMember
     extends _NotInstantiatedExtension<InstantiatedExtensionWithoutMember> {
@@ -180,6 +245,74 @@ extension ExtensionsExtensions on Iterable<ExtensionElement> {
   }
 }
 
+extension ExtensionsExtensions2 on Iterable<ExtensionElement2> {
+  /// Returns the sublist of [ExtensionElement2]s that have an instance member
+  /// named [baseName].
+  List<_NotInstantiatedExtensionWithMember2> havingMemberWithBaseName(
+    Name baseName,
+  ) {
+    var result = <_NotInstantiatedExtensionWithMember2>[];
+    for (var extension in this) {
+      if (baseName.name == '[]') {
+        ExecutableElement2? getter;
+        ExecutableElement2? setter;
+        for (var method in extension.getters2) {
+          if (method.name3 == '[]') {
+            getter = method;
+          }
+        }
+        for (var method in extension.setters2) {
+          if (method.name3 == '[]=') {
+            setter = method;
+          }
+        }
+        if (getter != null || setter != null) {
+          result.add(
+            _NotInstantiatedExtensionWithMember2(
+              extension,
+              getter: getter,
+              setter: setter,
+            ),
+          );
+        }
+      } else {
+        for (var field in extension.fields2) {
+          if (field.isStatic) {
+            continue;
+          }
+          var fieldName = Name(extension.library2.uri, field.displayName);
+          if (fieldName == baseName) {
+            result.add(
+              _NotInstantiatedExtensionWithMember2(
+                extension,
+                getter: field.getter2,
+                setter: field.setter2,
+              ),
+            );
+            break;
+          }
+        }
+        for (var method in extension.methods2) {
+          if (method.isStatic) {
+            continue;
+          }
+          var methodName = Name(extension.library2.uri, method.displayName);
+          if (methodName == baseName) {
+            result.add(
+              _NotInstantiatedExtensionWithMember2(
+                extension,
+                getter: method,
+              ),
+            );
+            break;
+          }
+        }
+      }
+    }
+    return result;
+  }
+}
+
 extension NotInstantiatedExtensionsExtensions<R>
     on Iterable<_NotInstantiatedExtension<R>> {
   /// Extensions that can be applied, within [targetLibrary], to [targetType].