Elements. Stop referencing Element in Reference.

Change-Id: Ib5fe940ec9260c45fffea10fedf083b59e3ba2c3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412343
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Paul Berry <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/analysis/library_context.dart

@@ -2,8 +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
-
 /// @docImport 'package:analyzer/src/generated/engine.dart';
 library;
 
@@ -12,7 +10,6 @@ import 'dart:collection';
 import 'dart:typed_data';
 
 import 'package:analyzer/dart/analysis/declared_variables.dart';
-import 'package:analyzer/dart/element/element.dart' show CompilationUnitElement;
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/context/context.dart';
 import 'package:analyzer/src/dart/analysis/analysis_options_map.dart';
@@ -100,7 +97,7 @@ class LibraryContext {
     }
   }
 
-  /// Computes a [CompilationUnitElement] for the given library/unit pair.
+  /// Computes a [CompilationUnitElementImpl] for the given library/unit pair.
   CompilationUnitElementImpl computeUnitElement(
     LibraryFileKind library,
     FileState unit,

pkg/analyzer/lib/src/summary2/linked_element_factory.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 'dart:collection';
 
-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/session.dart';
@@ -180,9 +177,9 @@ class LinkedElementFactory {
   }
 
   // TODO(scheglov): Why would this method return `null`?
-  Element? elementOfReference(Reference reference) {
-    if (reference.element != null) {
-      return reference.element;
+  ElementImpl? elementOfReference(Reference reference) {
+    if (reference.element case var element?) {
+      return element;
     }
     if (reference.parent == null) {
       return null;
@@ -298,5 +295,5 @@ class LinkedElementFactory {
     libraryElement.hasTypeProviderSystemSet = true;
   }
 
-  void _disposeLibrary(Element? libraryElement) {}
+  void _disposeLibrary(ElementImpl? libraryElement) {}
 }

pkg/analyzer/lib/src/summary2/reference.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 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
+import 'package:analyzer/src/dart/element/element.dart';
 import 'package:meta/meta.dart';
 
-/// Indirection between a name and the corresponding [Element].
+/// Indirection between a name and the corresponding [ElementImpl].
 ///
 /// References are organized in a prefix tree.
-/// Each reference knows its parent, children, and the [Element].
+/// Each reference knows its parent, children, and the [ElementImpl].
 ///
 ///      Library:
 ///         URI of library
@@ -26,7 +24,7 @@ import 'package:meta/meta.dart';
 ///         "@method"
 ///         Name of the method
 ///
-/// There is only one reference object per [Element].
+/// There is only one reference object per [ElementImpl].
 class Reference {
   /// The name of the container used for duplicate declarations.
   static const _defName = '@def';
@@ -37,8 +35,8 @@ class Reference {
   /// The simple name of the reference in its [parent].
   String name;
 
-  /// The corresponding [Element], or `null` if a named container.
-  Element? element;
+  /// The corresponding [ElementImpl], or `null` if a named container.
+  ElementImpl? element;
 
   /// The corresponding [Element2], or `null` if a named container.
   Element2? element2;