| 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/protocol.dart' hide Element; | 9 import 'package:analysis_server/src/protocol_server.dart' hide Element; |
| 10 import 'package:analysis_server/src/services/correction/status.dart'; | 10 import 'package:analysis_server/src/services/correction/status.dart'; |
| 11 import 'package:analysis_server/src/services/correction/util.dart'; | 11 import 'package:analysis_server/src/services/correction/util.dart'; |
| 12 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart
'; | 12 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart
'; |
| 13 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; | 13 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; |
| 14 import 'package:analysis_server/src/services/refactoring/refactoring_internal.da
rt'; | 14 import 'package:analysis_server/src/services/refactoring/refactoring_internal.da
rt'; |
| 15 import 'package:analysis_server/src/services/refactoring/rename.dart'; | 15 import 'package:analysis_server/src/services/refactoring/rename.dart'; |
| 16 import 'package:analysis_server/src/services/search/hierarchy.dart'; | 16 import 'package:analysis_server/src/services/search/hierarchy.dart'; |
| 17 import 'package:analysis_server/src/services/search/search_engine.dart'; | 17 import 'package:analysis_server/src/services/search/search_engine.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'; |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 reference.addEdit(change, replacement); | 60 reference.addEdit(change, replacement); |
| 61 } | 61 } |
| 62 } | 62 } |
| 63 }); | 63 }); |
| 64 } | 64 } |
| 65 | 65 |
| 66 void _analyzePossibleConflicts(RefactoringStatus result) { | 66 void _analyzePossibleConflicts(RefactoringStatus result) { |
| 67 // check if there are members with "newName" in the same ClassElement | 67 // check if there are members with "newName" in the same ClassElement |
| 68 ClassElement parentClass = element.enclosingElement; | 68 ClassElement parentClass = element.enclosingElement; |
| 69 for (Element newNameMember in getChildren(parentClass, newName)) { | 69 for (Element newNameMember in getChildren(parentClass, newName)) { |
| 70 String message = | 70 String message = format( |
| 71 format( | 71 "Class '{0}' already declares {1} with name '{2}'.", |
| 72 "Class '{0}' already declares {1} with name '{2}'.", | 72 parentClass.displayName, |
| 73 parentClass.displayName, | 73 getElementKindName(newNameMember), |
| 74 getElementKindName(newNameMember), | 74 newName); |
| 75 newName); | 75 result.addError(message, newLocation_fromElement(newNameMember)); |
| 76 result.addError( | |
| 77 message, | |
| 78 new Location.fromElement(newNameMember)); | |
| 79 } | 76 } |
| 80 } | 77 } |
| 81 } | 78 } |
| OLD | NEW |