From a01e2c2c9ff1fe7386a79171bdecd2fc0bfd7b34 Mon Sep 17 00:00:00 2001
From: Georgii Ustinov <georgii.ustinov@jetbrains.com>
Date: Thu, 4 Jul 2024 20:09:03 +0300
Subject: [PATCH] [Java. Code Formatting] Add tests for blank lines with
 rearrangement

IDEA-110857

GitOrigin-RevId: f21d7c0a9decf830d76c5a25085f4f77448971a8
---
 .../blankLinesAroundField/rearrangement.java  | 11 ++++++++++
 .../rearrangement_after.java                  | 20 +++++++++++++++++++
 .../JavaFormatterBlankLinesAroundFieldTest.kt |  8 ++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement.java
 create mode 100644 java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement_after.java

diff --git a/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement.java b/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement.java
new file mode 100644
index 000000000000..920af07443d0
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement.java
@@ -0,0 +1,11 @@
+package org.example;
+
+import org.jetbrains.annotations.NotNull;
+
+public class ClassWithAnnotations {
+    private static final Boolean SIMPLE_FIELD = false;
+    @NotNull public static final Boolean ANOTHER_ANNOTATED_FIELD = false;
+    @NotNull public static final Boolean ANNOTATED_FIELD = false;
+    private @NotNull Boolean annotatedField = false;
+    public Boolean simpleField = false;
+}
diff --git a/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement_after.java b/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement_after.java
new file mode 100644
index 000000000000..ccce472fb37e
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/blankLinesAroundField/rearrangement_after.java
@@ -0,0 +1,20 @@
+package org.example;
+
+import org.jetbrains.annotations.NotNull;
+
+public class ClassWithAnnotations {
+    private static final Boolean SIMPLE_FIELD = false;
+
+
+    @NotNull
+    public static final Boolean ANOTHER_ANNOTATED_FIELD = false;
+
+
+    @NotNull
+    public static final Boolean ANNOTATED_FIELD = false;
+
+
+    private @NotNull Boolean annotatedField = false;
+
+    public Boolean simpleField = false;
+}
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterBlankLinesAroundFieldTest.kt b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterBlankLinesAroundFieldTest.kt
index d89b3bb1c368..721f74d93da4 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterBlankLinesAroundFieldTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterBlankLinesAroundFieldTest.kt
@@ -26,4 +26,12 @@ class JavaFormatterBlankLinesAroundFieldTest : JavaFormatterTestCase() {
     getSettings(JavaLanguage.INSTANCE).BLANK_LINES_AROUND_FIELD = 1
     doTest()
   }
+
+  fun testRearrangement() {
+    getSettings(JavaLanguage.INSTANCE).BLANK_LINES_AROUND_FIELD = 1
+    val testName = getTestName(true)
+    val afterFileName = "${testName}_after"
+    doTest(testName, afterFileName)
+    doTest(afterFileName, afterFileName)
+  }
 }
\ No newline at end of file