join lines do not merge closing brace and catch keyword, when 'catch on new line' enabled (IDEA-179581)

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

@@ -712,7 +712,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
   private void processOnNewLineCondition(boolean onNewLine, boolean createSpaceInline) {
     if (onNewLine) {
       if (!mySettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE) {
-        myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
+        myResult = Spacing.createSpacing(1, 1, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
       }
       else {
         myResult = Spacing.createDependentLFSpacing(0, 1, myParent.getTextRange(), mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);

java/java-tests/testData/codeInsight/joinLines/PreserveSpaceIfOnNewLineOptionEnabled.java

@@ -0,0 +1,10 @@
+class A {
+  public void foo() {
+    try {
+      System.out.println("Hello");
+    }<caret>
+    catch (Exception e) {
+      System.err.println("Error");
+    }
+  }
+}

java/java-tests/testData/codeInsight/joinLines/PreserveSpaceIfOnNewLineOptionEnabled_after.java

@@ -0,0 +1,9 @@
+class A {
+  public void foo() {
+    try {
+      System.out.println("Hello");
+    } catch (Exception e) {
+      System.err.println("Error");
+    }
+  }
+}

java/java-tests/testSrc/com/intellij/java/codeInsight/JoinLinesTest.java

@@ -231,6 +231,12 @@ public class JoinLinesTest extends LightCodeInsightTestCase {
 
   public void testMultipleBlockComments() { doTest(); }
 
+  public void testPreserveSpaceIfOnNewLineOptionEnabled() {
+    CommonCodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()).getCommonSettings(JavaLanguage.INSTANCE);
+    settings.CATCH_ON_NEW_LINE = true;
+    doTest();
+  }
+
   private void doTest() {
     doTest(".java");
   }