Elements. Migrate AstBinaryReader.

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

Author: scheglov

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

@@ -2553,7 +2553,7 @@ class ElementAnnotationImpl implements ElementAnnotation {
 }
 
 /// A base class for concrete implementations of an [Element] or [Element2].
-abstract class ElementImpl implements Element, Element2 {
+abstract class ElementImpl implements Element, Element2, ElementOrMember {
   static const _metadataFlag_isReady = 1 << 0;
   static const _metadataFlag_hasDeprecated = 1 << 1;
   static const _metadataFlag_hasOverride = 1 << 2;
@@ -3613,6 +3613,10 @@ class ElementLocationImpl implements ElementLocation {
   }
 }
 
+/// A shared internal interface of [Element] and [Member].
+/// Used during migration to avoid referencing [Element].
+abstract class ElementOrMember {}
+
 /// An [InterfaceElementImpl] which is an enum.
 class EnumElementImpl extends InterfaceElementImpl
     implements EnumElement, EnumFragment {
@@ -3958,7 +3962,8 @@ abstract class ExecutableElementImpl2 extends FunctionTypedElementImpl2
 
 /// Common base class for all analyzer-internal classes that implement
 /// `ExecutableElement`.
-abstract class ExecutableElementOrMember implements ExecutableElement {
+abstract class ExecutableElementOrMember
+    implements ExecutableElement, ElementOrMember {
   @override
   List<ParameterElementMixin> get parameters;
 

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

@@ -797,7 +797,7 @@ class GetterMember extends PropertyAccessorMember
 
 /// An element defined in a parameterized type where the values of the type
 /// parameters are known.
-abstract class Member implements Element {
+abstract class Member implements Element, ElementOrMember {
   /// The element on which the parameterized element was created.
   final Element _declaration;
 

pkg/analyzer/lib/src/summary2/ast_binary_reader.dart

@@ -2,11 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// ignore_for_file: analyzer_use_new_elements
-
 import 'package:_fe_analyzer_shared/src/scanner/string_canonicalizer.dart';
 import 'package:analyzer/dart/ast/token.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/ast/token.dart';
@@ -19,7 +16,6 @@ import 'package:analyzer/src/summary2/ast_binary_tag.dart';
 import 'package:analyzer/src/summary2/ast_binary_tokens.dart';
 import 'package:analyzer/src/summary2/bundle_reader.dart';
 import 'package:analyzer/src/summary2/unlinked_token_type.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:collection/collection.dart';
 
 /// Deserializer of ASTs.
@@ -496,13 +492,13 @@ class AstBinaryReader {
   ExtensionOverride _readExtensionOverride() {
     var importPrefix = _readOptionalNode() as ImportPrefixReferenceImpl?;
     var extensionName = _readStringReference();
-    var element = _reader.readElement() as ExtensionElement;
+    var element = _reader.readElement2() as ExtensionElementImpl2;
     var typeArguments = _readOptionalNode() as TypeArgumentListImpl?;
     var argumentList = readNode() as ArgumentListImpl;
     var node = ExtensionOverrideImpl(
       importPrefix: importPrefix,
       name: StringToken(TokenType.STRING, extensionName, -1),
-      element2: element.asElement2,
+      element2: element,
       argumentList: argumentList,
       typeArguments: typeArguments,
     );
@@ -712,11 +708,11 @@ class AstBinaryReader {
     var expression = readNode() as ExpressionImpl;
     var typeArguments = _readOptionalNode() as TypeArgumentListImpl?;
     var typeArgumentTypes = _reader.readOptionalTypeList()!;
-    var staticElement = _reader.readElement() as MethodElement;
+    var staticElement = _reader.readElement2() as MethodElementImpl2;
 
     var node = ImplicitCallReferenceImpl(
       expression: expression,
-      element: staticElement.asElement2,
+      element: staticElement,
       typeArguments: typeArguments,
       typeArgumentTypes: typeArgumentTypes,
     );

pkg/analyzer/lib/src/summary2/bundle_reader.dart

@@ -1980,7 +1980,7 @@ class ResolutionReader {
     return _reader.readDouble();
   }
 
-  Element? readElement() {
+  ElementOrMember? readElement() {
     var memberFlags = _reader.readByte();
     var element = _readRawElement();
 
@@ -1989,7 +1989,7 @@ class ResolutionReader {
     }
 
     if (memberFlags == Tag.RawElement) {
-      return element;
+      return element as ElementOrMember;
     }
 
     if (memberFlags == Tag.MemberWithTypeArguments) {
@@ -2040,14 +2040,15 @@ class ResolutionReader {
     }
 
     if (memberFlags == Tag.MemberWithTypeArguments) {
-      return element;
+      return element as ElementOrMember;
     }
 
     throw UnimplementedError('memberFlags: $memberFlags');
   }
 
   Element2? readElement2() {
-    return readElement()?.asElement2;
+    var element = readElement() as Element?;
+    return element?.asElement2;
   }
 
   List<T> readElementList<T extends Element>() {