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

EA-235761 // NPE fix

Browse Source 
https://ea.jetbrains.com/browser/ea_problems/235761
This commit is contained in:
Andrei Klunnyi
2020-07-21 15:46:18 +02:00
parent e63951c38c
commit 29281fd0bf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpData.kt
+5 -5
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.utils.collectDescriptorsFiltered import org.jetbrains.kotlin.resolve.scopes.utils.collectDescriptorsFiltered
import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.substitutions.getTypeSubstitution import org.jetbrains.kotlin.types.substitutions.getTypeSubstitution
import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.kotlin.utils.keysToMapExceptNulls
import java.util.* import java.util.*
class KotlinPullUpData( class KotlinPullUpData(
@@ -37,11 +37,11 @@ class KotlinPullUpData(
val sourceClassDescriptor = sourceClassContext[BindingContext.DECLARATION_TO_DESCRIPTOR, sourceClass] as ClassDescriptor val sourceClassDescriptor = sourceClassContext[BindingContext.DECLARATION_TO_DESCRIPTOR, sourceClass] as ClassDescriptor
val memberDescriptors = membersToMove.keysToMap { val memberDescriptors = membersToMove.keysToMapExceptNulls {
when (it) { when (it) {
is KtPsiClassWrapper -> it.psiClass.getJavaClassDescriptor(resolutionFacade)!! is KtPsiClassWrapper -> it.psiClass.getJavaClassDescriptor(resolutionFacade)
is KtParameter -> sourceClassContext[BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, it]!! is KtParameter -> sourceClassContext[BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, it]
else -> sourceClassContext[BindingContext.DECLARATION_TO_DESCRIPTOR, it]!! else -> sourceClassContext[BindingContext.DECLARATION_TO_DESCRIPTOR, it]
} }
} }