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

2018-12-25 13:58:12 +03:00
parent 9ec8ec4f3d
commit 467d5a3cf0
1 changed files with 3 additions and 3 deletions
@@ -85,8 +85,8 @@ internal class KotlinSelectNestedClassRefactoringDialog private constructor (
        private fun MoveKotlinNestedClassesToUpperLevelDialog(
                nestedClass: KtClassOrObject,
                targetContainer: PsiElement?
-        ): MoveKotlinNestedClassesToUpperLevelDialog {
-            val outerClass = nestedClass.containingClassOrObject!!
+        ): MoveKotlinNestedClassesToUpperLevelDialog? {
+            val outerClass = nestedClass.containingClassOrObject ?: return null
            val newTarget = targetContainer
                            ?: outerClass.containingClassOrObject
                            ?: outerClass.containingFile.let { it.containingDirectory ?: it }
@@ -119,7 +119,7 @@ internal class KotlinSelectNestedClassRefactoringDialog private constructor (
                    selectionDialog.getNextDialog() ?: return
                }
            }
-            dialog.show()
+            dialog?.show()
        }
    }
 }