From f6561da65cd8c992868aefa634a69f1a722be4f8 Mon Sep 17 00:00:00 2001
From: "Roman.Ivanov" <Roman.Ivanov@jetbrains.com>
Date: Mon, 4 Jun 2018 15:05:10 +0700
Subject: [PATCH] remove line breaks between block and Rparen: IDEA-67968

---
 .../psi/formatter/java/JavaSpacePropertyProcessor.java |  2 +-
 .../testData/psi/formatter/wrapping/NewLineBlock.java  | 10 ++++++++++
 .../psi/formatter/wrapping/NewLineBlock_after.java     |  7 +++++++
 .../intellij/java/psi/formatter/java/WrapperTest.java  |  9 +++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 java/java-tests/testData/psi/formatter/wrapping/NewLineBlock.java
 create mode 100644 java/java-tests/testData/psi/formatter/wrapping/NewLineBlock_after.java

diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
index 1264dce284c9..6cbe6d47273d 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
@@ -987,7 +987,7 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
       return Spacing.createDependentLFSpacing(spaces, spaces, dependantRange, false, mySettings.KEEP_BLANK_LINES_IN_CODE);
     }
     else {
-      return Spacing.createSpacing(spaces, spaces, 0, false, mySettings.KEEP_BLANK_LINES_IN_CODE);
+      return Spacing.createSpacing(spaces, spaces, 0, false, 0);
     }
   }
 
diff --git a/java/java-tests/testData/psi/formatter/wrapping/NewLineBlock.java b/java/java-tests/testData/psi/formatter/wrapping/NewLineBlock.java
new file mode 100644
index 000000000000..b522815177c7
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/wrapping/NewLineBlock.java
@@ -0,0 +1,10 @@
+
+public class Foo {
+    public void foo() {
+        while (true)
+
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/wrapping/NewLineBlock_after.java b/java/java-tests/testData/psi/formatter/wrapping/NewLineBlock_after.java
new file mode 100644
index 000000000000..55a9cfd42cd4
--- /dev/null
+++ b/java/java-tests/testData/psi/formatter/wrapping/NewLineBlock_after.java
@@ -0,0 +1,7 @@
+public class Foo {
+    public void foo() {
+        while (true) {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/WrapperTest.java b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/WrapperTest.java
index 0aaaf1501394..0282f3e60ecf 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/WrapperTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/WrapperTest.java
@@ -538,4 +538,13 @@ public class WrapperTest extends JavaFormatterTestCase {
                "}");
 
   }
+
+
+  public void testWrappingBeforeNewLinedBlock() throws Exception {
+    // Inspired by IDEA-67968
+
+    defaultCodeStyle();
+
+    doTest("NewLineBlock", "NewLineBlock_after");
+  }
 }