Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: pkg/analysis_server/lib/src/services/refactoring/refactoring.dart

Issue 2669353002: Stop using Element.computeNode() in refactorings and fixes. (Closed)
Patch Set: documentation comments Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/lib/src/services/refactoring/refactoring.dart
diff --git a/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart b/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart
index 9c2da5d715f12568d664a332e44f0ae88a316efd..115d937b3c321a331a1dc7021a107c59c138828c 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart
@@ -27,15 +27,11 @@ 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 {
@@ -43,9 +39,10 @@ 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);
}
}
@@ -58,9 +55,9 @@ abstract class ConvertMethodToGetterRefactoring implements Refactoring {
* [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);
}
}
@@ -231,9 +228,10 @@ 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);
}
/**
@@ -255,9 +253,9 @@ 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);
}
/**
@@ -374,7 +372,8 @@ abstract class RenameRefactoring implements Refactoring {
* 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;
}
@@ -385,7 +384,8 @@ abstract class RenameRefactoring implements Refactoring {
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);

Powered by Google App Engine
This is Rietveld 408576698