| 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 SourceEdit; |
| 9 import 'package:analysis_server/src/services/correction/change.dart'; | 10 import 'package:analysis_server/src/services/correction/change.dart'; |
| 10 import 'package:analysis_server/src/services/correction/status.dart'; | 11 import 'package:analysis_server/src/services/correction/status.dart'; |
| 11 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; | 12 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; |
| 12 import 'package:analysis_server/src/services/search/hierarchy.dart'; | 13 import 'package:analysis_server/src/services/search/hierarchy.dart'; |
| 13 import 'package:analysis_server/src/services/search/search_engine.dart'; | 14 import 'package:analysis_server/src/services/search/search_engine.dart'; |
| 14 import 'package:analysis_server/src/services/correction/util.dart'; | 15 import 'package:analysis_server/src/services/correction/util.dart'; |
| 15 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart
'; | 16 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart
'; |
| 16 import 'package:analysis_server/src/services/refactoring/rename.dart'; | 17 import 'package:analysis_server/src/services/refactoring/rename.dart'; |
| 17 import 'package:analyzer/src/generated/element.dart'; | 18 import 'package:analyzer/src/generated/element.dart'; |
| 18 import 'package:analyzer/src/generated/java_core.dart'; | 19 import 'package:analyzer/src/generated/java_core.dart'; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 continue; | 101 continue; |
| 101 } | 102 } |
| 102 // check the element being renamed is accessible | 103 // check the element being renamed is accessible |
| 103 { | 104 { |
| 104 LibraryElement whereLibrary = reference.element.library; | 105 LibraryElement whereLibrary = reference.element.library; |
| 105 if (!element.isAccessibleIn(whereLibrary)) { | 106 if (!element.isAccessibleIn(whereLibrary)) { |
| 106 continue; | 107 continue; |
| 107 } | 108 } |
| 108 } | 109 } |
| 109 // add edit | 110 // add edit |
| 110 Edit edit = createReferenceEdit(reference, newName); | 111 SourceEdit edit = createReferenceEdit(reference, newName, |
| 111 _markEditAsPotential(edit); | 112 id: _newPotentialId()); |
| 112 change.addEdit(reference.file, edit); | 113 change.addEdit(reference.file, edit); |
| 113 } | 114 } |
| 114 }).then((_) => change); | 115 }).then((_) => change); |
| 115 } | 116 } |
| 116 | 117 |
| 117 void _markEditAsPotential(Edit edit) { | 118 String _newPotentialId() { |
| 118 String id = potentialEditIds.length.toString(); | 119 String id = potentialEditIds.length.toString(); |
| 119 potentialEditIds.add(id); | 120 potentialEditIds.add(id); |
| 120 edit.id = id; | 121 return id; |
| 121 } | 122 } |
| 122 } | 123 } |
| 123 | 124 |
| 124 | 125 |
| 125 /** | 126 /** |
| 126 * Helper to check if renaming of an [Element] to the given name will cause any | 127 * Helper to check if renaming of an [Element] to the given name will cause any |
| 127 * problems. | 128 * problems. |
| 128 */ | 129 */ |
| 129 class _RenameClassMemberValidator { | 130 class _RenameClassMemberValidator { |
| 130 final SearchEngine searchEngine; | 131 final SearchEngine searchEngine; |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 Future _prepareReferences() { | 233 Future _prepareReferences() { |
| 233 return _prepareElements().then((_) { | 234 return _prepareElements().then((_) { |
| 234 return Future.forEach(elements, (Element element) { | 235 return Future.forEach(elements, (Element element) { |
| 235 return searchEngine.searchReferences(element).then((references) { | 236 return searchEngine.searchReferences(element).then((references) { |
| 236 this.references.addAll(references); | 237 this.references.addAll(references); |
| 237 }); | 238 }); |
| 238 }); | 239 }); |
| 239 }); | 240 }); |
| 240 } | 241 } |
| 241 } | 242 } |
| OLD | NEW |