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

CreateExpectedFix: fix KNPE from init block

Browse Source 
#KT-32639 Fixed
This commit is contained in:
Dmitry Gridin
2019-07-16 13:25:43 +03:00
parent f38e4d618e
commit 4928f3ff57
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/CreateExpectedFix.kt
+4 -2
View File
@@ -131,7 +131,7 @@ class CreateExpectedClassFix(
}) })
private fun KtDeclaration.canAddActualModifier() = when (this) { private fun KtDeclaration.canAddActualModifier() = when (this) {
is KtEnumEntry -> false is KtEnumEntry, is KtClassInitializer -> false
is KtParameter -> this.hasValOrVar() is KtParameter -> this.hasValOrVar()
else -> true else -> true
} }
@@ -140,7 +140,9 @@ private fun KtDeclaration.canAddActualModifier() = when (this) {
* @return null if close without OK * @return null if close without OK
*/ */
private fun chooseMembers(project: Project, collection: Collection<KtDeclaration>, prefixToRemove: String): List<KtDeclaration>? { private fun chooseMembers(project: Project, collection: Collection<KtDeclaration>, prefixToRemove: String): List<KtDeclaration>? {
val classMembers = collection.map { Member(prefixToRemove, it, it.resolveToDescriptorIfAny()!!) } val classMembers = collection.mapNotNull {
it.resolveToDescriptorIfAny()?.let { descriptor -> Member(prefixToRemove, it, descriptor) }
}
val filter = if (collection.any(KtDeclaration::hasActualModifier)) { val filter = if (collection.any(KtDeclaration::hasActualModifier)) {
{ declaration: KtDeclaration -> declaration.hasActualModifier() } { declaration: KtDeclaration -> declaration.hasActualModifier() }
} else { } else {