From eb2424554fd285b46e836fc5070932058812444b Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 13 Nov 2019 18:00:07 +0000
Subject: [PATCH] Fix checkstyle config not supporting windows line endings

---
 checkstyle.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index 341ddb1..9176f4e 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -15,19 +15,19 @@
 	<!-- note: RegexpMultiline shows nicer messages than Regexp, but has to be outside TreeWalker -->
 	<!-- disallow multiple consecutive blank lines -->
 	<module name="RegexpMultiline">
-		<property name="format" value="\n[\r\t ]*\n[\r\t ]*\n"/>
+		<property name="format" value="\n[\t ]*\r?\n[\t ]*\r?\n"/>
 		<property name="message" value="adjacent blank lines"/>
 	</module>
 
 	<!-- disallow blank after { -->
 	<module name="RegexpMultiline">
-		<property name="format" value="\{[\r\t ]*\n[\r\t ]*\n"/>
+		<property name="format" value="\{[\t ]*\r?\n[\t ]*\r?\n"/>
 		<property name="message" value="blank line after '{'"/>
 	</module>
 
 	<!-- disallow blank before } -->
 	<module name="RegexpMultiline">
-		<property name="format" value="\n[\r\t ]*\n[\r\t ]*\}"/>
+		<property name="format" value="\n[\t ]*\r?\n[\t ]*\}"/>
 		<property name="message" value="blank line before '}'"/>
 	</module>
 
@@ -47,14 +47,14 @@
 		- <indentation> as captured earlier
 		- <control statement> as specified above
 		- { before the next new line -->
-		<property name="format" value="(?&lt;=\n)([\t]+)(?:[^/\n \t][^\n]*|/[^/\n][^\n]*|[^/\n][^\n]*(\n\1//[^\n]*)+)\n\1(|(if|do|while|for|try)[^\n]+)\{[\r\t ]*\n"/>
+		<property name="format" value="(?&lt;=\n)([\t]+)(?:[^/\r\n \t][^\r\n]*|/[^/\r\n][^\r\n]*|[^/\r\n][^\r\n]*(\r?\n\1//[^\r\n]*)+)\r?\n\1(|(if|do|while|for|try)[^\r\n]+)\{[\t ]*\r?\n"/>
 		<property name="message" value="missing blank line before block at same indentation level"/>
 	</module>
 
 	<!-- require blank after } in the same indentation level -->
 	<module name="RegexpMultiline">
 		<!-- \n<indentation>}\n<same indentation><whatever unless newline, '}' or starting with cas(e) or def(ault)> -->
-		<property name="format" value="(?&lt;=\n)([\t]+)\}\n\1(?:[^\r\n\}cd]|c[^\r\na]|ca[^\r\ns]|d[^\r\ne]|de[^\r\nf])"/>
+		<property name="format" value="(?&lt;=\n)([\t]+)\}\r?\n\1(?:[^\r\n\}cd]|c[^\r\na]|ca[^\r\ns]|d[^\r\ne]|de[^\r\nf])"/>
 		<property name="message" value="missing blank line after block at same indentation level"/>
 	</module>