| Index: pkg/analysis_server/lib/src/services/refactoring/extract_method.dart
|
| diff --git a/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart b/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart
|
| index aa17f1ae497b417bdba4df56185aaef823512419..e93bdd4f24196d6d166f0610d6d67f32eada17f5 100644
|
| --- a/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart
|
| +++ b/pkg/analysis_server/lib/src/services/refactoring/extract_method.dart
|
| @@ -24,6 +24,7 @@ import 'package:analyzer/dart/ast/visitor.dart';
|
| import 'package:analyzer/dart/element/element.dart';
|
| import 'package:analyzer/dart/element/type.dart';
|
| import 'package:analyzer/src/dart/ast/utilities.dart';
|
| +import 'package:analyzer/src/dart/element/ast_provider.dart';
|
| import 'package:analyzer/src/generated/engine.dart';
|
| import 'package:analyzer/src/generated/java_core.dart';
|
| import 'package:analyzer/src/generated/resolver.dart' show ExitDetector;
|
| @@ -72,6 +73,7 @@ class ExtractMethodRefactoringImpl extends RefactoringImpl
|
| 'execution flows exit. Semantics may not be preserved.';
|
|
|
| final SearchEngine searchEngine;
|
| + final AstProvider astProvider;
|
| final CompilationUnit unit;
|
| final int selectionOffset;
|
| final int selectionLength;
|
| @@ -118,7 +120,7 @@ class ExtractMethodRefactoringImpl extends RefactoringImpl
|
| List<_Occurrence> _occurrences = [];
|
| bool _staticContext = false;
|
|
|
| - ExtractMethodRefactoringImpl(this.searchEngine, this.unit,
|
| + ExtractMethodRefactoringImpl(this.searchEngine, this.astProvider, this.unit,
|
| this.selectionOffset, this.selectionLength) {
|
| unitElement = unit.element;
|
| libraryElement = unitElement.library;
|
| @@ -418,7 +420,8 @@ class ExtractMethodRefactoringImpl extends RefactoringImpl
|
| // method of class
|
| if (parent is ClassDeclaration) {
|
| ClassElement classElement = parent.element;
|
| - return validateCreateMethod(searchEngine, classElement, name);
|
| + return validateCreateMethod(
|
| + searchEngine, astProvider, classElement, name);
|
| }
|
| // OK
|
| return new Future<RefactoringStatus>.value(result);
|
|
|