From e4a721d03e912b08a3132bcee3c77267112cd005 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Tue, 14 Apr 2020 21:58:33 +0300
Subject: [PATCH] New J2K: do not create erroneous conversion from Java
 accessors to property

#KT-38004 fixed
---
 .../nj2k/externalCodeProcessing/ExternalUsagesFixer.kt    | 8 --------
 .../GetterAndSetterUsages/external/4.java.expected        | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/ExternalUsagesFixer.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/ExternalUsagesFixer.kt
index 6b82e9d25da..f49a421400e 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/ExternalUsagesFixer.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/externalCodeProcessing/ExternalUsagesFixer.kt
@@ -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) {
diff --git a/nj2k/testData/multiFile/GetterAndSetterUsages/external/4.java.expected b/nj2k/testData/multiFile/GetterAndSetterUsages/external/4.java.expected
index dbed52ba1a8..872ea785a9c 100644
--- a/nj2k/testData/multiFile/GetterAndSetterUsages/external/4.java.expected
+++ b/nj2k/testData/multiFile/GetterAndSetterUsages/external/4.java.expected
@@ -2,6 +2,6 @@ package test;
 
 class JavaClass {
     void foo(AAA a) {
-        a.x = a.x + 1;
+        a.setX(a.getX() + 1);
     }
 }