From fe8e13c09e1429d5a04ed90267e786376fe0a8a0 Mon Sep 17 00:00:00 2001
From: Georgii Ustinov <georgii.ustinov@jetbrains.com>
Date: Tue, 12 Dec 2023 21:52:26 +0200
Subject: [PATCH] Review refactor for moving new line when method body is not
 empty

IDEA-126070

GitOrigin-RevId: 7f0e4ae5c25b765a01b9074f0b06332151ea54b6
---
 .../ide/JavaLanguageCodeStyleSettingsProvider.java   |  4 ++--
 .../psi/formatter/java/JavaFormatterNewLineTest.java | 12 ++++++++++++
 .../openapi/resources/messages/JavaBundle.properties |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
index 1918ef145401..cf84d11cdf03 100644
--- a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
+++ b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
@@ -240,7 +240,7 @@ public final class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeSty
                                 JavaBundle.message("checkbox.do.not.wrap.after.single.annotation"), parameterAnnotationsWrapping);
 
       consumer.showCustomOption(JavaCodeStyleSettings.class, "NEW_LINE_WHEN_BODY_NON_EMPTY",
-                                JavaBundle.message("new.line.when.body.is.not.empty"),
+                                JavaBundle.message("new.line.when.body.is.presented"),
                                 ApplicationBundle.message("wrapping.method.parentheses"));
 
       // Record components
@@ -644,7 +644,7 @@ public final class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeSty
         private int f1 = 1;
         private String field2 = "";
         public void foo1(int i1, int i2, int i3, int i4, int i5, int i6, int i7) {}
-        public void fooNonEmptyBody(int i1, int i2, int i3, int i4, int i5, int i6, int i7) {int x = 1;}
+        public void fooNonEmptyBody() {int x = 1;}
         public static void longerMethod() throws Exception1, Exception2, Exception3 {
       // todo something
           int
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterNewLineTest.java b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterNewLineTest.java
index fd69399830ca..81fd59219c5b 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterNewLineTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterNewLineTest.java
@@ -250,4 +250,16 @@ public class JavaFormatterNewLineTest extends AbstractJavaFormatterTest {
                   public void foo() { }
                   """);
   }
+
+  public void testDoNotMoveSimpleMethodBodyOnNewLineWhenNonEmptyAndSettingsDisabled() {
+    getJavaSettings().NEW_LINE_WHEN_BODY_NON_EMPTY = false;
+    getSettings().KEEP_SIMPLE_METHODS_IN_ONE_LINE = true;
+    getSettings().SPACE_WITHIN_BRACES = true;
+    doClassTest("""
+                     public void foo() {int x = 1;}
+                     """,
+                """
+                  public void foo() { int x = 1; }
+                  """);
+  }
 }
diff --git a/java/openapi/resources/messages/JavaBundle.properties b/java/openapi/resources/messages/JavaBundle.properties
index 925cb2eac155..fddbb5689fd2 100644
--- a/java/openapi/resources/messages/JavaBundle.properties
+++ b/java/openapi/resources/messages/JavaBundle.properties
@@ -1315,7 +1315,7 @@ unscramble.unscrambled.stacktrace.tab=<Stacktrace>
 unscramble.unscrambled.threaddump.tab=<Threads>
 unscramble.unscrambler.combobox=Un&scrambler:
 unscramble.use.unscrambler.checkbox=&Unscramble stack trace
-new.line.when.body.is.not.empty=New line when body isn't empty
+new.line.when.body.is.presented=New line when body is presented
 unwrap.anonymous=Unwrap 'anonymous...'
 unwrap.array.initializer=Unwrap array initializer
 unwrap.conditional=Unwrap 'f ? a : b'