diff options
| author | modmuss50 <modmuss50@gmail.com> | 2019-11-13 18:00:07 +0000 |
|---|---|---|
| committer | modmuss50 <modmuss50@gmail.com> | 2019-11-13 18:00:07 +0000 |
| commit | eb2424554fd285b46e836fc5070932058812444b (patch) | |
| tree | 70326ad41334a6d874cf9ed07e8dfba2ca7435b9 /checkstyle.xml | |
| parent | 54ac2df5dcce4f3e4f33f00d200aedaec11a07b6 (diff) | |
| download | architectury-loom-eb2424554fd285b46e836fc5070932058812444b.tar.gz architectury-loom-eb2424554fd285b46e836fc5070932058812444b.tar.bz2 architectury-loom-eb2424554fd285b46e836fc5070932058812444b.zip | |
Fix checkstyle config not supporting windows line endings
Diffstat (limited to 'checkstyle.xml')
| -rw-r--r-- | checkstyle.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/checkstyle.xml b/checkstyle.xml index 341ddb1c..9176f4e4 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="(?<=\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="(?<=\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="(?<=\n)([\t]+)\}\n\1(?:[^\r\n\}cd]|c[^\r\na]|ca[^\r\ns]|d[^\r\ne]|de[^\r\nf])"/> + <property name="format" value="(?<=\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> |