New J2K: do not create erroneous conversion from Java accessors to property

#KT-38004 fixed
This commit is contained in:
Ilya Kirillov
2020-04-14 21:58:33 +03:00
parent d1a59e8da6
commit e4a721d03e
2 changed files with 1 additions and 9 deletions
@@ -56,7 +56,6 @@ internal class ExternalUsagesFixer(private val usages: List<JKMemberInfoWithUsag
private fun JKMethodData.fix(javaUsages: List<PsiElement>, kotlinUsages: List<KtElement>) {
usedAsAccessorOfProperty?.let { property ->
val ktProperty = property.kotlinElement
val accessorKind =
if (javaElement.name.startsWith("set")) AccessorKind.SETTER
else AccessorKind.GETTER
@@ -64,13 +63,6 @@ internal class ExternalUsagesFixer(private val usages: List<JKMemberInfoWithUsag
kotlinUsages.forEach { usage ->
conversions += AccessorToPropertyKotlinExternalConversion(property.name, accessorKind, usage)
}
if (ktProperty != null
&& javaUsages.isNotEmpty()
&& ktProperty.isSimpleProperty()
) javaUsages.forEach { usage ->
conversions += AccessorToPropertyJavaExternalConversion(property.name, accessorKind, usage)
}
}
if (javaUsages.isNotEmpty() && isStatic) {
when (val accessorOf = usedAsAccessorOfProperty) {
@@ -2,6 +2,6 @@ package test;
class JavaClass {
void foo(AAA a) {
a.x = a.x + 1;
a.setX(a.getX() + 1);
}
}