MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

introduce parameter object: adjust new parameter according to old params order (IDEA-154696)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-04-13 21:11:02 +02:00
parent d780e31bdf
commit c2381419fe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectProcessor.java
+4 -4
View File
@@ -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 {