Stop using Element.computeNode() in refactorings and fixes.

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

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // 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.
 
 library services.refactoring;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart'
     show RefactoringMethodParameter, SourceChange;
 import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:analysis_server/src/services/refactoring/convert_getter_to_method.dart';
 import 'package:analysis_server/src/services/refactoring/convert_method_to_getter.dart';
 import 'package:analysis_server/src/services/refactoring/extract_local.dart';
 import 'package:analysis_server/src/services/refactoring/extract_method.dart';
 import 'package:analysis_server/src/services/refactoring/inline_local.dart';
 import 'package:analysis_server/src/services/refactoring/inline_method.dart';
 import 'package:analysis_server/src/services/refactoring/move_file.dart';
 import 'package:analysis_server/src/services/refactoring/rename_class_member.dart';
 import 'package:analysis_server/src/services/refactoring/rename_constructor.dart';
 import 'package:analysis_server/src/services/refactoring/rename_import.dart';
 import 'package:analysis_server/src/services/refactoring/rename_label.dart';
 import 'package:analysis_server/src/services/refactoring/rename_library.dart';
 import 'package:analysis_server/src/services/refactoring/rename_local.dart';
 import 'package:analysis_server/src/services/refactoring/rename_unit_member.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/src/dart/element/ast_provider.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 /**
- * Completes with the resolved [CompilationUnit] that contains the [element].
- */
-typedef Future<CompilationUnit> GetResolvedUnit(Element element);
-
-/**
  * [Refactoring] to convert getters into normal [MethodDeclaration]s.
  */
 abstract class ConvertGetterToMethodRefactoring implements Refactoring {
   /**
    * Returns a new [ConvertMethodToGetterRefactoring] instance for converting
    * [element] and all the corresponding hierarchy elements.
    */
-  factory ConvertGetterToMethodRefactoring(
-      SearchEngine searchEngine, PropertyAccessorElement element) {
-    return new ConvertGetterToMethodRefactoringImpl(searchEngine, element);
+  factory ConvertGetterToMethodRefactoring(SearchEngine searchEngine,
+      AstProvider astProvider, PropertyAccessorElement element) {
+    return new ConvertGetterToMethodRefactoringImpl(
+        searchEngine, astProvider, element);
   }
 }
 
 /**
  * [Refactoring] to convert normal [MethodDeclaration]s into getters.
  */
 abstract class ConvertMethodToGetterRefactoring implements Refactoring {
   /**
    * Returns a new [ConvertMethodToGetterRefactoring] instance for converting
    * [element] and all the corresponding hierarchy elements.
    */
   factory ConvertMethodToGetterRefactoring(SearchEngine searchEngine,
-      GetResolvedUnit getResolvedUnit, ExecutableElement element) {
+      AstProvider astProvider, ExecutableElement element) {
     return new ConvertMethodToGetterRefactoringImpl(
-        searchEngine, getResolvedUnit, element);
+        searchEngine, astProvider, element);
   }
 }
 
 /**
  * [Refactoring] to extract an expression into a local variable declaration.
  */
 abstract class ExtractLocalRefactoring implements Refactoring {
   /**
    * Returns a new [ExtractLocalRefactoring] instance.
    */
@@ skipping 150 matching lines @@
   RefactoringStatus checkName();
 }
 
 /**
  * [Refactoring] to inline a local [VariableElement].
  */
 abstract class InlineLocalRefactoring implements Refactoring {
   /**
    * Returns a new [InlineLocalRefactoring] instance.
    */
-  factory InlineLocalRefactoring(
-      SearchEngine searchEngine, CompilationUnit unit, int offset) {
-    return new InlineLocalRefactoringImpl(searchEngine, unit, offset);
+  factory InlineLocalRefactoring(SearchEngine searchEngine,
+      AstProvider astProvider, CompilationUnit unit, int offset) {
+    return new InlineLocalRefactoringImpl(
+        searchEngine, astProvider, unit, offset);
   }
 
   /**
    * Returns the number of references to the [VariableElement].
    */
   int get referenceCount;
 
   /**
    * Returns the name of the variable being inlined.
    */
   String get variableName;
 }
 
 /**
  * [Refactoring] to inline an [ExecutableElement].
  */
 abstract class InlineMethodRefactoring implements Refactoring {
   /**
    * Returns a new [InlineMethodRefactoring] instance.
    */
   factory InlineMethodRefactoring(SearchEngine searchEngine,
-      GetResolvedUnit getResolvedUnit, CompilationUnit unit, int offset) {
+      AstProvider astProvider, CompilationUnit unit, int offset) {
     return new InlineMethodRefactoringImpl(
-        searchEngine, getResolvedUnit, unit, offset);
+        searchEngine, astProvider, unit, offset);
   }
 
   /**
    * The name of the class enclosing the method being inlined.
    * If not a class member is being inlined, then `null`.
    */
   String get className;
 
   /**
    * True if the method being inlined should be removed.
@@ skipping 96 matching lines @@
 
 /**
  * Abstract [Refactoring] for renaming some [Element].
  */
 abstract class RenameRefactoring implements Refactoring {
   /**
    * Returns a new [RenameRefactoring] instance for renaming [element],
    * maybe `null` if there is no support for renaming [Element]s of the given
    * type.
    */
-  factory RenameRefactoring(SearchEngine searchEngine, Element element) {
+  factory RenameRefactoring(
+      SearchEngine searchEngine, AstProvider astProvider, Element element) {
     if (element == null) {
       return null;
     }
     if (element is PropertyAccessorElement) {
       element = (element as PropertyAccessorElement).variable;
     }
     if (element.enclosingElement is CompilationUnitElement) {
       return new RenameUnitMemberRefactoringImpl(searchEngine, element);
     }
     if (element is ConstructorElement) {
-      return new RenameConstructorRefactoringImpl(searchEngine, element);
+      return new RenameConstructorRefactoringImpl(
+          searchEngine, astProvider, element);
     }
     if (element is ImportElement) {
       return new RenameImportRefactoringImpl(searchEngine, element);
     }
     if (element is LabelElement) {
       return new RenameLabelRefactoringImpl(searchEngine, element);
     }
     if (element is LibraryElement) {
       return new RenameLibraryRefactoringImpl(searchEngine, element);
     }
@@ skipping 26 matching lines @@
    * Validates that the [newName] is a valid identifier and is appropriate for
    * the type of the [Element] being renamed.
    *
    * It does not perform all the checks (such as checking for conflicts with any
    * existing names in any of the scopes containing the current name), as many
    * of these checkes require search engine. Use [checkFinalConditions] for this
    * level of checking.
    */
   RefactoringStatus checkNewName();
 }