From 5a5cfb7b2ff1b18c404b1489534e6dd9040d01c6 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 8 Jun 2017 16:42:52 +0300 Subject: [PATCH] extract functional: ensure reordering/renaming (IDEA-174173) ensure data from dialog applied to non-physical processor before reordering according to it --- .../IntroduceFunctionalVariableHandler.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java index 14271ecfb42c..afec6600bc22 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceFunctionalVariableHandler.java @@ -46,7 +46,6 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; import java.util.*; -import java.util.List; public class IntroduceFunctionalVariableHandler extends IntroduceVariableHandler { @@ -275,12 +274,11 @@ public class IntroduceFunctionalVariableHandler extends IntroduceVariableHandler } public void copyParameters(MyExtractMethodProcessor processor) { - InputVariables inputVariables = processor.myInputVariables; - myInputVariables.setPassFields(inputVariables.isPassFields()); - List variables = inputVariables.getInputVariables(); - myVariableDatum = new VariableData[variables.size()]; - for (int i = 0; i < variables.size(); i++) { - VariableData data = variables.get(i); + myInputVariables.setPassFields(processor.myInputVariables.isPassFields()); + VariableData[] variables = processor.myVariableDatum; + myVariableDatum = new VariableData[variables.length]; + for (int i = 0; i < variables.length; i++) { + VariableData data = variables[i]; String variableName = data.variable.getName(); assert variableName != null; VariableData dataByVName =