diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt index 7bb768b5a23..3be0ab3f8e1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceUtil.kt @@ -154,8 +154,8 @@ fun selectElementsWithTargetParent( selectSingleElement() } -fun PsiElement.findExpressionByCopyableDataAndClearIt(key: Key): KtExpression { - val result = findDescendantOfType { it.getCopyableUserData(key) != null }!! +fun PsiElement.findExpressionByCopyableDataAndClearIt(key: Key): KtExpression? { + val result = findDescendantOfType { it.getCopyableUserData(key) != null } ?: return null result.putCopyableUserData(key, null) return result } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt index a11e0ecc172..903cb3c9250 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt @@ -324,7 +324,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler { } ?: newReplace } - runRefactoring(isVar, newExpression, newCommonContainer, newCommonParent, newAllReplaces) + runRefactoring(isVar, newExpression ?: return, newCommonContainer, newCommonParent, newAllReplaces) } }