New J2K: do not create erroneous conversion from Java accessors to property
#KT-38004 fixed
This commit is contained in:
@@ -56,7 +56,6 @@ internal class ExternalUsagesFixer(private val usages: List<JKMemberInfoWithUsag
|
|||||||
|
|
||||||
private fun JKMethodData.fix(javaUsages: List<PsiElement>, kotlinUsages: List<KtElement>) {
|
private fun JKMethodData.fix(javaUsages: List<PsiElement>, kotlinUsages: List<KtElement>) {
|
||||||
usedAsAccessorOfProperty?.let { property ->
|
usedAsAccessorOfProperty?.let { property ->
|
||||||
val ktProperty = property.kotlinElement
|
|
||||||
val accessorKind =
|
val accessorKind =
|
||||||
if (javaElement.name.startsWith("set")) AccessorKind.SETTER
|
if (javaElement.name.startsWith("set")) AccessorKind.SETTER
|
||||||
else AccessorKind.GETTER
|
else AccessorKind.GETTER
|
||||||
@@ -64,13 +63,6 @@ internal class ExternalUsagesFixer(private val usages: List<JKMemberInfoWithUsag
|
|||||||
kotlinUsages.forEach { usage ->
|
kotlinUsages.forEach { usage ->
|
||||||
conversions += AccessorToPropertyKotlinExternalConversion(property.name, accessorKind, 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) {
|
if (javaUsages.isNotEmpty() && isStatic) {
|
||||||
when (val accessorOf = usedAsAccessorOfProperty) {
|
when (val accessorOf = usedAsAccessorOfProperty) {
|
||||||
|
|||||||
@@ -2,6 +2,6 @@ package test;
|
|||||||
|
|
||||||
class JavaClass {
|
class JavaClass {
|
||||||
void foo(AAA a) {
|
void foo(AAA a) {
|
||||||
a.x = a.x + 1;
|
a.setX(a.getX() + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user