Merge remote-tracking branch 'origin/update-from-template' into develop

.config/checkstyle/checkstyle.xml

@@ -16,7 +16,7 @@
 	<module name="LineLength">
 		<property name="max" value="120"/>
 		<property name="fileExtensions" value="java"/>
-		<!-- Ignore default + links in comments -->
+		<!-- Ignore default + links -->
 		<property name="ignorePattern" value="(^(package|import))|(^\s*(\/\/|\*) .*https?.*$)"/>
 	</module>
 	<module name="NewlineAtEndOfFile"/>
@@ -32,14 +32,22 @@
 	<!-- Generated code -->
 	<module name="SuppressionSingleFilter">
 		<property name="checks" value="."/>
-		<property name="files" value="[\\/](src)?gen[\\/].*\.java$"/>
+		<property name="files" value="[\\/]src[\\/]gen(erated)?[\\/].*\.java$"/>
 	</module>
 	<!-- Test code -->
 	<module name="SuppressionSingleFilter">
 		<property name="checks" value="MagicNumberCheck"/>
 		<property name="files" value="[\\/]test[\\/].*\.java$"/>
 	</module>
+
+	<!-- Suppressions -->
 	<module name="SuppressWarningsFilter"/>
+	<!-- https://github.com/checkstyle/checkstyle/issues/7287 -->
+	<module name="SuppressWithPlainTextCommentFilter">
+		<property name="offCommentFormat" value="// CHECKSTYLE\:OFF ([\w\|]+)"/>
+		<property name="onCommentFormat" value="// CHECKSTYLE\:ON ([\w\|]+)"/>
+		<property name="checkFormat" value="$1"/>
+	</module>
 
 	<module name="TreeWalker">
 		<!-- Checks - sorted alphabetically -->
@@ -127,11 +135,5 @@
 			<property name="tokens"
 					  value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,TYPE_EXTENSION_AND"/>
 		</module>
-
-		<!-- Filter -->
-		<module name="SuppressionCommentFilter">
-			<property name="offCommentFormat" value="\s*CHECKSTYLE:OFF\s*[^\s]{1,}"/>
-			<property name="onCommentFormat" value="\s*CHECKSTYLE:ON"/>
-		</module>
 	</module>
 </module>