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 0d33b28e422e3378533e41f2da72ed8e6d34ddde..d0cbfcb711f9445407da808a70bc73fbc61705b1 100644 |
--- a/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart |
+++ b/pkg/analysis_server/lib/src/services/refactoring/refactoring.dart |
@@ -137,10 +137,14 @@ abstract class ExtractMethodRefactoring implements Refactoring { |
/** |
* Returns a new [ExtractMethodRefactoring] instance. |
*/ |
- factory ExtractMethodRefactoring(SearchEngine searchEngine, |
- CompilationUnit unit, int selectionOffset, int selectionLength) { |
+ factory ExtractMethodRefactoring( |
+ SearchEngine searchEngine, |
+ AstProvider astProvider, |
+ CompilationUnit unit, |
+ int selectionOffset, |
+ int selectionLength) { |
return new ExtractMethodRefactoringImpl( |
- searchEngine, unit, selectionOffset, selectionLength); |
+ searchEngine, astProvider, unit, selectionOffset, selectionLength); |
} |
/** |
@@ -398,7 +402,8 @@ abstract class RenameRefactoring implements Refactoring { |
return new RenameLocalRefactoringImpl(searchEngine, astProvider, element); |
} |
if (element.enclosingElement is ClassElement) { |
- return new RenameClassMemberRefactoringImpl(searchEngine, element); |
+ return new RenameClassMemberRefactoringImpl( |
+ searchEngine, astProvider, element); |
} |
return null; |
} |
@@ -449,9 +454,7 @@ class ResolvedUnitCache { |
} |
Future<CompilationUnit> getUnit(Element element) async { |
- CompilationUnitElement unitElement = |
- element.getAncestor((e) => e is CompilationUnitElement) |
- as CompilationUnitElement; |
+ CompilationUnitElement unitElement = getUnitElement(element); |
CompilationUnit unit = _map[unitElement]; |
if (unit == null) { |
unit = await _astProvider.getResolvedUnitForElement(element); |
@@ -459,4 +462,9 @@ class ResolvedUnitCache { |
} |
return unit; |
} |
+ |
+ CompilationUnitElement getUnitElement(Element element) { |
+ return element.getAncestor((e) => e is CompilationUnitElement) |
+ as CompilationUnitElement; |
+ } |
} |