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

constructor parameters from fields: sort params in fields order

Browse Source
This commit is contained in:
anna
2011-12-26 18:55:17 +01:00
parent e34d1f5214
commit 60d4f42363
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
+10 -3
View File
@@ -152,8 +152,15 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
}
}
addParameterToConstructor(project, file, editor, constructor, constrs.size() == constructors.length ? fields.toArray(new PsiField[fields.size()]) : new PsiField[]{getField()});
Collections.sort(fields, new Comparator<PsiField>() {
@Override
public int compare(PsiField o1, PsiField o2) {
return o1.getTextOffset() - o2.getTextOffset();
}
});
addParameterToConstructor(project, file, editor, constructor, constrs.size() == constructors.length
? fields.toArray(new PsiField[fields.size()])
: new PsiField[]{getField()});
fieldsToFix.clear();
}
}
@@ -217,7 +224,7 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
expressions[i++] = factory.createExpressionFromText(field.getName(), constructor);
}
if (constructor.isVarArgs()) {
ArrayUtil.swap(expressions, parameters.length - 1, expressions.length - 1);
ArrayUtil.rotateLeft(expressions, parameters.length - 1, expressions.length - 1);
}
final SmartPointerManager manager = SmartPointerManager.getInstance(project);
final SmartPsiElementPointer constructorPointer = manager.createSmartPsiElementPointer(constructor);