| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library services.src.refactoring.inline_method; | 5 library services.src.refactoring.inline_method; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/src/protocol_server.dart' hide Element; | 9 import 'package:analysis_server/src/protocol_server.dart' hide Element; |
| 10 import 'package:analysis_server/src/services/correction/source_range.dart'; | 10 import 'package:analysis_server/src/services/correction/source_range.dart'; |
| 11 import 'package:analysis_server/src/services/correction/status.dart'; | 11 import 'package:analysis_server/src/services/correction/status.dart'; |
| 12 import 'package:analysis_server/src/services/correction/strings.dart'; | 12 import 'package:analysis_server/src/services/correction/strings.dart'; |
| 13 import 'package:analysis_server/src/services/correction/util.dart'; | 13 import 'package:analysis_server/src/services/correction/util.dart'; |
| 14 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; | 14 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; |
| 15 import 'package:analysis_server/src/services/refactoring/refactoring_internal.da
rt'; | 15 import 'package:analysis_server/src/services/refactoring/refactoring_internal.da
rt'; |
| 16 import 'package:analysis_server/src/services/search/element_visitors.dart'; | 16 import 'package:analysis_server/src/services/search/element_visitors.dart'; |
| 17 import 'package:analysis_server/src/services/search/hierarchy.dart'; | 17 import 'package:analysis_server/src/services/search/hierarchy.dart'; |
| 18 import 'package:analysis_server/src/services/search/search_engine.dart'; | 18 import 'package:analysis_server/src/services/search/search_engine.dart'; |
| 19 import 'package:analyzer/dart/ast/ast.dart'; |
| 20 import 'package:analyzer/dart/ast/visitor.dart'; |
| 19 import 'package:analyzer/dart/element/element.dart'; | 21 import 'package:analyzer/dart/element/element.dart'; |
| 20 import 'package:analyzer/src/generated/ast.dart'; | 22 import 'package:analyzer/src/dart/ast/utilities.dart'; |
| 21 import 'package:analyzer/src/generated/source.dart'; | 23 import 'package:analyzer/src/generated/source.dart'; |
| 22 import 'package:analyzer/src/generated/utilities_dart.dart'; | 24 import 'package:analyzer/src/generated/utilities_dart.dart'; |
| 23 | 25 |
| 24 /** | 26 /** |
| 25 * Returns the [SourceRange] to find conflicting locals in. | 27 * Returns the [SourceRange] to find conflicting locals in. |
| 26 */ | 28 */ |
| 27 SourceRange _getLocalsConflictingRange(AstNode node) { | 29 SourceRange _getLocalsConflictingRange(AstNode node) { |
| 28 // maybe Block | 30 // maybe Block |
| 29 Block block = node.getAncestor((node) => node is Block); | 31 Block block = node.getAncestor((node) => node is Block); |
| 30 if (block != null) { | 32 if (block != null) { |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 823 } | 825 } |
| 824 | 826 |
| 825 void _addVariable(SimpleIdentifier node) { | 827 void _addVariable(SimpleIdentifier node) { |
| 826 VariableElement variableElement = getLocalVariableElement(node); | 828 VariableElement variableElement = getLocalVariableElement(node); |
| 827 if (variableElement != null) { | 829 if (variableElement != null) { |
| 828 SourceRange nodeRange = rangeNode(node); | 830 SourceRange nodeRange = rangeNode(node); |
| 829 result.addVariable(variableElement, nodeRange); | 831 result.addVariable(variableElement, nodeRange); |
| 830 } | 832 } |
| 831 } | 833 } |
| 832 } | 834 } |
| OLD | NEW |