From c2381419feb96eccb38858055cfe6a8ea1499a32 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Wed, 13 Apr 2016 20:25:09 +0200
Subject: [PATCH] introduce parameter object: adjust new parameter according to
 old params order (IDEA-154696)

---
 .../IntroduceParameterObjectProcessor.java                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectProcessor.java
index d6e5df8b6f33..8645fde3d0c4 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectProcessor.java
@@ -29,7 +29,6 @@ import com.intellij.refactoring.util.FixableUsageInfo;
 import com.intellij.refactoring.util.FixableUsagesRefactoringProcessor;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.usageView.UsageViewDescriptor;
-import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
@@ -60,11 +59,12 @@ public class IntroduceParameterObjectProcessor<M extends PsiNamedElement, P exte
     final P[] paramsToMerge = classDescriptor.getParamsToMerge();
     List<P> newParams = new ArrayList<>();
     int anchor = -1;
-    for (P param : oldMethodParameters) {
-      final P mergedParameterInfo = classDescriptor.getParameterInfo(param.getOldIndex());
+    for (int oldIdx = 0; oldIdx < oldMethodParameters.size(); oldIdx++) {
+      P param = oldMethodParameters.get(oldIdx);
+      final P mergedParameterInfo = classDescriptor.getParameterInfo(oldIdx);
       if (mergedParameterInfo != null) {
         if (anchor == -1) {
-          anchor = ArrayUtil.find(paramsToMerge, mergedParameterInfo);
+          anchor = oldIdx;
         }
       }
       else {