third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-12 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

#626 Remove blank lines before closing brackets

Browse Source
This commit is contained in:
Andreas Gudian 2015-08-17 23:02:16 +02:00
parent 2c2f69b0d3
commit 71f4a4b2ca
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
processor/src/main/java/org/mapstruct/ap/internal/writer/IndentationCorrectingWriter.java
View File

@ -301,6 +301,9 @@ class IndentationCorrectingWriter extends Writer {
context.indentationLevel++; context.indentationLevel++;
return START_OF_LINE; return START_OF_LINE;
case '}': case '}':
if ( context.consecutiveLineBreaks > 0 ) {
context.consecutiveLineBreaks = 0; // remove previous blank lines
}
case ')': case ')':
context.indentationLevel--; context.indentationLevel--;
return START_OF_LINE; return START_OF_LINE;

4
processor/src/test/resources/checkstyle-for-generated-sources.xml
View File

@ -43,6 +43,10 @@
<property name="format" value="(\r\n\r\n\r\n|\r\r\r|\n\n\n)" /> <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" /> <property name="message" value="There are multiple blank lines" />
</module> </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"> <module name="RegexpSingleline">
<!-- \s matches whitespace character, $ matches end of line. --> <!-- \s matches whitespace character, $ matches end of line. -->