push down: normalize field before copy is created (IDEA-182422)

otherwise initial field bundle won't be updated

java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java

@@ -204,11 +204,14 @@ public class JavaPushDownDelegate extends PushDownDelegate<MemberInfo, PsiMember
           refsToRebind.add(reference);
         }
       }
+      if (member instanceof PsiField) {
+        ((PsiField)member).normalizeDeclaration();
+      }
+
       member = (PsiMember)member.copy();
       RefactoringUtil.replaceMovedMemberTypeParameters(member, PsiUtil.typeParametersIterable(sourceClass), substitutor, factory);
       PsiMember newMember = null;
       if (member instanceof PsiField) {
-        ((PsiField)member).normalizeDeclaration();
         if (sourceClass.isInterface() && !targetClass.isInterface()) {
           PsiUtil.setModifierProperty(member, PsiModifier.PUBLIC, true);
           PsiUtil.setModifierProperty(member, PsiModifier.STATIC, true);

java/java-tests/testData/refactoring/pushDown/SecondNormalizedField.java

@@ -0,0 +1,5 @@
+
+class Base {
+  int one, t<caret>wo;
+}
+class Inheritor extends Base {}

java/java-tests/testData/refactoring/pushDown/SecondNormalizedField_after.java

@@ -0,0 +1,7 @@
+
+class Base {
+  int one;
+}
+class Inheritor extends Base {
+    int two;
+}

java/java-tests/testSrc/com/intellij/java/refactoring/PushDownTest.java

@@ -42,6 +42,7 @@ public class PushDownTest extends LightRefactoringTestCase {
   public void testBodyTypeParameter() { doTest(); }
   public void testDisagreeTypeParameter() { doTest(true); }
   public void testFieldAndReferencedClass() { doTest(); }
+  public void testSecondNormalizedField() { doTest(); }
   public void testFieldAndStaticReferencedClass() { doTest(); }
   public void testThisRefInAnonymous() { doTest(); }
   public void testSuperOverHierarchyConflict() { doTest(true); }