From 71f4a4b2ca7840551ee61a35f25a0ac03c5bf0a9 Mon Sep 17 00:00:00 2001
From: Andreas Gudian <agudian@apache.org>
Date: Mon, 17 Aug 2015 23:02:16 +0200
Subject: [PATCH] #626 Remove blank lines before closing brackets

---
 .../ap/internal/writer/IndentationCorrectingWriter.java       | 3 +++
 .../src/test/resources/checkstyle-for-generated-sources.xml   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/writer/IndentationCorrectingWriter.java b/processor/src/main/java/org/mapstruct/ap/internal/writer/IndentationCorrectingWriter.java
index cce87d9e2..b2b71a845 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/writer/IndentationCorrectingWriter.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/writer/IndentationCorrectingWriter.java
@@ -301,6 +301,9 @@ class IndentationCorrectingWriter extends Writer {
                         context.indentationLevel++;
                         return START_OF_LINE;
                     case '}':
+                        if ( context.consecutiveLineBreaks > 0 ) {
+                            context.consecutiveLineBreaks = 0; // remove previous blank lines
+                        }
                     case ')':
                         context.indentationLevel--;
                         return START_OF_LINE;
diff --git a/processor/src/test/resources/checkstyle-for-generated-sources.xml b/processor/src/test/resources/checkstyle-for-generated-sources.xml
index a0573e255..be87a77ea 100644
--- a/processor/src/test/resources/checkstyle-for-generated-sources.xml
+++ b/processor/src/test/resources/checkstyle-for-generated-sources.xml
@@ -43,6 +43,10 @@
         <property name="format" value="(\r\n\r\n\r\n|\r\r\r|\n\n\n)" />
         <property name="message" value="There are multiple blank lines" />
     </module>
+    <module name="RegexpMultiline">
+        <property name="format" value="(\r\n\r\n\ *\}|\r\r *\}|\n\n *\})" />
+        <property name="message" value="There are blank lines before a closing bracket" />
+    </module>
 
     <module name="RegexpSingleline">
         <!-- \s matches whitespace character, $ matches end of line. -->