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

Fix KNPE during move nested class to upper level (EA-128165)

Browse Source
This commit is contained in:
Andrey Uskov
2018-12-25 13:58:12 +03:00
parent 9ec8ec4f3d
commit 467d5a3cf0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/KotlinSelectNestedClassRefactoringDialog.kt
+3 -3
View File
@@ -85,8 +85,8 @@ internal class KotlinSelectNestedClassRefactoringDialog private constructor (
private fun MoveKotlinNestedClassesToUpperLevelDialog( private fun MoveKotlinNestedClassesToUpperLevelDialog(
nestedClass: KtClassOrObject, nestedClass: KtClassOrObject,
targetContainer: PsiElement? targetContainer: PsiElement?
): MoveKotlinNestedClassesToUpperLevelDialog { ): MoveKotlinNestedClassesToUpperLevelDialog? {
val outerClass = nestedClass.containingClassOrObject!! val outerClass = nestedClass.containingClassOrObject ?: return null
val newTarget = targetContainer val newTarget = targetContainer
?: outerClass.containingClassOrObject ?: outerClass.containingClassOrObject
?: outerClass.containingFile.let { it.containingDirectory ?: it } ?: outerClass.containingFile.let { it.containingDirectory ?: it }
@@ -119,7 +119,7 @@ internal class KotlinSelectNestedClassRefactoringDialog private constructor (
selectionDialog.getNextDialog() ?: return selectionDialog.getNextDialog() ?: return
} }
} }
dialog.show() dialog?.show()
} }
} }
} }