Java formatter: skip also spaces before enum for dependant spacing: IDEA-203464, IDEA-204458

java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java

@@ -277,7 +277,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
   private void createSpacingForEnumBraces() {
     // Ignore comments in front of enum for dependent spacing
     PsiElement first = myParent.getFirstChild();
-    while (first instanceof PsiDocComment) {
+    while (first instanceof PsiDocComment || first instanceof PsiWhiteSpace) {
       first = first.getNextSibling();
     }
     int spaces = myJavaSettings.SPACE_INSIDE_ONE_LINE_ENUM_BRACES ? 1 : 0;

java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterTest.kt

@@ -13,6 +13,7 @@ import com.intellij.psi.JavaCodeFragmentFactory
 import com.intellij.psi.PsiElement
 import com.intellij.psi.codeStyle.CodeStyleManager
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings
+import com.intellij.psi.codeStyle.CommonCodeStyleSettings.WRAP_ALWAYS
 import com.intellij.testFramework.LightIdeaTestCase
 import com.intellij.testFramework.LightPlatformTestCase
 import com.intellij.util.IncorrectOperationException
@@ -3684,4 +3685,76 @@ public class Test {
     )
   }
 
+  fun testIdeaIDEA203464() {
+    getSettings().apply{
+      ENUM_CONSTANTS_WRAP = WRAP_ALWAYS
+      KEEP_LINE_BREAKS = false
+    }
+    doTextTest(
+        """
+/**
+ * javadoc
+ */
+public enum EnumApplyChannel {
+
+    C;
+
+    public String method() {
+        return null;
+    }
+}""".trimIndent(),
+
+      """
+/**
+ * javadoc
+ */
+public enum EnumApplyChannel {
+
+    C;
+
+    public String method() {
+        return null;
+    }
+}""".trimIndent()
+    )
+  }
+
+
+  fun testIdeaIDEA198408() {
+    getSettings().apply{
+      ENUM_CONSTANTS_WRAP = WRAP_ALWAYS
+    }
+    doTextTest(
+        """
+/** JavaDoc */
+public enum LevelCode {HIGH(3),
+   MEDIUM(2),
+   LOW(1);
+
+   private final int levelCode;
+
+   LevelCode(int levelCode) {
+       this.levelCode = levelCode;
+   }
+}""".trimIndent(),
+
+      """
+/**
+ * JavaDoc
+ */
+public enum LevelCode {
+    HIGH(3),
+    MEDIUM(2),
+    LOW(1);
+
+    private final int levelCode;
+
+    LevelCode(int levelCode) {
+        this.levelCode = levelCode;
+    }
+}""".trimIndent()
+    )
+  }
+
+
 }
\ No newline at end of file