[migration] analysis_server.dart

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

Author: bwilkerson

pkg/analysis_server/lib/src/analysis_server.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
-
 import 'dart:async';
 import 'dart:io' as io;
 import 'dart:io';
@@ -56,7 +54,6 @@ import 'package:analysis_server_plugin/src/correction/fix_generators.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/exception/exception.dart';
@@ -674,9 +671,15 @@ abstract class AnalysisServer {
     return getElementOfNode2(node);
   }
 
-  /// Return the [Element] of the given [node], or `null` if [node] is `null` or
-  /// does not have an element.
-  Element? getElementOfNode(AstNode? node) {
+  /// Returns the element associated with the [node].
+  ///
+  /// If [useMockForImport] is `true` then a [MockLibraryImportElement] will be
+  /// returned when an import directive or a prefix element is associated with
+  /// the [node]. The rename-prefix refactoring should be updated to not require
+  /// this work-around.
+  ///
+  /// Returns `null` if [node] is `null` or doesn't have an element.
+  Element2? getElementOfNode2(AstNode? node, {bool useMockForImport = false}) {
     if (node == null) {
       return null;
     }
@@ -690,42 +693,20 @@ abstract class AnalysisServer {
       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;
+    Element2? element;
+    if (useMockForImport && node is ImportDirective) {
+      element = MockLibraryImportElement(node.libraryImport!);
+    } else {
+      element = ElementLocator.locate2(node);
     }
-
-    if (node is SimpleIdentifier && element is PrefixElement) {
-      element = getImportElement(node);
+    if (useMockForImport &&
+        node is SimpleIdentifier &&
+        element is PrefixElement2) {
+      element = MockLibraryImportElement(getImportElement2(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;
-    }
-    return ElementLocator.locate2(node);
-  }
-
   /// Return a [LineInfo] for the file with the given [path].
   ///
   /// If the file does not exist or cannot be read, returns `null`.

pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart

@@ -19,6 +19,7 @@ import 'package:analysis_server/src/utilities/extensions/string.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 AstNode? _tweakLocatedNode(AstNode? node, int offset) {
   if (node is RepresentationDeclaration) {
@@ -66,7 +67,9 @@ class PrepareRenameHandler
     return (unit, offset).mapResults((unit, offset) async {
       var node = NodeLocator(offset).searchWithin(unit.unit);
       node = _tweakLocatedNode(node, offset);
-      var element = server.getElementOfNode(node);
+      var element =
+          server.getElementOfNode2(node, useMockForImport: true).asElement;
+
       if (node == null || element == null) {
         return success(null);
       }
@@ -161,7 +164,8 @@ class RenameHandler extends LspMessageHandler<RenameParams, WorkspaceEdit?> {
     ) async {
       var node = NodeLocator(offset).searchWithin(unit.unit);
       node = _tweakLocatedNode(node, offset);
-      var element = server.getElementOfNode(node);
+      var element =
+          server.getElementOfNode2(node, useMockForImport: true).asElement;
       if (node == null || element == null) {
         return success(null);
       }
@@ -223,7 +227,7 @@ class RenameHandler extends LspMessageHandler<RenameParams, WorkspaceEdit?> {
 
         // Set the completer to complete to show that request is paused, and
         // that processing of incoming messages can continue while we wait
-        // for the user's response. 
+        // for the user's response.
         message.completer?.complete();
 
         // Otherwise, ask the user whether to proceed with the rename.

pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart

@@ -18,6 +18,7 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/utilities/cancellation.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 int test_resetCount = 0;
 
@@ -314,7 +315,8 @@ class RefactoringManager {
       var resolvedUnit = await server.getResolvedUnit(file);
       if (resolvedUnit != null) {
         var node = NodeLocator(offset).searchWithin(resolvedUnit.unit);
-        var element = server.getElementOfNode(node);
+        var element =
+            server.getElementOfNode2(node, useMockForImport: true)?.asElement;
         if (node is RepresentationDeclaration) {
           var extensionType = node.parent;
           if (extensionType is ExtensionTypeDeclaration &&

pkg/analysis_server/test/edit/refactoring_test.dart

@@ -2721,24 +2721,6 @@ library my.new_name;
     );
   }
 
-  Future<void> test_library_partOfDirective() {
-    newFile('$testPackageLibPath/my_lib.dart', '''
-library aaa.bbb.ccc;
-part 'test.dart';
-''');
-    addTestFile('''
-part of aaa.bbb.ccc;
-''');
-    return assertSuccessfulRefactoring(
-      () {
-        return sendRenameRequest('aaa.bb', 'my.new_name');
-      },
-      '''
-part of my.new_name;
-''',
-    );
-  }
-
   Future<void> test_localVariable() {
     setPriorityFiles([testFile]);
     addTestFile('''