add field to enum: ensure correct position after comment (IDEA-131820)

java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java

@@ -26,6 +26,7 @@ import com.intellij.psi.impl.source.tree.*;
 import com.intellij.psi.tree.ChildRoleBase;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.CharTable;
 import org.jetbrains.annotations.NotNull;
@@ -111,6 +112,9 @@ public class ClassElement extends CompositeElement implements Constants {
         for (ASTNode run = anchor; run != null; run = run.getTreeNext()) {
           if (run == semicolonPlace) {
             anchor = before.booleanValue() ? semicolonPlace.getTreeNext() : semicolonPlace;
+            if (anchor != null && PsiImplUtil.isWhitespaceOrComment(anchor)) {
+              anchor = PsiTreeUtil.skipSiblingsForward(anchor.getPsi(), PsiWhiteSpace.class, PsiComment.class).getNode();
+            }
             break;
           }
         }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromParameter/afterEnumComments.java

@@ -0,0 +1,12 @@
+// "Create Field for Parameter 'p1'" "true"
+
+enum Test{
+    A;//comment
+
+    private int myP1;
+
+    void f(int p1){
+        myP1 = p1;
+    }
+}
+

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromParameter/beforeEnumComments.java

@@ -0,0 +1,9 @@
+// "Create Field for Parameter 'p1'" "true"
+
+enum Test{
+    A;//comment
+
+    void f(int p<caret>1){
+    }
+}
+