Elements. Migrate analyzer/test/src/dart/micro/simple_file_resolver_test.dart

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

Author: scheglov

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

@@ -10,6 +10,7 @@ import 'package:analyzer/dart/analysis/declared_variables.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/source/line_info.dart';
@@ -39,6 +40,7 @@ import 'package:analyzer/src/summary/format.dart';
 import 'package:analyzer/src/summary/idl.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer/src/utilities/extensions/file_system.dart';
 import 'package:analyzer/src/utilities/uri_cache.dart';
 import 'package:analyzer/src/workspace/workspace.dart';
@@ -253,6 +255,16 @@ class FileResolver {
     releaseAndClearRemovedIds();
   }
 
+  /// Looks for references to the given Element. All the files currently
+  ///  cached by the resolver are searched, generated files are ignored.
+  Future<List<CiderSearchMatch>> findReferences(Element2 element,
+      {OperationPerformanceImpl? performance}) {
+    return findReferences2(
+      element.asElement!,
+      performance: performance,
+    );
+  }
+
   /// Looks for references to the given Element. All the files currently
   ///  cached by the resolver are searched, generated files are ignored.
   Future<List<CiderSearchMatch>> findReferences2(Element element,

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

@@ -6,6 +6,7 @@
 
 import 'package:analyzer/dart/ast/visitor.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/element_locator.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -51,6 +52,46 @@ Element? getElementOfNode(AstNode? node) {
   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) {
+  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;
+  }
+
+  Element? element;
+  switch (node) {
+    case ExportDirective():
+      element = node.element;
+    case ImportDirective():
+      element = node.element;
+    case PartOfDirective():
+      element = node.element;
+    default:
+      element = ElementLocator.locate2(node).asElement;
+  }
+
+  if (node is SimpleIdentifier && element is PrefixElement) {
+    var parent = node.parent;
+    if (parent is ImportDirective) {
+      element = parent.element;
+    } else {
+      element = _getImportElementInfo(node);
+    }
+  }
+
+  return element.asElement2;
+}
+
 /// If the given [constructor] is a synthetic constructor created for a
 /// [ClassTypeAlias], return the actual constructor of a [ClassDeclaration]
 /// which is invoked.  Return `null` if a redirection cycle is detected.

pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart

@@ -2,9 +2,7 @@
 // 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/file_system/file_system.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/src/dart/analysis/file_state.dart';
@@ -951,7 +949,7 @@ var b = 1 + 2;
       declaration: intElement,
     );
 
-    assertType(findElement.topVar('b').type, 'int');
+    assertType(findElement2.topVar('b').type, 'int');
   }
 
   test_dispose() async {
@@ -1066,7 +1064,7 @@ void func() {
 
     await resolveFile(b);
     var element = await _findElement(6, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(b.path,
           [CiderSearchInfo(CharacterLocation(4, 11), 1, MatchKind.REFERENCE)])
@@ -1087,7 +1085,7 @@ class A {
 
     await resolveFile(a);
     var element = await _findElement(16, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(a.path, [
         CiderSearchInfo(CharacterLocation(5, 5), 3, MatchKind.WRITE),
@@ -1107,7 +1105,7 @@ foo(String str) {}
 
     await resolveFile(a);
     var element = await _findElement(11, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(a.path, [
         CiderSearchInfo(CharacterLocation(2, 3), 3, MatchKind.REFERENCE),
@@ -1133,7 +1131,7 @@ main() {
 
     await resolveFile(b);
     var element = await _findElement(20, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(b.path, [
         CiderSearchInfo(CharacterLocation(5, 15), 3, MatchKind.REFERENCE),
@@ -1154,7 +1152,7 @@ class A {
 ''');
     await resolveFile(a);
     var element = await _findElement(39, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(a.path, [
         CiderSearchInfo(CharacterLocation(4, 11), 3, MatchKind.REFERENCE),
@@ -1189,7 +1187,7 @@ main() {
     await resolveFile(b);
 
     var element = await _findElement(17, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(b.path, [
         CiderSearchInfo(CharacterLocation(5, 5), 4, MatchKind.REFERENCE),
@@ -1218,7 +1216,7 @@ main() {
 
     await resolveFile(b);
     var element = await _findElement(21, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(b.path, [
         CiderSearchInfo(CharacterLocation(5, 5), 5, MatchKind.WRITE),
@@ -1244,7 +1242,7 @@ main() {
 
     await resolveFile(b);
     var element = await _findElement(19, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(b.path, [
         CiderSearchInfo(CharacterLocation(4, 13), 3, MatchKind.REFERENCE),
@@ -1270,7 +1268,7 @@ main() {
 
     await resolveFile(b);
     var element = await _findElement(20, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(b.path, [
         CiderSearchInfo(CharacterLocation(4, 3), 3, MatchKind.WRITE),
@@ -1290,7 +1288,7 @@ void func() {
 
     await resolveFile(a);
     var element = await _findElement(10, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(a.path, [
         CiderSearchInfo(CharacterLocation(4, 11), 1, MatchKind.READ),
@@ -1309,7 +1307,7 @@ class Foo<T> {
 ''');
     await resolveFile(a);
     var element = await _findElement(10, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(a.path, [
         CiderSearchInfo(CharacterLocation(2, 8), 1, MatchKind.REFERENCE),
@@ -1332,7 +1330,7 @@ void f(func o) {}
 
     await resolveFile(b);
     var element = await _findElement(8, a);
-    var result = await fileResolver.findReferences2(element);
+    var result = await fileResolver.findReferences(element);
     var expected = <CiderSearchMatch>[
       CiderSearchMatch(b.path, [
         CiderSearchInfo(CharacterLocation(3, 8), 4, MatchKind.REFERENCE),
@@ -1351,7 +1349,7 @@ void f(int? a) {
 ''');
 
     assertType(
-      findElement.parameter('a').type,
+      findElement2.parameter('a').type,
       'int?',
     );
   }
@@ -1839,17 +1837,17 @@ void f(A a) {
 
     await resolveTestFile();
     {
-      var element = findNode.simple('foo();').staticElement!;
-      expect(element.nameOffset, 17);
+      var element = findNode.simple('foo();').element!;
+      expect(element.firstFragment.nameOffset2, 17);
     }
 
     // New resolver.
     // Element models will be loaded from the cache.
     createFileResolver();
     await resolveTestFile();
     {
-      var element = findNode.simple('foo();').staticElement!;
-      expect(element.nameOffset, 17);
+      var element = findNode.simple('foo();').element!;
+      expect(element.firstFragment.nameOffset2, 17);
     }
   }
 
@@ -1865,17 +1863,17 @@ var b = a;
 
     await resolveTestFile();
     {
-      var element = findNode.simple('a;').staticElement!;
-      expect(element.nonSynthetic.nameOffset, 4);
+      var element = findNode.simple('a;').element!;
+      expect(element.nonSynthetic2.firstFragment.nameOffset2, 4);
     }
 
     // New resolver.
     // Element models will be loaded from the cache.
     createFileResolver();
     await resolveTestFile();
     {
-      var element = findNode.simple('a;').staticElement!;
-      expect(element.nonSynthetic.nameOffset, 4);
+      var element = findNode.simple('a;').element!;
+      expect(element.nonSynthetic2.firstFragment.nameOffset2, 4);
     }
   }
 
@@ -2529,8 +2527,8 @@ void func() {
     // Both files use the same (default) analysis options.
     // So, when we resolve 'bbb', we can reuse the context after 'aaa'.
     expect(
-      aResult.libraryElement.context,
-      same(bResult.libraryElement.context),
+      aResult.libraryElement2.session,
+      same(bResult.libraryElement2.session),
     );
   }
 
@@ -2592,10 +2590,10 @@ import 'dart:math';
     }
   }
 
-  Future<Element> _findElement(int offset, File file) async {
+  Future<Element2> _findElement(int offset, File file) async {
     var resolvedUnit = await fileResolver.resolve(path: file.path);
     var node = NodeLocator(offset).searchWithin(resolvedUnit.unit);
-    var element = getElementOfNode(node);
+    var element = getElementOfNode2(node);
     return element!;
   }
 }