| 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/protocol.dart' hide Element, ElementKind; | 9 import 'package:analysis_server/src/protocol_server.dart' hide Element, |
| 10 ElementKind; |
| 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/correction/util.dart'; | 12 import 'package:analysis_server/src/services/correction/util.dart'; |
| 12 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart
'; | 13 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart
'; |
| 13 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; | 14 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; |
| 14 import 'package:analysis_server/src/services/refactoring/refactoring_internal.da
rt'; | 15 import 'package:analysis_server/src/services/refactoring/refactoring_internal.da
rt'; |
| 15 import 'package:analysis_server/src/services/refactoring/rename.dart'; | 16 import 'package:analysis_server/src/services/refactoring/rename.dart'; |
| 16 import 'package:analysis_server/src/services/search/hierarchy.dart'; | 17 import 'package:analysis_server/src/services/search/hierarchy.dart'; |
| 17 import 'package:analysis_server/src/services/search/search_engine.dart'; | 18 import 'package:analysis_server/src/services/search/search_engine.dart'; |
| 18 import 'package:analyzer/src/generated/element.dart'; | 19 import 'package:analyzer/src/generated/element.dart'; |
| 19 import 'package:analyzer/src/generated/java_core.dart'; | 20 import 'package:analyzer/src/generated/java_core.dart'; |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 Future<RefactoringStatus> validate() { | 157 Future<RefactoringStatus> validate() { |
| 157 RefactoringStatus result = new RefactoringStatus(); | 158 RefactoringStatus result = new RefactoringStatus(); |
| 158 // check if there is a member with "newName" in the same ClassElement | 159 // check if there is a member with "newName" in the same ClassElement |
| 159 for (Element newNameMember in getChildren(elementClass, name)) { | 160 for (Element newNameMember in getChildren(elementClass, name)) { |
| 160 result.addError( | 161 result.addError( |
| 161 format( | 162 format( |
| 162 "Class '{0}' already declares {1} with name '{2}'.", | 163 "Class '{0}' already declares {1} with name '{2}'.", |
| 163 elementClass.displayName, | 164 elementClass.displayName, |
| 164 getElementKindName(newNameMember), | 165 getElementKindName(newNameMember), |
| 165 name), | 166 name), |
| 166 new Location.fromElement(newNameMember)); | 167 newLocation_fromElement(newNameMember)); |
| 167 } | 168 } |
| 168 // do chained computations | 169 // do chained computations |
| 169 Set<ClassElement> superClasses = getSuperClasses(elementClass); | 170 Set<ClassElement> superClasses = getSuperClasses(elementClass); |
| 170 Set<ClassElement> subClasses; | 171 Set<ClassElement> subClasses; |
| 171 return _prepareReferences().then((_) { | 172 return _prepareReferences().then((_) { |
| 172 return getSubClasses(searchEngine, elementClass).then((_subs) { | 173 return getSubClasses(searchEngine, elementClass).then((_subs) { |
| 173 subClasses = _subs; | 174 subClasses = _subs; |
| 174 }); | 175 }); |
| 175 }).then((_) { | 176 }).then((_) { |
| 176 // check shadowing in hierarchy | 177 // check shadowing in hierarchy |
| 177 return searchEngine.searchElementDeclarations(name).then((decls) { | 178 return searchEngine.searchElementDeclarations(name).then((decls) { |
| 178 for (SearchMatch decl in decls) { | 179 for (SearchMatch decl in decls) { |
| 179 Element nameElement = getSyntheticAccessorVariable(decl.element); | 180 Element nameElement = getSyntheticAccessorVariable(decl.element); |
| 180 Element nameClass = nameElement.enclosingElement; | 181 Element nameClass = nameElement.enclosingElement; |
| 181 // renamed Element shadows member of superclass | 182 // renamed Element shadows member of superclass |
| 182 if (superClasses.contains(nameClass)) { | 183 if (superClasses.contains(nameClass)) { |
| 183 result.addError( | 184 result.addError( |
| 184 format( | 185 format( |
| 185 isRename ? | 186 isRename ? |
| 186 "Renamed {0} will shadow {1} '{2}'." : | 187 "Renamed {0} will shadow {1} '{2}'." : |
| 187 "Created {0} will shadow {1} '{2}'.", | 188 "Created {0} will shadow {1} '{2}'.", |
| 188 elementKind.displayName, | 189 elementKind.displayName, |
| 189 getElementKindName(nameElement), | 190 getElementKindName(nameElement), |
| 190 getElementQualifiedName(nameElement)), | 191 getElementQualifiedName(nameElement)), |
| 191 new Location.fromElement(nameElement)); | 192 newLocation_fromElement(nameElement)); |
| 192 } | 193 } |
| 193 // renamed Element is shadowed by member of subclass | 194 // renamed Element is shadowed by member of subclass |
| 194 if (isRename && subClasses.contains(nameClass)) { | 195 if (isRename && subClasses.contains(nameClass)) { |
| 195 result.addError( | 196 result.addError( |
| 196 format( | 197 format( |
| 197 "Renamed {0} will be shadowed by {1} '{2}'.", | 198 "Renamed {0} will be shadowed by {1} '{2}'.", |
| 198 elementKind.displayName, | 199 elementKind.displayName, |
| 199 getElementKindName(nameElement), | 200 getElementKindName(nameElement), |
| 200 getElementQualifiedName(nameElement)), | 201 getElementQualifiedName(nameElement)), |
| 201 new Location.fromElement(nameElement)); | 202 newLocation_fromElement(nameElement)); |
| 202 } | 203 } |
| 203 // renamed Element is shadowed by local | 204 // renamed Element is shadowed by local |
| 204 if (nameElement is LocalElement) { | 205 if (nameElement is LocalElement) { |
| 205 LocalElement localElement = nameElement; | 206 LocalElement localElement = nameElement; |
| 206 ClassElement enclosingClass = | 207 ClassElement enclosingClass = |
| 207 nameElement.getAncestor((element) => element is ClassElement); | 208 nameElement.getAncestor((element) => element is ClassElement); |
| 208 if (enclosingClass == elementClass || | 209 if (enclosingClass == elementClass || |
| 209 subClasses.contains(enclosingClass)) { | 210 subClasses.contains(enclosingClass)) { |
| 210 for (SearchMatch reference in references) { | 211 for (SearchMatch reference in references) { |
| 211 if (isReferenceInLocalRange(localElement, reference)) { | 212 if (isReferenceInLocalRange(localElement, reference)) { |
| 212 result.addError( | 213 result.addError( |
| 213 format( | 214 format( |
| 214 "Usage of renamed {0} will be shadowed by {1} '{2}'.", | 215 "Usage of renamed {0} will be shadowed by {1} '{2}'.", |
| 215 elementKind.displayName, | 216 elementKind.displayName, |
| 216 getElementKindName(localElement), | 217 getElementKindName(localElement), |
| 217 localElement.displayName), | 218 localElement.displayName), |
| 218 new Location.fromMatch(reference)); | 219 newLocation_fromMatch(reference)); |
| 219 } | 220 } |
| 220 } | 221 } |
| 221 } | 222 } |
| 222 } | 223 } |
| 223 } | 224 } |
| 224 }); | 225 }); |
| 225 }).then((_) => result); | 226 }).then((_) => result); |
| 226 } | 227 } |
| 227 | 228 |
| 228 /** | 229 /** |
| (...skipping 21 matching lines...) Expand all Loading... |
| 250 } | 251 } |
| 251 return _prepareElements().then((_) { | 252 return _prepareElements().then((_) { |
| 252 return Future.forEach(elements, (Element element) { | 253 return Future.forEach(elements, (Element element) { |
| 253 return searchEngine.searchReferences(element).then((references) { | 254 return searchEngine.searchReferences(element).then((references) { |
| 254 this.references.addAll(references); | 255 this.references.addAll(references); |
| 255 }); | 256 }); |
| 256 }); | 257 }); |
| 257 }); | 258 }); |
| 258 } | 259 } |
| 259 } | 260 } |
| OLD | NEW |