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

Fix KNPE in introduce new variable (EA-131176)

Browse Source
This commit is contained in:
Andrey Uskov
2018-12-24 20:30:34 +03:00
parent 710baf969f
commit 95caabf22f
2 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/introduce/introduceUtil.kt
+2 -2
View File
@@ -154,8 +154,8 @@ fun selectElementsWithTargetParent(
selectSingleElement() selectSingleElement()
} }
fun PsiElement.findExpressionByCopyableDataAndClearIt(key: Key<Boolean>): KtExpression { fun PsiElement.findExpressionByCopyableDataAndClearIt(key: Key<Boolean>): KtExpression? {
val result = findDescendantOfType<KtExpression> { it.getCopyableUserData(key) != null }!! val result = findDescendantOfType<KtExpression> { it.getCopyableUserData(key) != null } ?: return null
result.putCopyableUserData(key, null) result.putCopyableUserData(key, null)
return result return result
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
+1 -1
View File
@@ -324,7 +324,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
} ?: newReplace } ?: newReplace
} }
runRefactoring(isVar, newExpression, newCommonContainer, newCommonParent, newAllReplaces) runRefactoring(isVar, newExpression ?: return, newCommonContainer, newCommonParent, newAllReplaces)
} }
} }