| 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_class_member; | 5 library services.src.refactoring.rename_class_member; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/src/protocol2.dart' show Location, SourceEdit; | 9 import 'package:analysis_server/src/protocol2.dart' show Location, |
| 10 import 'package:analysis_server/src/services/correction/change.dart'; | 10 SourceChange, SourceEdit; |
| 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/refactoring/refactoring.dart'; | 12 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; |
| 13 import 'package:analysis_server/src/services/search/hierarchy.dart'; | 13 import 'package:analysis_server/src/services/search/hierarchy.dart'; |
| 14 import 'package:analysis_server/src/services/search/search_engine.dart'; | 14 import 'package:analysis_server/src/services/search/search_engine.dart'; |
| 15 import 'package:analysis_server/src/services/correction/util.dart'; | 15 import 'package:analysis_server/src/services/correction/util.dart'; |
| 16 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart
'; | 16 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart
'; |
| 17 import 'package:analysis_server/src/services/refactoring/rename.dart'; | 17 import 'package:analysis_server/src/services/refactoring/rename.dart'; |
| 18 import 'package:analyzer/src/generated/element.dart'; | 18 import 'package:analyzer/src/generated/element.dart'; |
| 19 import 'package:analyzer/src/generated/java_core.dart'; | 19 import 'package:analyzer/src/generated/java_core.dart'; |
| 20 | 20 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 result.addStatus(validateFieldName(newName)); | 66 result.addStatus(validateFieldName(newName)); |
| 67 } | 67 } |
| 68 } | 68 } |
| 69 if (element is MethodElement) { | 69 if (element is MethodElement) { |
| 70 result.addStatus(validateMethodName(newName)); | 70 result.addStatus(validateMethodName(newName)); |
| 71 } | 71 } |
| 72 return result; | 72 return result; |
| 73 } | 73 } |
| 74 | 74 |
| 75 @override | 75 @override |
| 76 Future<Change> createChange() { | 76 Future<SourceChange> createChange() { |
| 77 Change change = new Change(refactoringName); | 77 SourceChange change = new SourceChange(refactoringName); |
| 78 // update declarations | 78 // update declarations |
| 79 for (Element renameElement in _validator.elements) { | 79 for (Element renameElement in _validator.elements) { |
| 80 if (renameElement.isSynthetic && renameElement is FieldElement) { | 80 if (renameElement.isSynthetic && renameElement is FieldElement) { |
| 81 addDeclarationEdit(change, renameElement.getter); | 81 addDeclarationEdit(change, renameElement.getter); |
| 82 addDeclarationEdit(change, renameElement.setter); | 82 addDeclarationEdit(change, renameElement.setter); |
| 83 } else { | 83 } else { |
| 84 addDeclarationEdit(change, renameElement); | 84 addDeclarationEdit(change, renameElement); |
| 85 } | 85 } |
| 86 } | 86 } |
| 87 // update references | 87 // update references |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 Future _prepareReferences() { | 231 Future _prepareReferences() { |
| 232 return _prepareElements().then((_) { | 232 return _prepareElements().then((_) { |
| 233 return Future.forEach(elements, (Element element) { | 233 return Future.forEach(elements, (Element element) { |
| 234 return searchEngine.searchReferences(element).then((references) { | 234 return searchEngine.searchReferences(element).then((references) { |
| 235 this.references.addAll(references); | 235 this.references.addAll(references); |
| 236 }); | 236 }); |
| 237 }); | 237 }); |
| 238 }); | 238 }); |
| 239 } | 239 } |
| 240 } | 240 } |
| OLD | NEW |