Rename: Process property accesor usages (Java) in comments and string literals

#KT-9435 Fixed
(cherry picked from commit 911afee)
This commit is contained in:
Alexey Sedunov
2016-06-14 21:01:25 +03:00
parent 14b6c1930e
commit 04f54bee88
10 changed files with 88 additions and 1 deletions
@@ -245,7 +245,21 @@ class RenameKotlinPropertyProcessor : RenameKotlinPsiProcessor() {
val newPropertyName = if (newName != null && element is KtLightMethod) propertyNameByAccessor(newName, element) else newName
val (getterJvmName, setterJvmName) = getJvmNames(namedUnwrappedElement)
for (propertyMethod in propertyMethods) {
if (element is KtDeclaration && newPropertyName != null) {
val wrapper = object : PsiNamedElement by propertyMethod {
override fun setName(name: String) = this
override fun copy() = this
}
when {
JvmAbi.isGetterName(propertyMethod.name) && getterJvmName == null ->
allRenames[wrapper] = JvmAbi.getterName(newPropertyName)
JvmAbi.isSetterName(propertyMethod.name) && setterJvmName == null ->
allRenames[wrapper] = JvmAbi.setterName(newPropertyName)
}
}
addRenameElements(propertyMethod, (element as PsiNamedElement).name, newPropertyName, allRenames, scope)
}
}