Elements. Migrate InstantiatedExtensionWithMember and related.

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

Author: scheglov

pkg/analyzer/lib/error/listener.dart

@@ -196,6 +196,7 @@ class ErrorReporter {
           .whereNotType<String>()
           .whereNotType<DartType>()
           .whereNotType<Element>()
+          .whereNotType<Element2>()
           .whereNotType<int>()
           .whereNotType<Uri>();
       if (invalid.isNotEmpty) {
@@ -275,6 +276,9 @@ class ErrorReporter {
     var typeGroups = <String, List<_ToConvert>>{};
     for (var i = 0; i < arguments.length; i++) {
       var argument = arguments[i];
+      if (argument is Element2 && argument is! Element) {
+        argument = argument.asElement;
+      }
       if (argument is TypeImpl) {
         var displayName = argument.getDisplayString(preferTypeAlias: true);
         var types = typeGroups.putIfAbsent(displayName, () => []);

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

@@ -1390,18 +1390,25 @@ class Name {
   /// If the element is private, the name includes the library URI.
   ///
   /// If the name is a setter, the name ends with `=`.
-  static Name? forElement(ExecutableElement2 element) {
+  static Name? forElement(Element2 element) {
     var name = element.name3;
     if (name == null) {
       return null;
     }
 
+    // TODO(scheglov): use lookupName
+    if (element is MethodElement2 &&
+        name == '-' &&
+        element.formalParameters.isEmpty) {
+      name = 'unary-';
+    }
+
     if (element is SetterElement) {
       name = '$name=';
     }
 
     if (name.startsWith('_')) {
-      var libraryUri = element.firstFragment.libraryFragment.source.uri;
+      var libraryUri = element.firstFragment.libraryFragment!.source.uri;
       return Name(libraryUri, name);
     } else {
       return Name(null, name);