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

Fix KNPE in Introduce new variable (EA-132675)

Browse Source
This commit is contained in:
Andrey Uskov
2018-12-24 18:51:47 +03:00
parent 7dcb9db8cb
commit 1ec63c16f8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt
+2 -2
View File
@@ -213,7 +213,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
} }
} }
//ugly logic to make sure we are working with right actual expression //ugly logic to make sure we are working with right actual expression
var actualExpression = reference!! var actualExpression = reference ?: return
var diff = actualExpression.textRange.startOffset - oldElement.textRange.startOffset var diff = actualExpression.textRange.startOffset - oldElement.textRange.startOffset
var actualExpressionText = actualExpression.text var actualExpressionText = actualExpression.text
val newElement = emptyBody.addAfter(oldElement, firstChild) val newElement = emptyBody.addAfter(oldElement, firstChild)
@@ -224,7 +224,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler {
emptyBody.addAfter(psiFactory.createNewLine(), firstChild) emptyBody.addAfter(psiFactory.createNewLine(), firstChild)
property = emptyBody.addAfter(property, firstChild) as KtProperty property = emptyBody.addAfter(property, firstChild) as KtProperty
emptyBody.addAfter(psiFactory.createNewLine(), firstChild) emptyBody.addAfter(psiFactory.createNewLine(), firstChild)
actualExpression = reference!! actualExpression = reference ?: return
diff = actualExpression.textRange.startOffset - emptyBody.textRange.startOffset diff = actualExpression.textRange.startOffset - emptyBody.textRange.startOffset
actualExpressionText = actualExpression.text actualExpressionText = actualExpression.text
emptyBody = anchor.replace(emptyBody) as KtBlockExpression emptyBody = anchor.replace(emptyBody) as KtBlockExpression