Elements. Deprecates in src/dart/resolver/scope.dart

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

Author: scheglov

pkg/analyzer/api.txt

@@ -4182,6 +4182,7 @@ package:analyzer/dart/element/element2.dart:
     previousFragment (getter: SuperFormalParameterFragment?)
   TopLevelFunctionElement (class extends Object implements ExecutableElement2, HasSinceSdkVersion):
     LOAD_LIBRARY_NAME (static getter: String)
+    MAIN_FUNCTION_NAME (static getter: String)
     new (constructor: TopLevelFunctionElement Function())
     baseElement (getter: TopLevelFunctionElement)
     firstFragment (getter: TopLevelFunctionFragment)
@@ -5239,11 +5240,11 @@ package:analyzer/src/dart/resolver/scope.dart:
     EMPTY (static getter: Namespace)
     EMPTY= (static setter: Namespace)
     new (constructor: Namespace Function(Map<String, Element2>))
-    definedNames (getter: Map<String, Element>)
+    definedNames (getter: Map<String, Element>, deprecated)
     definedNames2 (getter: Map<String, Element2>)
-    get (method: Element? Function(String))
+    get (method: Element? Function(String), deprecated)
     get2 (method: Element2? Function(String))
-    getPrefixed (method: Element? Function(String, String))
+    getPrefixed (method: Element? Function(String, String), deprecated)
     getPrefixed2 (method: Element2? Function(String, String))
 package:analyzer/src/generated/engine.dart:
   AnalysisContext@2 (class extends Object):

pkg/analyzer/lib/dart/element/element2.dart

@@ -2728,6 +2728,9 @@ abstract class SuperFormalParameterFragment implements FormalParameterFragment {
 /// Clients may not extend, implement or mix-in this class.
 abstract class TopLevelFunctionElement
     implements ExecutableElement2, HasSinceSdkVersion {
+  /// The name of the function used as an entry point.
+  static const String MAIN_FUNCTION_NAME = "main";
+
   /// The name of the synthetic function defined for libraries that are
   /// deferred.
   static final String LOAD_LIBRARY_NAME = "loadLibrary";

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

@@ -100,7 +100,7 @@ import 'package:meta/meta.dart';
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 444;
+  static const int DATA_VERSION = 445;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

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

@@ -7026,7 +7026,7 @@ class LibraryElementImpl extends ElementImpl
 
   /// The entry point for this library, or `null` if this library does not have
   /// an entry point.
-  FunctionElement? _entryPoint;
+  TopLevelFunctionElement? _entryPoint;
 
   /// The provider for the synthetic function `loadLibrary` that is defined
   /// for this library.
@@ -7126,20 +7126,22 @@ class LibraryElementImpl extends ElementImpl
     return _definingCompilationUnit;
   }
 
+  @Deprecated('Use entryPoint2 instead')
   @override
   FunctionElement? get entryPoint {
+    return entryPoint2?.asElement;
+  }
+
+  @override
+  TopLevelFunctionElement? get entryPoint2 {
     linkedData?.read(this);
     return _entryPoint;
   }
 
-  set entryPoint(FunctionElement? entryPoint) {
-    _entryPoint = entryPoint;
+  set entryPoint2(TopLevelFunctionElement? value) {
+    _entryPoint = value;
   }
 
-  @override
-  TopLevelFunctionElement? get entryPoint2 =>
-      entryPoint.asElement2 as TopLevelFunctionElement?;
-
   @override
   List<LibraryElementImpl> get exportedLibraries {
     return fragments

pkg/analyzer/lib/src/dart/micro/utils.dart

@@ -12,46 +12,6 @@ import 'package:analyzer/src/dart/ast/element_locator.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
 
-/// Return the [Element] of the given [node], or `null` if [node] is `null` or
-/// does not have an element.
-Element? getElementOfNode(AstNode? node) {
-  if (node == null) {
-    return null;
-  }
-  if (node is SimpleIdentifier && node.parent is LibraryIdentifier) {
-    node = node.parent;
-  }
-  if (node is LibraryIdentifier) {
-    node = node.parent;
-  }
-  if (node is StringLiteral && node.parent is UriBasedDirective) {
-    return null;
-  }
-
-  ElementImpl? element;
-  switch (node) {
-    case ExportDirectiveImpl():
-      element = node.libraryExport;
-    case ImportDirectiveImpl():
-      element = node.libraryImport;
-    case PartOfDirectiveImpl():
-      element = node.element;
-    default:
-      element = ElementLocator.locate2(node).asElement as ElementImpl;
-  }
-
-  if (node is SimpleIdentifier && element is PrefixElement) {
-    var parent = node.parent;
-    if (parent is ImportDirectiveImpl) {
-      element = parent.libraryImport;
-    } else {
-      element = _getImportElementInfo(node) as LibraryImportElementImpl;
-    }
-  }
-
-  return element;
-}
-
 /// Return the [Element] of the given [node], or `null` if [node] is `null` or
 /// does not have an element.
 Element2? getElementOfNode2(AstNode? node) {
@@ -118,110 +78,6 @@ ConstructorElement? _getActualConstructorElement(
   return constructor;
 }
 
-/// Returns the [LibraryImportElement] that declared [prefix] and imports [element].
-///
-/// [libraryFragment] - the [CompilationUnitElementImpl] where reference is.
-/// [prefix] - the import prefix, maybe `null`.
-/// [element] - the referenced element.
-/// [importElementsMap] - the cache of [Element]s imported by [LibraryImportElement]s.
-LibraryImportElement? _getImportElement(
-    CompilationUnitElementImpl libraryFragment,
-    String prefix,
-    Element element,
-    Map<LibraryImportElement, Set<Element>> importElementsMap) {
-  if (element.enclosingElement3 is! CompilationUnitElement) {
-    return null;
-  }
-  var usedLibrary = element.library;
-  // find ImportElement that imports used library with used prefix
-  List<LibraryImportElement>? candidates;
-  var libraryImports = libraryFragment.withEnclosing
-      .expand((fragment) => fragment.libraryImports)
-      .toList();
-  for (var importElement in libraryImports) {
-    // required library
-    if (importElement.importedLibrary != usedLibrary) {
-      continue;
-    }
-    // required prefix
-    var prefixElement = importElement.prefix?.element;
-    if (prefixElement == null) {
-      continue;
-    }
-    if (prefix != prefixElement.name) {
-      continue;
-    }
-    // no combinators => only possible candidate
-    if (importElement.combinators.isEmpty) {
-      return importElement;
-    }
-    // OK, we have candidate
-    candidates ??= [];
-    candidates.add(importElement);
-  }
-  // no candidates, probably element is defined in this library
-  if (candidates == null) {
-    return null;
-  }
-  // one candidate
-  if (candidates.length == 1) {
-    return candidates[0];
-  }
-  // ensure that each ImportElement has set of elements
-  for (var importElement in candidates) {
-    if (importElementsMap.containsKey(importElement)) {
-      continue;
-    }
-    var namespace = importElement.namespace;
-    var elements = Set<Element>.from(namespace.definedNames.values);
-    importElementsMap[importElement] = elements;
-  }
-  // use import namespace to choose correct one
-  for (var entry in importElementsMap.entries) {
-    var importElement = entry.key;
-    var elements = entry.value;
-    if (elements.contains(element)) {
-      return importElement;
-    }
-  }
-  // not found
-  return null;
-}
-
-/// Returns the [LibraryImportElement] that is referenced by [prefixNode] with a
-/// [PrefixElement], maybe `null`.
-LibraryImportElement? _getImportElementInfo(SimpleIdentifier prefixNode) {
-  // prepare environment
-  var parent = prefixNode.parent;
-  var unit = prefixNode.thisOrAncestorOfType<CompilationUnitImpl>();
-  var libraryFragment = unit?.declaredFragment;
-  if (libraryFragment == null) {
-    return null;
-  }
-  // prepare used element
-  Element? usedElement;
-  if (parent is PrefixedIdentifier) {
-    var prefixed = parent;
-    if (prefixed.prefix == prefixNode) {
-      usedElement = prefixed.element?.asElement;
-    }
-  } else if (parent is MethodInvocation) {
-    var invocation = parent;
-    if (invocation.target == prefixNode) {
-      usedElement = invocation.methodName.element?.asElement;
-    }
-  }
-  // we need used Element
-  if (usedElement == null) {
-    return null;
-  }
-  // find ImportElement
-  var prefix = prefixNode.name;
-  var importElementsMap = <LibraryImportElement, Set<Element>>{};
-  return _getImportElement(
-      libraryFragment, prefix, usedElement, importElementsMap);
-}
-
 /// Returns the [LibraryImportElement] that is referenced by [prefixNode] with a
 /// [PrefixElement], maybe `null`.
 MockLibraryImportElement? _getImportElementInfo2(SimpleIdentifier prefixNode) {
@@ -341,8 +197,7 @@ MockLibraryImportElement? _getMockImportElement(
       continue;
     }
     var namespace = importElement.namespace;
-    var elements = Set<Element2>.from(
-        namespace.definedNames.values.map((e) => e.asElement2));
+    var elements = namespace.definedNames2.values.toSet();
     importElementsMap[importElement] = elements;
   }
   // use import namespace to choose correct one

pkg/analyzer/lib/src/dart/resolver/scope.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, as_much_as_we_can
-
 import 'package:_fe_analyzer_shared/src/base/analyzer_public_api.dart';
 import 'package:_fe_analyzer_shared/src/scanner/string_canonicalizer.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -127,6 +125,7 @@ class Namespace {
 
   /// Return a table containing the same mappings as those defined by this
   /// namespace.
+  @Deprecated('Use definedNames2 instead')
   Map<String, Element> get definedNames =>
       _definedNames.mapValue((e) => e.asElement!);
 
@@ -136,6 +135,7 @@ class Namespace {
 
   /// Return the element in this namespace that is available to the containing
   /// scope using the given name, or `null` if there is no such element.
+  @Deprecated('Use get2() instead')
   Element? get(String name) => _definedNames[name]?.asElement;
 
   /// Return the element in this namespace that is available to the containing
@@ -145,6 +145,7 @@ class Namespace {
   /// Return the element in this namespace whose name is the result of combining
   /// the [prefix] and the [name], separated by a period, or `null` if there is
   /// no such element.
+  @Deprecated('Use getPrefixed2() instead')
   Element? getPrefixed(String prefix, String name) => null;
 
   /// Return the element in this namespace whose name is the result of combining
@@ -322,6 +323,7 @@ class PrefixedNamespace implements Namespace {
       : _prefix = prefix,
         _length = prefix.length;
 
+  @Deprecated('Use definedNames2 instead')
   @override
   Map<String, Element> get definedNames {
     var definedNames = <String, Element>{};
@@ -336,6 +338,7 @@ class PrefixedNamespace implements Namespace {
     return _definedNames;
   }
 
+  @Deprecated('Use get2() instead')
   @override
   Element? get(String name) {
     return get2(name)?.asElement;
@@ -351,6 +354,7 @@ class PrefixedNamespace implements Namespace {
     return null;
   }
 
+  @Deprecated('Use getPrefixed2() instead')
   @override
   Element? getPrefixed(String prefix, String name) {
     return getPrefixed2(prefix, name)?.asElement;

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

@@ -549,7 +549,7 @@ class LibraryElementLinkedData extends ElementLinkedData<LibraryElementImpl> {
       unitElement: unitElement,
     );
 
-    element.entryPoint = reader.readElement() as FunctionElement?;
+    element.entryPoint2 = reader.readElement2() as TopLevelFunctionElement?;
 
     element.fieldNameNonPromotabilityInfo =
         _readFieldNameNonPromotabilityInfo(reader);

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

@@ -118,7 +118,7 @@ class BundleWriter {
     // Write resolution data for the library.
     _sink.writeUInt30(_resolutionSink.offset);
     _resolutionSink._writeAnnotationList(libraryElement.metadata);
-    _resolutionSink.writeElement(libraryElement.entryPoint);
+    _resolutionSink.writeElement2(libraryElement.entryPoint2);
     _writeFieldNameNonPromotabilityInfo(
         libraryElement.fieldNameNonPromotabilityInfo);
 

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

@@ -377,9 +377,9 @@ class LibraryBuilder {
     var namespace = Namespace(definedNames);
     element.exportNamespace = namespace;
 
-    var entryPoint = namespace.get(FunctionElement.MAIN_FUNCTION_NAME);
-    if (entryPoint is FunctionElement) {
-      element.entryPoint = entryPoint;
+    var entryPoint = namespace.get2(TopLevelFunctionElement.MAIN_FUNCTION_NAME);
+    if (entryPoint is TopLevelFunctionElement) {
+      element.entryPoint2 = entryPoint;
     }
   }
 

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

@@ -537,10 +537,10 @@ class _Element2Writer extends _AbstractElementWriter {
   }
 
   void _writeExportNamespace(LibraryElement2 e) {
-    var map = e.exportNamespace.definedNames;
+    var map = e.exportNamespace.definedNames2;
     var sortedEntries = map.entries.sortedBy((entry) => entry.key);
     for (var entry in sortedEntries) {
-      _elementPrinter.writeNamedElement(entry.key, entry.value);
+      _elementPrinter.writelnNamedElement2(entry.key, entry.value);
     }
   }
 
@@ -2118,6 +2118,7 @@ class _ElementWriter extends _AbstractElementWriter {
   }
 
   void _writeExportNamespace(LibraryElement e) {
+    // ignore:deprecated_member_use_from_same_package
     var map = e.exportNamespace.definedNames;
     var sortedEntries = map.entries.sortedBy((entry) => entry.key);
     for (var entry in sortedEntries) {