Skip to content

Commit 4abbea9

Browse files
committed
Update checkstyle to 11.1.0
1 parent 7ca28f1 commit 4abbea9

2 files changed

Lines changed: 24 additions & 8 deletions

File tree

config/checkstyle/checkstyle.xml

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,12 @@
5858
<property name="ignorePattern"
5959
value="^package.*|^import.*|href\s*=\s*&quot;[^&quot;]*&quot;|http://|https://|ftp://"/>
6060
</module>
61-
61+
<!-- Suppression to prevent LineLength Check from flagging lines in Text-blocks -->
62+
<module name="SuppressWithPlainTextCommentFilter">
63+
<property name="checkFormat" value="LineLength"/>
64+
<property name="offCommentFormat" value='^.*"""\s*$'/>
65+
<property name="onCommentFormat" value='^\s*"""\s*(?:[,;]|.+)$'/>
66+
</module>
6267
<module name="TreeWalker">
6368
<module name="OuterTypeFilename"/>
6469
<module name="MatchXpath">
@@ -145,7 +150,7 @@
145150
value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_RETURN,
146151
LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, LITERAL_FINALLY, DO_WHILE, ELLIPSIS,
147152
LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_CATCH, LAMBDA,
148-
LITERAL_YIELD, LITERAL_CASE, LITERAL_WHEN"/>
153+
LITERAL_YIELD, LITERAL_CASE, LITERAL_WHEN, ANNOTATIONS"/>
149154
</module>
150155
<module name="WhitespaceAround">
151156
<property name="allowEmptyConstructors" value="true"/>
@@ -190,6 +195,7 @@
190195
<module name="OneStatementPerLine"/>
191196
<module name="MultipleVariableDeclarations"/>
192197
<module name="ArrayTypeStyle"/>
198+
<module name="JavadocLeadingAsteriskAlign"/>
193199
<module name="MissingSwitchDefault"/>
194200
<module name="FallThrough"/>
195201
<module name="UpperEll"/>
@@ -234,13 +240,20 @@
234240
value="Package name ''{0}'' must match pattern ''{1}''."/>
235241
</module>
236242
<module name="TypeName">
237-
<property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
243+
<property name="format" value="^[A-Z][a-zA-Z0-9]*(?:[0-9](?:_[0-9]+)*)?$"/>
244+
<property name="tokens" value="CLASS_DEF"/>
245+
<message key="name.invalidPattern"
246+
value="Type name ''{0}'' must match pattern ''{1}''."/>
247+
</module>
248+
<module name="TypeName">
249+
<property name="tokens" value="INTERFACE_DEF, ENUM_DEF,
238250
ANNOTATION_DEF, RECORD_DEF"/>
239251
<message key="name.invalidPattern"
240252
value="Type name ''{0}'' must match pattern ''{1}''."/>
241253
</module>
242254
<module name="MemberName">
243-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
255+
<property name="format"
256+
value="^(?![a-z]$)(?![a-z][A-Z])[a-z][a-zA-Z0-9]*(?:_[0-9]+)*$"/>
244257
<message key="name.invalidPattern"
245258
value="Member name ''{0}'' must match pattern ''{1}''."/>
246259
</module>
@@ -345,7 +358,9 @@
345358
</module>
346359
<module name="SuppressionXpathSingleFilter">
347360
<property name="checks" value="NoWhitespaceBefore"/>
348-
<property name="query" value="//ELLIPSIS[preceding-sibling::TYPE/ANNOTATIONS/ANNOTATION]"/>
361+
<property name="query"
362+
value="//ELLIPSIS[preceding-sibling::TYPE/ANNOTATIONS[ANNOTATION[LPAREN]
363+
or not(following-sibling::*)]]"/>
349364
</module>
350365
<module name="ParenPad">
351366
<property name="tokens"
@@ -366,7 +381,7 @@
366381
<property name="id" value="AnnotationLocationMostCases"/>
367382
<property name="tokens"
368383
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF,
369-
RECORD_DEF, COMPACT_CTOR_DEF"/>
384+
RECORD_DEF, COMPACT_CTOR_DEF, PACKAGE_DEF"/>
370385
</module>
371386
<module name="AnnotationLocation">
372387
<property name="id" value="AnnotationLocationVariables"/>
@@ -419,7 +434,8 @@
419434
<property name="excludeScope" value="nothing"/>
420435
</module>
421436
<module name="MethodName">
422-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
437+
<property name="format"
438+
value="^(?![a-z]$)(?![a-z][A-Z])[a-z][a-z0-9]*(?:[A-Z][a-z0-9]*)*(?:_[0-9]+)*$"/>
423439
<message key="name.invalidPattern"
424440
value="Method name ''{0}'' must match pattern ''{1}''."/>
425441
</module>

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ paper-api = { group = "io.papermc.paper", name = "paper-api", version = "1.20.6-
3636
velocity-api = { group = "com.velocitypowered", name = "velocity-api", version = "3.4.0-SNAPSHOT" }
3737

3838
# Gradle Plugins
39-
checkstyle = { group = "com.puppycrawl.tools", name = "checkstyle", version = "11.0.1" }
39+
checkstyle = { group = "com.puppycrawl.tools", name = "checkstyle", version = "11.1.0" }
4040
lombok-plugin = { group = "io.freefair.gradle", name = "lombok-plugin", version = "8.14.2" }
4141
shadow-plugin = { group = "com.gradleup.shadow", name = "shadow-gradle-plugin", version = "9.1.0" }
4242
spotless-plugin = { group = "com.diffplug.spotless", name = "spotless-plugin-gradle", version = "7.2.1" }

0 commit comments

Comments
 (0)