| 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_constructor; | 5 library services.src.refactoring.rename_constructor; |
| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 51 |
| 51 @override | 52 @override |
| 52 Future<Change> createChange() { | 53 Future<Change> createChange() { |
| 53 Change change = new Change(refactoringName); | 54 Change change = new Change(refactoringName); |
| 54 String replacement = newName.isEmpty ? '' : '.${newName}'; | 55 String replacement = newName.isEmpty ? '' : '.${newName}'; |
| 55 // update references | 56 // update references |
| 56 return searchEngine.searchReferences(element).then((refMatches) { | 57 return searchEngine.searchReferences(element).then((refMatches) { |
| 57 List<SourceReference> references = getSourceReferences(refMatches); | 58 List<SourceReference> references = getSourceReferences(refMatches); |
| 58 if (!element.isSynthetic) { | 59 if (!element.isSynthetic) { |
| 59 for (SourceReference reference in references) { | 60 for (SourceReference reference in references) { |
| 60 Edit edit = createReferenceEdit(reference, replacement); | 61 SourceEdit edit = createReferenceEdit(reference, replacement); |
| 61 change.addEdit(reference.file, edit); | 62 change.addEdit(reference.file, edit); |
| 62 } | 63 } |
| 63 } | 64 } |
| 64 return change; | 65 return change; |
| 65 }); | 66 }); |
| 66 } | 67 } |
| 67 | 68 |
| 68 void _analyzePossibleConflicts(RefactoringStatus result) { | 69 void _analyzePossibleConflicts(RefactoringStatus result) { |
| 69 // check if there are members with "newName" in the same ClassElement | 70 // check if there are members with "newName" in the same ClassElement |
| 70 ClassElement parentClass = element.enclosingElement; | 71 ClassElement parentClass = element.enclosingElement; |
| 71 for (Element newNameMember in getChildren(parentClass, newName)) { | 72 for (Element newNameMember in getChildren(parentClass, newName)) { |
| 72 String message = | 73 String message = |
| 73 format( | 74 format( |
| 74 "Class '{0}' already declares {1} with name '{2}'.", | 75 "Class '{0}' already declares {1} with name '{2}'.", |
| 75 parentClass.displayName, | 76 parentClass.displayName, |
| 76 getElementKindName(newNameMember), | 77 getElementKindName(newNameMember), |
| 77 newName); | 78 newName); |
| 78 result.addError( | 79 result.addError( |
| 79 message, | 80 message, |
| 80 new RefactoringStatusContext.forElement(newNameMember)); | 81 new RefactoringStatusContext.forElement(newNameMember)); |
| 81 } | 82 } |
| 82 } | 83 } |
| 83 } | 84 } |
| OLD | NEW |