Stop using resolutionMap in analyzer and analysis_server.

[email protected], [email protected]

Change-Id: Ie8f75e330e9efee67ded892929a3d78b7de1c586
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114565
Reviewed-by: Brian Wilkerson <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/services/completion/dart/inherited_reference_contributor.dart

@@ -8,7 +8,6 @@ import 'package:analysis_server/src/provisional/completion/dart/completion_dart.
 import 'package:analysis_server/src/services/completion/dart/suggestion_builder.dart';
 import 'package:analysis_server/src/utilities/flutter.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer_plugin/src/utilities/completion/completion_target.dart';
@@ -67,11 +66,9 @@ class InheritedReferenceContributor extends DartCompletionContributor
     }
     containingLibrary = request.libraryElement;
     if (classDecl is ClassDeclaration) {
-      return _computeSuggestionsForClass2(
-          resolutionMap.elementDeclaredByClassDeclaration(classDecl), request);
+      return _computeSuggestionsForClass2(classDecl.declaredElement, request);
     } else if (classDecl is MixinDeclaration) {
-      return _computeSuggestionsForClass2(
-          resolutionMap.elementDeclaredByMixinDeclaration(classDecl), request);
+      return _computeSuggestionsForClass2(classDecl.declaredElement, request);
     }
     return const <CompletionSuggestion>[];
   }

pkg/analysis_server/lib/src/services/completion/dart/local_constructor_contributor.dart

@@ -12,7 +12,6 @@ import 'package:analysis_server/src/services/completion/dart/completion_manager.
 import 'package:analysis_server/src/services/completion/dart/suggestion_builder.dart';
 import 'package:analysis_server/src/services/completion/dart/utilities.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart' as protocol
     show Element, ElementKind;
@@ -112,8 +111,7 @@ class _Visitor extends LocalDeclarationVisitor {
       ClassDeclaration classDecl, ConstructorDeclaration constructorDecl) {
     String completion = classDecl.name.name;
 
-    ClassElement classElement =
-        resolutionMap.elementDeclaredByClassDeclaration(classDecl);
+    ClassElement classElement = classDecl.declaredElement;
     int relevance = optype.returnValueSuggestionsFilter(
         classElement?.type, DART_RELEVANCE_DEFAULT);
     if (constructorDecl != null) {

pkg/analysis_server/lib/src/services/completion/dart/local_reference_contributor.dart

@@ -444,8 +444,7 @@ class _LocalVisitor extends LocalDeclarationVisitor {
       {bool isAbstract = false,
       bool isDeprecated = false,
       int relevance = DART_RELEVANCE_DEFAULT}) {
-    ClassElement classElement =
-        resolutionMap.elementDeclaredByEnumDeclaration(enumDeclaration);
+    ClassElement classElement = enumDeclaration.declaredElement;
     relevance =
         optype.returnValueSuggestionsFilter(classElement?.type, relevance);
     if (relevance != null) {

pkg/analysis_server/lib/src/services/correction/fix_internal.dart

@@ -20,7 +20,6 @@ import 'package:analysis_server/src/utilities/flutter.dart';
 import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/precedence.dart';
-import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
@@ -1234,10 +1233,8 @@ class FixProcessor {
               });
             });
             _addFixFromBuilder(
-                changeBuilder, DartFixKind.CHANGE_TYPE_ANNOTATION, args: [
-              resolutionMap.typeForTypeName(typeNode),
-              newType.displayName
-            ]);
+                changeBuilder, DartFixKind.CHANGE_TYPE_ANNOTATION,
+                args: [typeNode.type, newType.displayName]);
           }
         }
       }
@@ -3812,9 +3809,7 @@ class FixProcessor {
         }
         // maybe static
         if (target is Identifier) {
-          staticModifier =
-              resolutionMap.staticElementForIdentifier(target).kind ==
-                  ElementKind.CLASS;
+          staticModifier = target.staticElement.kind == ElementKind.CLASS;
         }
         // use different utils
         var targetPath = targetClassElement.source.fullName;

pkg/analysis_server/lib/src/services/correction/namespace.dart

@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/resolver/scope.dart';
 
@@ -127,8 +126,7 @@ ImportElement internal_getImportElementInfo(SimpleIdentifier prefixNode) {
   // prepare environment
   AstNode parent = prefixNode.parent;
   CompilationUnit unit = prefixNode.thisOrAncestorOfType<CompilationUnit>();
-  LibraryElement libraryElement =
-      resolutionMap.elementDeclaredByCompilationUnit(unit).library;
+  LibraryElement libraryElement = unit.declaredElement.library;
   // prepare used element
   Element usedElement = null;
   if (parent is PrefixedIdentifier) {

pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart

@@ -5,7 +5,6 @@
 import 'dart:convert';
 
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
@@ -353,8 +352,7 @@ class KytheDartVisitor extends GeneralizingAstVisitor with OutputUtils {
 
       // Don't use visitLibraryDirective as this won't generate a package
       // VName for libraries that don't have a library directive.
-      var libraryElement =
-          resolutionMap.elementDeclaredByCompilationUnit(node).library;
+      var libraryElement = node.declaredElement.library;
       if (libraryElement.definingCompilationUnit == node.declaredElement) {
         LibraryDirective libraryDirective;
         for (var directive in node.directives) {
@@ -433,8 +431,7 @@ class KytheDartVisitor extends GeneralizingAstVisitor with OutputUtils {
   @override
   visitDeclaredIdentifier(DeclaredIdentifier node) {
     _handleVariableDeclaration(node.declaredElement, node.identifier,
-        subKind: schema.LOCAL_SUBKIND,
-        type: resolutionMap.elementDeclaredByDeclaredIdentifier(node).type);
+        subKind: schema.LOCAL_SUBKIND, type: node.declaredElement.type);
 
     // no children
   }
@@ -638,8 +635,7 @@ class KytheDartVisitor extends GeneralizingAstVisitor with OutputUtils {
     // constructorName
     //
     var constructorName = node.constructorName;
-    var constructorElement =
-        resolutionMap.staticElementForConstructorReference(constructorName);
+    var constructorElement = constructorName.staticElement;
     if (constructorElement != null) {
       // anchor- ref/call
       _handleRefCallEdge(constructorElement,
@@ -786,11 +782,8 @@ class KytheDartVisitor extends GeneralizingAstVisitor with OutputUtils {
     }
 
     // type
-    addEdge(
-        paramVName,
-        schema.TYPED_EDGE,
-        _vNameFromType(
-            resolutionMap.elementDeclaredByFormalParameter(node).type));
+    addEdge(paramVName, schema.TYPED_EDGE,
+        _vNameFromType(node.declaredElement.type));
 
     // visit children
     _safelyVisit(node.documentationComment);
@@ -851,7 +844,7 @@ class KytheDartVisitor extends GeneralizingAstVisitor with OutputUtils {
     // variable
     _handleVariableDeclaration(node.declaredElement, node.name,
         subKind: isLocal ? schema.LOCAL_SUBKIND : schema.FIELD_SUBKIND,
-        type: resolutionMap.elementDeclaredByVariableDeclaration(node).type);
+        type: node.declaredElement.type);
 
     // visit children
     _safelyVisit(node.initializer);
@@ -1239,15 +1232,15 @@ mixin OutputUtils {
     if (returnNode is TypeName) {
       // MethodDeclaration and FunctionDeclaration both return a TypeName from
       // returnType
-      if (resolutionMap.typeForTypeName(returnNode).isVoid) {
+      if (returnNode.type.isVoid) {
         returnTypeVName = voidBuiltin;
       } else {
         returnTypeVName =
             _vNameFromElement(returnNode.name.staticElement, schema.TAPP_KIND);
       }
     } else if (returnNode is Identifier) {
       // ConstructorDeclaration returns an Identifier from returnType
-      if (resolutionMap.staticTypeForExpression(returnNode).isVoid) {
+      if (returnNode.staticType.isVoid) {
         returnTypeVName = voidBuiltin;
       } else {
         returnTypeVName =
@@ -1264,16 +1257,9 @@ mixin OutputUtils {
     if (paramNodes != null) {
       for (FormalParameter paramNode in paramNodes.parameters) {
         var paramTypeVName = dynamicBuiltin;
-        if (!resolutionMap
-            .elementDeclaredByFormalParameter(paramNode)
-            .type
-            .isDynamic) {
+        if (!paramNode.declaredElement.type.isDynamic) {
           paramTypeVName = _vNameFromElement(
-              resolutionMap
-                  .elementDeclaredByFormalParameter(paramNode)
-                  .type
-                  .element,
-              schema.TAPP_KIND);
+              paramNode.declaredElement.type.element, schema.TAPP_KIND);
         }
         addEdge(funcTypeVName, schema.PARAM_EDGE, paramTypeVName,
             ordinalIntValue: i++);

pkg/analysis_server/lib/src/services/refactoring/extract_method.dart

@@ -20,7 +20,6 @@ import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -452,8 +451,7 @@ class ExtractMethodRefactoringImpl extends RefactoringImpl
     AstNode parent = _parentMember.parent;
     // top-level function
     if (parent is CompilationUnit) {
-      LibraryElement libraryElement =
-          resolutionMap.elementDeclaredByCompilationUnit(parent).library;
+      LibraryElement libraryElement = parent.declaredElement.library;
       return validateCreateFunction(searchEngine, libraryElement, name);
     }
     // method of class

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

@@ -3,7 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -555,10 +554,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
   visitClassDeclaration(ClassDeclaration node) {
     _addSubtypeForClassDeclaration(node);
     if (node.extendsClause == null) {
-      ClassElement objectElement = resolutionMap
-          .elementDeclaredByClassDeclaration(node)
-          .supertype
-          ?.element;
+      ClassElement objectElement = node.declaredElement.supertype?.element;
       recordRelationOffset(objectElement, IndexRelationKind.IS_EXTENDED_BY,
           node.name.offset, 0, true);
     }

pkg/analyzer/lib/src/dart/constant/utilities.dart

@@ -5,7 +5,6 @@
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -226,9 +225,7 @@ class ConstantFinder extends RecursiveAstVisitor<void> {
   @override
   void visitClassDeclaration(ClassDeclaration node) {
     bool prevTreatFinalInstanceVarAsConst = treatFinalInstanceVarAsConst;
-    if (resolutionMap
-        .elementDeclaredByClassDeclaration(node)
-        .constructors
+    if (node.declaredElement.constructors
         .any((ConstructorElement e) => e.isConst)) {
       // Instance vars marked "final" need to be included in the dependency
       // graph, since constant constructors implicitly use the values in their
@@ -259,8 +256,7 @@ class ConstantFinder extends RecursiveAstVisitor<void> {
     super.visitDefaultFormalParameter(node);
     Expression defaultValue = node.defaultValue;
     if (defaultValue != null && node.declaredElement != null) {
-      constantsToCompute
-          .add(resolutionMap.elementDeclaredByFormalParameter(node));
+      constantsToCompute.add(node.declaredElement);
     }
   }
 

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -6,7 +6,6 @@ import 'dart:collection';
 
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -926,8 +925,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
       // we can get the function element via `node?.element?.type?.element` but
       // it doesn't have hasImplicitReturnType set correctly.
       if (!_options.implicitDynamic && node.returnType == null) {
-        DartType parameterType =
-            resolutionMap.elementDeclaredByFormalParameter(node).type;
+        DartType parameterType = node.declaredElement.type;
         if (parameterType is FunctionType &&
             parameterType.returnType.isDynamic) {
           _errorReporter.reportErrorForNode(
@@ -1797,8 +1795,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
     DartType redirectedReturnType = redirectedType.returnType;
 
     // Report specific problem when return type is incompatible
-    FunctionType constructorType =
-        resolutionMap.elementDeclaredByConstructorDeclaration(declaration).type;
+    FunctionType constructorType = declaration.declaredElement.type;
     DartType constructorReturnType = constructorType.returnType;
     if (!_typeSystem.isAssignableTo(redirectedReturnType, constructorReturnType,
         featureSet: _featureSet)) {
@@ -3794,7 +3791,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void> {
   }
 
   void _checkForMissingJSLibAnnotation(Annotation node) {
-    if (resolutionMap.elementAnnotationForAnnotation(node)?.isJS ?? false) {
+    if (node.elementAnnotation?.isJS ?? false) {
       if (_currentLibrary.hasJS != true) {
         _errorReporter.reportErrorForNode(
             HintCode.MISSING_JS_LIB_ANNOTATION, node);