| 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.rename_local; | 5 library services.src.refactoring.rename_local; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/src/protocol2.dart' show Location; | 9 import 'package:analysis_server/src/protocol2.dart' show Location, SourceChange; |
| 10 import 'package:analysis_server/src/services/correction/change.dart'; | |
| 11 import 'package:analysis_server/src/services/correction/status.dart'; | 10 import 'package:analysis_server/src/services/correction/status.dart'; |
| 12 import 'package:analysis_server/src/services/correction/util.dart'; | 11 import 'package:analysis_server/src/services/correction/util.dart'; |
| 13 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart
'; | 12 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart
'; |
| 14 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; | 13 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; |
| 15 import 'package:analysis_server/src/services/refactoring/rename.dart'; | 14 import 'package:analysis_server/src/services/refactoring/rename.dart'; |
| 16 import 'package:analysis_server/src/services/search/hierarchy.dart'; | 15 import 'package:analysis_server/src/services/search/hierarchy.dart'; |
| 17 import 'package:analysis_server/src/services/search/search_engine.dart'; | 16 import 'package:analysis_server/src/services/search/search_engine.dart'; |
| 18 import 'package:analyzer/src/generated/ast.dart'; | 17 import 'package:analyzer/src/generated/ast.dart'; |
| 19 import 'package:analyzer/src/generated/element.dart'; | 18 import 'package:analyzer/src/generated/element.dart'; |
| 20 import 'package:analyzer/src/generated/source.dart'; | 19 import 'package:analyzer/src/generated/source.dart'; |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 } | 64 } |
| 66 } else if (element is ParameterElement) { | 65 } else if (element is ParameterElement) { |
| 67 result.addStatus(validateParameterName(newName)); | 66 result.addStatus(validateParameterName(newName)); |
| 68 } else if (element is FunctionElement) { | 67 } else if (element is FunctionElement) { |
| 69 result.addStatus(validateFunctionName(newName)); | 68 result.addStatus(validateFunctionName(newName)); |
| 70 } | 69 } |
| 71 return result; | 70 return result; |
| 72 } | 71 } |
| 73 | 72 |
| 74 @override | 73 @override |
| 75 Future<Change> createChange() { | 74 Future<SourceChange> createChange() { |
| 76 Change change = new Change(refactoringName); | 75 SourceChange change = new SourceChange(refactoringName); |
| 77 // update declaration | 76 // update declaration |
| 78 addDeclarationEdit(change, element); | 77 addDeclarationEdit(change, element); |
| 79 // update references | 78 // update references |
| 80 return searchEngine.searchReferences(element).then((refMatches) { | 79 return searchEngine.searchReferences(element).then((refMatches) { |
| 81 List<SourceReference> references = getSourceReferences(refMatches); | 80 List<SourceReference> references = getSourceReferences(refMatches); |
| 82 for (SourceReference reference in references) { | 81 for (SourceReference reference in references) { |
| 83 addReferenceEdit(change, reference); | 82 addReferenceEdit(change, reference); |
| 84 } | 83 } |
| 85 return change; | 84 return change; |
| 86 }); | 85 }); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 String refKind = refactoring.element.kind.displayName; | 131 String refKind = refactoring.element.kind.displayName; |
| 133 String message = | 132 String message = |
| 134 'Usage of $nodeKind "$nodeName" declared in ' | 133 'Usage of $nodeKind "$nodeName" declared in ' |
| 135 '"$nameElementSourceName" will be shadowed by renamed $refKind.'
; | 134 '"$nameElementSourceName" will be shadowed by renamed $refKind.'
; |
| 136 result.addError(message, new Location.fromNode(node)); | 135 result.addError(message, new Location.fromNode(node)); |
| 137 } | 136 } |
| 138 } | 137 } |
| 139 return null; | 138 return null; |
| 140 } | 139 } |
| 141 } | 140 } |
| OLD | NEW |