diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt index a743f7e6e2f..ba96b7d724f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt @@ -264,11 +264,7 @@ public open class JetChangeInfo( javaChangeInfos = null } - public fun getOrCreateJavaChangeInfos(multipleLightMethodsWithEqualNames: Boolean = false): List? { - fun filterLightMethods(list: List): List { - return if (multipleLightMethodsWithEqualNames) list else list.groupBy { it.name }.values().map { it.firstOrNull() }.filterNotNull() - } - + public fun getOrCreateJavaChangeInfos(): List? { /* * When primaryMethodUpdated is false, changes to the primary Kotlin declaration are already confirmed, but not yet applied. * It means that originalPsiMethod has already expired, but new one can't be created until Kotlin declaration is updated @@ -368,7 +364,7 @@ public open class JetChangeInfo( if (javaChangeInfos == null) { val method = getMethod() - javaChangeInfos = (filterLightMethods(originalPsiMethods) zip filterLightMethods(method.toLightMethods())).map { + javaChangeInfos = (originalPsiMethods zip method.toLightMethods()).map { val (originalPsiMethod, currentPsiMethod) = it when (method) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt index 8df01e3db65..b3800d96f41 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.kt @@ -46,7 +46,7 @@ public class JetChangeSignatureProcessor(project: Project, override fun findUsages(): Array { val allUsages = ArrayList() - getChangeInfo().getOrCreateJavaChangeInfos(true)?.let { javaChangeInfos -> + getChangeInfo().getOrCreateJavaChangeInfos()?.let { javaChangeInfos -> val javaProcessor = JavaChangeSignatureUsageProcessor() javaChangeInfos.mapTo(allUsages) { KotlinWrapperForJavaUsageInfos(it, javaProcessor.findUsages(it), getChangeInfo().getMethod()) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.kt index ce3cafcdc23..3d4deba1a3f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.kt @@ -797,7 +797,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { val isJavaMethodUsage = isJavaMethodUsage(usageInfo) if (usageInfo is KotlinWrapperForJavaUsageInfos) { - val javaChangeInfos = (changeInfo as JetChangeInfo).getOrCreateJavaChangeInfos(false) + val javaChangeInfos = (changeInfo as JetChangeInfo).getOrCreateJavaChangeInfos() assert(javaChangeInfos != null) { "JavaChangeInfo not found: " + method.text } val javaUsageInfos = usageInfo.javaUsageInfos