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

Introduce Variable: Fix NPE for the case of statement-like expression

Browse Source 
#KT-8054 Fixed
This commit is contained in:
Alexey Sedunov
2015-06-16 14:07:26 +03:00
parent dda271d38d
commit 98dce65337
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractKotlinInplaceIntroducer.kt
+2 -2
View File
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import java.awt.BorderLayout import java.awt.BorderLayout
public abstract class AbstractKotlinInplaceIntroducer<D: JetNamedDeclaration>( public abstract class AbstractKotlinInplaceIntroducer<D: JetNamedDeclaration>(
expression: JetExpression, expression: JetExpression?,
occurrences: Array<JetExpression>, occurrences: Array<JetExpression>,
title: String, title: String,
project: Project, project: Project,
@@ -58,7 +58,7 @@ public abstract class AbstractKotlinInplaceIntroducer<D: JetNamedDeclaration>(
stopIntroduce(myEditor) stopIntroduce(myEditor)
myProject.executeWriteCommand(getCommandName(), getCommandName(), action) myProject.executeWriteCommand(getCommandName(), getCommandName(), action)
// myExprMarker was invalidated by stopIntroduce() // myExprMarker was invalidated by stopIntroduce()
myExprMarker = createMarker(myExpr) myExprMarker = myExpr?.let { createMarker(it) }
startInplaceIntroduceTemplate() startInplaceIntroduceTemplate()
} }
finally { finally {
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
-1
View File
@@ -206,7 +206,6 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
expression, suggestedNames, allReplaces, commonContainer, expression, suggestedNames, allReplaces, commonContainer,
commonParent, replaceOccurrence, propertyRef, references, commonParent, replaceOccurrence, propertyRef, references,
reference, finalNoTypeInference, expressionType, bindingContext); reference, finalNoTypeInference, expressionType, bindingContext);
final boolean finalReplaceOccurrence = replaceOccurrence;
CommandProcessor.getInstance().executeCommand(project, new Runnable() { CommandProcessor.getInstance().executeCommand(project, new Runnable() {
@Override @Override
public void run() { public void run() {
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinVariableInplaceIntroducer.kt
+1 -1
View File
@@ -42,7 +42,7 @@ import java.awt.BorderLayout
public class KotlinVariableInplaceIntroducer( public class KotlinVariableInplaceIntroducer(
val addedVariable: JetProperty, val addedVariable: JetProperty,
val originalExpression: JetExpression, val originalExpression: JetExpression?,
val occurrencesToReplace: Array<JetExpression>, val occurrencesToReplace: Array<JetExpression>,
val suggestedNames: Array<out String>, val suggestedNames: Array<out String>,
val isVar: Boolean, val isVar: Boolean,