Fix empty-lines regexp to match Windows line endings as well.

uhafner · Apr 19, 2024 · 72ea8fe · 72ea8fe
1 parent 979faa3
commit 72ea8fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/etc/checkstyle-java-configuration.xml b/etc/checkstyle-java-configuration.xml
@@ -9,11 +9,11 @@
 <module name="Checker">
   <property name="severity" value="warning"/>
   <module name="RegexpMultiline">
-    <property name="format" value="\{\s*\R\s*\R"/>
+    <property name="format" value="\{\s*(\n|\r\n)\s*(\n|\r\n)"/>
     <property name="message" value="No empty lines after opening curly braces allowed" />
   </module>
   <module name="RegexpMultiline">
-    <property name="format" value="\R\s*\R\s*\}"/>
+    <property name="format" value="(\n|\r\n)\s*(\n|\r\n)\s*\}"/>
     <property name="message" value="No empty lines before closing curly braces allowed" />
   </module>
   <module name="TreeWalker">

diff --git a/etc/checkstyle-tests-configuration.xml b/etc/checkstyle-tests-configuration.xml
@@ -9,11 +9,11 @@
 <module name="Checker">
   <property name="severity" value="warning"/>
   <module name="RegexpMultiline">
-    <property name="format" value="\{\s*\R\s*\R"/>
+    <property name="format" value="\{\s*(\n|\r\n)\s*(\n|\r\n)"/>
     <property name="message" value="No empty lines after opening curly braces allowed" />
   </module>
   <module name="RegexpMultiline">
-    <property name="format" value="\R\s*\R\s*\}"/>
+    <property name="format" value="(\n|\r\n)\s*(\n|\r\n)\s*\}"/>
     <property name="message" value="No empty lines before closing curly braces allowed" />
   </module>
   <module name="TreeWalker">