Fixed CONSTANT_UPPERCASE doesn't handle number in middle name (#1604)

### What's done: * fixed regular expression Closes #1572
saveourtool · Jan 30, 2023 · 3413302 · 3413302
1 parent 1cf345b
commit 3413302
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/StringCaseUtils.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/StringCaseUtils.kt
@@ -40,7 +40,7 @@ fun String.isLowerCamelCase(): Boolean = this.matches("[a-z]([a-z0-9])*([A-Z][a-
  *
  * @return boolean result
  */
-fun String.isUpperSnakeCase(): Boolean = this.matches("(([A-Z]+)_*)+[A-Z0-9]*".toRegex())
+fun String.isUpperSnakeCase(): Boolean = this.matches("(([A-Z0-9]+)_*)+[A-Z0-9]*".toRegex())
 
 /**
  * checking that string looks like: lower_case_for_script_names

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingWarnTest.kt
@@ -135,6 +135,16 @@ class IdentifierNamingWarnTest : LintTestBase(::IdentifierNaming) {
         )
     }
 
+    @Test
+    @Tag(WarningNames.CONSTANT_UPPERCASE)
+    fun `number in middle name`() {
+        lintMethod(
+            """
+                    const val NE04J_STARTUP_DELAY_MILLIS = 200L
+            """.trimIndent()
+        )
+    }
+
     @Test
     @Tags(
         Tag(WarningNames.CLASS_NAME_INCORRECT),