Merge remote-tracking branch 'origin/master'

This commit is contained in:
Yann Cébron
2015-06-13 14:04:04 +02:00
12 changed files with 88 additions and 34 deletions
@@ -269,7 +269,7 @@ public class JavaReplaceHandler extends StructuralReplaceHandler {
if (firstChild instanceof PsiModifierList) {
final PsiModifierList modifierList = (PsiModifierList)firstChild;
for (PsiElement child : modifierList.getChildren()) {
elementParent.add(child);
elementParent.addBefore(child, elementToReplace);
}
}
}