Elements. Migrate CommentReferenceResolver.

Change-Id: I8962f99ba4422d673ace93035bfad1d926ce68e3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406042
Reviewed-by: Phil Quitslund <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -20,7 +20,6 @@ import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
-import 'package:analyzer/dart/element/scope.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/source/line_info.dart';
@@ -9869,9 +9868,8 @@ class PrefixElementImpl2 extends ElementImpl2 implements PrefixElement2 {
   String? get name3 => firstFragment.name2;
 
   @override
-  Scope get scope {
-    var libraryFragment = firstFragment.libraryFragment;
-    return LibraryFragmentScope(libraryFragment);
+  PrefixScope get scope {
+    return asElement.scope;
   }
 
   @override

pkg/analyzer/lib/src/dart/resolver/comment_reference_resolver.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/dart/element/type.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/element/element.dart';
@@ -14,7 +12,6 @@ import 'package:analyzer/src/dart/element/type_provider.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/dart/resolver/type_property_resolver.dart';
 import 'package:analyzer/src/generated/resolver.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 
 class CommentReferenceResolver {
   final TypeProviderImpl _typeProvider;
@@ -55,45 +52,45 @@ class CommentReferenceResolver {
   }) {
     var prefix = expression.prefix;
     var prefixElement = _resolveSimpleIdentifier(prefix);
-    prefix.staticElement = prefixElement;
+    prefix.element = prefixElement;
 
     if (prefixElement == null) {
       return;
     }
 
     var name = expression.identifier;
 
-    if (prefixElement is PrefixElement) {
+    if (prefixElement is PrefixElement2) {
       var prefixScope = prefixElement.scope;
       var lookupResult = prefixScope.lookup(name.name);
-      var element = lookupResult.getter ?? lookupResult.setter;
-      name.staticElement = element;
+      var element = lookupResult.getter2 ?? lookupResult.setter2;
+      name.element = element;
       return;
     }
 
     if (!hasNewKeyword) {
-      if (prefixElement is InterfaceElement) {
-        name.staticElement = _resolver.inheritance.getMember2(
+      if (prefixElement is InterfaceElement2) {
+        name.element = _resolver.inheritance.getMember4(
               prefixElement,
-              Name(prefixElement.library.source.uri, name.name),
+              Name(prefixElement.library2.uri, name.name),
             ) ??
-            prefixElement.getMethod(name.name) ??
-            prefixElement.getGetter(name.name) ??
-            prefixElement.getSetter(name.name) ??
-            prefixElement.getNamedConstructor(name.name);
-      } else if (prefixElement is ExtensionElement) {
-        name.staticElement = prefixElement.getMethod(name.name) ??
-            prefixElement.getGetter(name.name) ??
-            prefixElement.getSetter(name.name);
+            prefixElement.getMethod2(name.name) ??
+            prefixElement.getGetter2(name.name) ??
+            prefixElement.getSetter2(name.name) ??
+            prefixElement.getNamedConstructor2(name.name);
+      } else if (prefixElement is ExtensionElement2) {
+        name.element = prefixElement.getMethod2(name.name) ??
+            prefixElement.getGetter2(name.name) ??
+            prefixElement.getSetter2(name.name);
       } else {
         // TODO(brianwilkerson): Report this error.
       }
-    } else if (prefixElement is InterfaceElement) {
-      var constructor = prefixElement.getNamedConstructor(name.name);
+    } else if (prefixElement is InterfaceElement2) {
+      var constructor = prefixElement.getNamedConstructor2(name.name);
       if (constructor == null) {
         // TODO(brianwilkerson): Report this error.
       } else {
-        name.staticElement = constructor;
+        name.element = constructor;
       }
     } else {
       // TODO(brianwilkerson): Report this error.
@@ -113,9 +110,9 @@ class CommentReferenceResolver {
 
     var prefix = target.prefix;
     var prefixElement = _resolveSimpleIdentifier(prefix);
-    prefix.staticElement = prefixElement;
+    prefix.element = prefixElement;
 
-    if (prefixElement is! PrefixElement) {
+    if (prefixElement is! PrefixElement2) {
       // The only valid prefixElement is a PrefixElement; otherwise, this is
       // not a comment reference.
       return;
@@ -124,33 +121,33 @@ class CommentReferenceResolver {
     var name = target.identifier;
     var prefixScope = prefixElement.scope;
     var lookupResult = prefixScope.lookup(name.name);
-    var element = lookupResult.getter ?? lookupResult.setter;
-    name.staticElement = element;
+    var element = lookupResult.getter2 ?? lookupResult.setter2;
+    name.element = element;
 
     var propertyName = expression.propertyName;
-    if (element is InterfaceElement) {
-      propertyName.staticElement = element.getMethod(propertyName.name) ??
-          element.getGetter(propertyName.name) ??
-          element.getSetter(propertyName.name) ??
-          element.getNamedConstructor(propertyName.name);
-    } else if (element is ExtensionElement) {
-      propertyName.staticElement = element.getMethod(propertyName.name) ??
-          element.getGetter(propertyName.name) ??
-          element.getSetter(propertyName.name);
+    if (element is InterfaceElement2) {
+      propertyName.element = element.getMethod2(propertyName.name) ??
+          element.getGetter2(propertyName.name) ??
+          element.getSetter2(propertyName.name) ??
+          element.getNamedConstructor2(propertyName.name);
+    } else if (element is ExtensionElement2) {
+      propertyName.element = element.getMethod2(propertyName.name) ??
+          element.getGetter2(propertyName.name) ??
+          element.getSetter2(propertyName.name);
     }
   }
 
   /// Resolves the given simple [identifier] if possible.
   ///
   /// Returns the resolved element, or `null` if the identifier could not be
   /// resolved. This does not record the results of the resolution.
-  Element? _resolveSimpleIdentifier(SimpleIdentifierImpl identifier) {
+  Element2? _resolveSimpleIdentifier(SimpleIdentifierImpl identifier) {
     var lookupResult = identifier.scopeLookupResult!;
-    var element = lookupResult.getter ?? lookupResult.setter;
+    var element = lookupResult.getter2 ?? lookupResult.setter2;
 
     // Usually referencing just an import prefix is an error.
     // But we allow this in documentation comments.
-    if (element is PrefixElementImpl) {
+    if (element is PrefixElementImpl2) {
       element.scope.notifyPrefixUsedInCommentReference();
     }
 
@@ -182,7 +179,7 @@ class CommentReferenceResolver {
         propertyErrorEntity: identifier,
         nameErrorEntity: identifier,
       );
-      element = result.getter2?.asElement ?? result.setter2?.asElement;
+      element = result.getter2 ?? result.setter2;
     }
     return element;
   }
@@ -195,14 +192,14 @@ class CommentReferenceResolver {
     if (element == null) {
       return;
     }
-    expression.staticElement = element;
+    expression.element = element;
     if (hasNewKeyword) {
-      if (element is InterfaceElement) {
-        var constructor = element.unnamedConstructor;
+      if (element is InterfaceElement2) {
+        var constructor = element.unnamedConstructor2;
         if (constructor == null) {
           // TODO(brianwilkerson): Report this error.
         } else {
-          expression.staticElement = constructor;
+          expression.element = constructor;
         }
       } else {
         // TODO(brianwilkerson): Report this error.

pkg/analyzer/test/src/summary/elements/library_fragment_test.dart

@@ -427,11 +427,13 @@ part 'a.dart';
 package:test/test.dart
   prefix.exitCode
     prefix: <testLibraryFragment>::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::<fragment>::@getter::exitCode#element
+    setter: dart:io::<fragment>::@setter::exitCode#element
 package:test/a.dart
   prefix.exitCode
     prefix: <testLibraryFragment>::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::<fragment>::@getter::exitCode#element
+    setter: dart:io::<fragment>::@setter::exitCode#element
 ''');
   }
 
@@ -468,31 +470,31 @@ part 'a.dart';
 package:test/test.dart
   prefix.File
     prefix: <testLibraryFragment>::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::File
   prefix.Random
     prefix: <testLibraryFragment>::@prefix2::prefix
     getter: <null>
 package:test/a.dart
   prefix.File
     prefix: <testLibrary>::@fragment::package:test/a.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::File
   prefix.Random
     prefix: <testLibrary>::@fragment::package:test/a.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:math::@class::Random
 package:test/aa.dart
   prefix.File
     prefix: <testLibrary>::@fragment::package:test/a.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::File
   prefix.Random
     prefix: <testLibrary>::@fragment::package:test/a.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:math::@class::Random
 package:test/aaa.dart
   prefix.File
     prefix: <testLibrary>::@fragment::package:test/a.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::File
   prefix.Random
     prefix: <testLibrary>::@fragment::package:test/a.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:math::@class::Random
 ''');
   }
 
@@ -523,24 +525,24 @@ part 'a.dart';
 package:test/test.dart
   prefix.File
     prefix: <testLibraryFragment>::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::File
   prefix.Random
     prefix: <testLibraryFragment>::@prefix2::prefix
     getter: <null>
 package:test/a.dart
   prefix.File
     prefix: <testLibraryFragment>::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::File
   prefix.Random
     prefix: <testLibraryFragment>::@prefix2::prefix
     getter: <null>
 package:test/aa.dart
   prefix.File
     prefix: <testLibrary>::@fragment::package:test/aa.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::File
   prefix.Random
     prefix: <testLibrary>::@fragment::package:test/aa.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:math::@class::Random
 ''');
   }
 
@@ -575,7 +577,7 @@ package:test/test.dart
     getter: <null>
   prefix.File
     prefix: <testLibraryFragment>::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::File
   prefix.Random
     prefix: <testLibraryFragment>::@prefix2::prefix
     getter: <null>
@@ -587,7 +589,7 @@ package:test/a.dart
     getter: <null>
   prefix.Random
     prefix: <testLibrary>::@fragment::package:test/a.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:math::@class::Random
 package:test/aa.dart
   loadLibrary
     getter: <null>
@@ -596,7 +598,7 @@ package:test/aa.dart
     getter: <null>
   prefix.Random
     prefix: <testLibrary>::@fragment::package:test/aa.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:math::@class::Random
 ''');
   }
 
@@ -632,24 +634,24 @@ part 'a.dart';
 package:test/test.dart
   prefix.File
     prefix: <testLibraryFragment>::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::File
   prefix.Directory
     prefix: <testLibraryFragment>::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::Directory
 package:test/a.dart
   prefix.File
     prefix: <testLibrary>::@fragment::package:test/a.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::File
   prefix.Directory
     prefix: <testLibrary>::@fragment::package:test/a.dart::@prefix2::prefix
-    getter: <null>
+    getter: package:test/x.dart::@class::Directory
 package:test/aa.dart
   prefix.File
     prefix: <testLibrary>::@fragment::package:test/a.dart::@prefix2::prefix
-    getter: <null>
+    getter: dart:io::@class::File
   prefix.Directory
     prefix: <testLibrary>::@fragment::package:test/a.dart::@prefix2::prefix
-    getter: <null>
+    getter: package:test/x.dart::@class::Directory
 ''');
   }
 
@@ -1273,14 +1275,14 @@ part 'a.dart';
 package:test/test.dart
   _.X
     _: <testLibraryFragment>::@prefix2::_
-    getter: <null>
+    getter: package:test/x.dart::@extension::X
   accessibleExtensions
     dart:core::@extension::EnumName
     package:test/x.dart::@extension::X
 package:test/a.dart
   _.X
     _: <testLibraryFragment>::@prefix2::_
-    getter: <null>
+    getter: package:test/x.dart::@extension::X
   accessibleExtensions
     dart:core::@extension::EnumName
     package:test/x.dart::@extension::X