From 77b637e238b7218a2af90b416f08ddb131e2bb9b Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 14 Jan 2016 14:52:06 +0300 Subject: [PATCH] Change Signature: Skip Java methods which can't be resolved from Kotlin (such as methods of local classes) #KT-10432 Fixed --- .../changeSignature/KotlinChangeSignatureUsageProcessor.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt index 6c2c1296b42..35a5f3c6631 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt @@ -831,9 +831,8 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { val descriptorWrapper = usages.firstIsInstanceOrNull() if (descriptorWrapper == null || descriptorWrapper.originalJavaMethodDescriptor != null) return true - val methodDescriptor = method.getJavaMethodDescriptor() - assert(methodDescriptor != null) - descriptorWrapper.originalJavaMethodDescriptor = KotlinChangeSignatureData(methodDescriptor!!, method, listOf(methodDescriptor)) + val methodDescriptor = method.getJavaMethodDescriptor() ?: return false + descriptorWrapper.originalJavaMethodDescriptor = KotlinChangeSignatureData(methodDescriptor, method, listOf(methodDescriptor)) // This change info is used as a placeholder before primary method update // It gets replaced with real change info afterwards