Elements. Use ElementImpl in few link libraries.

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

Author: scheglov

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

@@ -9315,11 +9315,12 @@ abstract class NonParameterVariableElementImpl extends VariableElementImpl
   NonParameterVariableElementImpl(super.name, super.offset);
 
   @override
-  Element get enclosingElement3 =>
-      // TODO(paulberry): `!` is not appropriate here because variable elements
-      // aren't guaranteed to have enclosing elements. See
-      // https://github.com/dart-lang/sdk/issues/59750.
-      super.enclosingElement3!;
+  ElementImpl get enclosingElement3 {
+    // TODO(paulberry): `!` is not appropriate here because variable elements
+    // aren't guaranteed to have enclosing elements. See
+    // https://github.com/dart-lang/sdk/issues/59750.
+    return super.enclosingElement3 as ElementImpl;
+  }
 
   bool get hasInitializer {
     return hasModifier(Modifier.HAS_INITIALIZER);
@@ -10147,7 +10148,7 @@ class PropertyAccessorElementImpl_ImplicitGetter extends GetterFragmentImpl {
 
   @override
   ElementImpl get enclosingElement3 {
-    return variable2.enclosingElement3 as ElementImpl;
+    return variable2.enclosingElement3;
   }
 
   @override
@@ -10215,7 +10216,7 @@ class PropertyAccessorElementImpl_ImplicitSetter extends SetterFragmentImpl {
 
   @override
   ElementImpl get enclosingElement3 {
-    return variable2.enclosingElement3 as ElementImpl;
+    return variable2.enclosingElement3;
   }
 
   @override

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

@@ -2,9 +2,6 @@
 // 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:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/scope.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -24,14 +21,14 @@ class DefaultValueResolver {
       : _typeSystem = _libraryBuilder.element.typeSystem;
 
   void resolve() {
-    for (var unitElement in _libraryBuilder.element.units.impl) {
-      _UnitContext(unitElement)
-        ..forEach(unitElement.classes, _interface)
-        ..forEach(unitElement.enums, _interface)
-        ..forEach(unitElement.extensions, _extension)
-        ..forEach(unitElement.extensionTypes, _interface)
-        ..forEach(unitElement.functions, _executable)
-        ..forEach(unitElement.mixins, _interface);
+    for (var libraryFragment in _libraryBuilder.element.fragments) {
+      _UnitContext(libraryFragment)
+        ..forEach(libraryFragment.classes, _interface)
+        ..forEach(libraryFragment.enums, _interface)
+        ..forEach(libraryFragment.extensions, _extension)
+        ..forEach(libraryFragment.extensionTypes, _interface)
+        ..forEach(libraryFragment.functions, _executable)
+        ..forEach(libraryFragment.mixins, _interface);
     }
   }
 
@@ -40,7 +37,7 @@ class DefaultValueResolver {
     _executable(context, element);
   }
 
-  DefaultFormalParameterImpl? _defaultParameter(ParameterElement element) {
+  DefaultFormalParameterImpl? _defaultParameter(ParameterElementImpl element) {
     var node = _linker.getLinkingNode(element);
     if (node is DefaultFormalParameterImpl && node.defaultValue != null) {
       return node;
@@ -67,7 +64,7 @@ class DefaultValueResolver {
       ..forEach(element.methods, _executable);
   }
 
-  void _parameter(_ExecutableContext context, ParameterElement parameter) {
+  void _parameter(_ExecutableContext context, ParameterElementImpl parameter) {
     // If a function typed parameter, process nested parameters.
     context.forEach(parameter.parameters, _parameter);
 
@@ -79,7 +76,7 @@ class DefaultValueResolver {
     var analysisOptions = _libraryBuilder.kind.file.analysisOptions;
     var astResolver = AstResolver(
       _linker,
-      context.unitElement,
+      context.libraryFragment,
       context.scope,
       analysisOptions,
       enclosingClassElement: context.classElement?.asElement2,
@@ -89,7 +86,7 @@ class DefaultValueResolver {
         contextType: contextType);
   }
 
-  Scope _scopeFromElement(Element element) {
+  Scope _scopeFromElement(ElementImpl element) {
     var node = _linker.getLinkingNode(element)!;
     return LinkingNodeContext.get(node).scope;
   }
@@ -104,15 +101,15 @@ class _ClassContext extends _Context {
   _ClassContext(this.unitContext, this.classElement);
 
   @override
-  CompilationUnitElementImpl get unitElement {
-    return unitContext.unitElement;
+  CompilationUnitElementImpl get libraryFragment {
+    return unitContext.libraryFragment;
   }
 }
 
 abstract class _Context {
   InterfaceElementImpl? get classElement => null;
 
-  CompilationUnitElementImpl get unitElement;
+  CompilationUnitElementImpl get libraryFragment;
 }
 
 class _ExecutableContext extends _Context {
@@ -132,22 +129,16 @@ class _ExecutableContext extends _Context {
   }
 
   @override
-  CompilationUnitElementImpl get unitElement {
-    return enclosingContext.unitElement;
+  CompilationUnitElementImpl get libraryFragment {
+    return enclosingContext.libraryFragment;
   }
 }
 
 class _UnitContext extends _Context {
   @override
-  final CompilationUnitElementImpl unitElement;
-
-  _UnitContext(this.unitElement);
-}
+  final CompilationUnitElementImpl libraryFragment;
 
-extension on List<CompilationUnitElement> {
-  List<CompilationUnitElementImpl> get impl {
-    return cast();
-  }
+  _UnitContext(this.libraryFragment);
 }
 
 extension _ContextExtension<C extends _Context> on C {

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

@@ -2,16 +2,14 @@
 // 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 'dart:typed_data';
 
 import 'package:analyzer/dart/analysis/declared_variables.dart';
 import 'package:analyzer/dart/ast/ast.dart' as ast;
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/context/context.dart';
 import 'package:analyzer/src/dart/analysis/file_state.dart';
+import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/dart/element/name_union.dart';
 import 'package:analyzer/src/fine/library_manifest.dart';
@@ -87,7 +85,7 @@ class Linker {
 
   /// If the [element] is part of a library being linked, return the node
   /// from which it was created.
-  ast.AstNode? getLinkingNode(Element element) {
+  ast.AstNode? getLinkingNode(ElementImpl element) {
     return elementNodes[element];
   }
 

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

@@ -2,9 +2,6 @@
 // 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:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/scope.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
@@ -27,8 +24,8 @@ class ConstantInitializersResolver {
   final Linker linker;
 
   late LibraryBuilder _libraryBuilder;
-  late CompilationUnitElementImpl _unitElement;
-  late LibraryElement _library;
+  late CompilationUnitElementImpl _libraryFragment;
+  late LibraryElementImpl _library;
   late Scope _scope;
 
   ConstantInitializersResolver(this.linker);
@@ -37,35 +34,33 @@ class ConstantInitializersResolver {
     for (var builder in linker.builders.values) {
       _library = builder.element;
       _libraryBuilder = builder;
-      for (var unit in _library.units) {
-        _unitElement = unit as CompilationUnitElementImpl;
-        unit.classes.forEach(_resolveInterfaceFields);
-        unit.enums.forEach(_resolveInterfaceFields);
-        unit.extensions.forEach(_resolveExtensionFields);
-        unit.extensionTypes.forEach(_resolveInterfaceFields);
-        unit.mixins.forEach(_resolveInterfaceFields);
-
-        _scope = unit.scope;
-        unit.topLevelVariables.forEach(_resolveVariable);
+      for (var libraryFragment in _library.fragments) {
+        _libraryFragment = libraryFragment;
+        libraryFragment.classes.forEach(_resolveInterfaceFields);
+        libraryFragment.enums.forEach(_resolveInterfaceFields);
+        libraryFragment.extensions.forEach(_resolveExtensionFields);
+        libraryFragment.extensionTypes.forEach(_resolveInterfaceFields);
+        libraryFragment.mixins.forEach(_resolveInterfaceFields);
+
+        _scope = libraryFragment.scope;
+        libraryFragment.topLevelVariables.forEach(_resolveVariable);
       }
     }
   }
 
-  void _resolveExtensionFields(ExtensionElement extension_) {
+  void _resolveExtensionFields(ExtensionElementImpl extension_) {
     var node = linker.getLinkingNode(extension_)!;
     _scope = LinkingNodeContext.get(node).scope;
     extension_.fields.forEach(_resolveVariable);
   }
 
-  void _resolveInterfaceFields(InterfaceElement class_) {
+  void _resolveInterfaceFields(InterfaceElementImpl class_) {
     var node = linker.getLinkingNode(class_)!;
     _scope = LinkingNodeContext.get(node).scope;
     class_.fields.forEach(_resolveVariable);
   }
 
-  void _resolveVariable(PropertyInducingElement element) {
-    element as PropertyInducingElementImpl;
-
+  void _resolveVariable(PropertyInducingElementImpl element) {
     if (element is FieldElementImpl && element.isEnumConstant) {
       return;
     }
@@ -81,7 +76,7 @@ class ConstantInitializersResolver {
     var analysisOptions = _libraryBuilder.kind.file.analysisOptions;
     var astResolver = AstResolver(
       linker,
-      _unitElement,
+      _libraryFragment,
       _scope,
       analysisOptions,
     );
@@ -155,21 +150,19 @@ class _InitializerInference {
     }
   }
 
-  void _addClassElementFields(InterfaceElement class_) {
+  void _addClassElementFields(InterfaceElementImpl class_) {
     var node = _linker.getLinkingNode(class_)!;
     _scope = LinkingNodeContext.get(node).scope;
     class_.fields.forEach(_addVariableNode);
   }
 
-  void _addExtensionElementFields(ExtensionElement extension_) {
+  void _addExtensionElementFields(ExtensionElementImpl extension_) {
     var node = _linker.getLinkingNode(extension_)!;
     _scope = LinkingNodeContext.get(node).scope;
     extension_.fields.forEach(_addVariableNode);
   }
 
-  void _addVariableNode(PropertyInducingElement element) {
-    element as PropertyInducingElementImpl;
-
+  void _addVariableNode(PropertyInducingElementImpl element) {
     if (element.isSynthetic &&
         !(element is FieldElementImpl && element.isSyntheticEnumField)) {
       return;

pkg/analyzer/test/src/summary/element_text.dart

@@ -2534,9 +2534,9 @@ class _ElementWriter extends _AbstractElementWriter {
     } else {
       var enclosing = variable!.enclosingElement3;
       switch (enclosing) {
-        case CompilationUnitElement():
+        case CompilationUnitElementImpl():
           expect(enclosing.topLevelVariables, contains(variable));
-        case InterfaceElement():
+        case InterfaceElementImpl():
           expect(enclosing.fields, contains(variable));
       }
     }