azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change Signature: Skip Java methods which can't be resolved from Kotlin (such as methods of local classes)

Browse Source 
#KT-10432 Fixed
This commit is contained in:
Alexey Sedunov
2016-01-14 14:52:06 +03:00
parent 0104bfec86
commit 77b637e238
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt
+2 -3
View File
@@ -831,9 +831,8 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
val descriptorWrapper = usages.firstIsInstanceOrNull<OriginalJavaMethodDescriptorWrapper>() val descriptorWrapper = usages.firstIsInstanceOrNull<OriginalJavaMethodDescriptorWrapper>()
if (descriptorWrapper == null || descriptorWrapper.originalJavaMethodDescriptor != null) return true if (descriptorWrapper == null || descriptorWrapper.originalJavaMethodDescriptor != null) return true
val methodDescriptor = method.getJavaMethodDescriptor() val methodDescriptor = method.getJavaMethodDescriptor() ?: return false
assert(methodDescriptor != null) descriptorWrapper.originalJavaMethodDescriptor = KotlinChangeSignatureData(methodDescriptor, method, listOf(methodDescriptor))
descriptorWrapper.originalJavaMethodDescriptor = KotlinChangeSignatureData(methodDescriptor!!, method, listOf(methodDescriptor))
// This change info is used as a placeholder before primary method update // This change info is used as a placeholder before primary method update
// It gets replaced with real change info afterwards // It gets replaced with real change info afterwards