From 5c41ebb2b65f839ccbc00274895e8bc6eed30de5 Mon Sep 17 00:00:00 2001 From: schalkms <30376729+schalkms@users.noreply.github.com> Date: Wed, 1 Jun 2022 23:38:45 +0200 Subject: [PATCH] Simplify regular expressions (#4893) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Simplify regular expressions * Inline class declaration Co-authored-by: Brais Gabín --- .../io/gitlab/arturbosch/detekt/api/internal/Validation.kt | 2 +- .../arturbosch/detekt/generator/collection/Annotations.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/Validation.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/Validation.kt index c8256a22e00..5ed3ba5eb2f 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/Validation.kt +++ b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/Validation.kt @@ -1,6 +1,6 @@ package io.gitlab.arturbosch.detekt.api.internal -private val identifierRegex = Regex("[aA-zZ]+([-][aA-zZ]+)*") +private val identifierRegex = Regex("[aA-zZ]+(-[aA-zZ]+)*") /** * Checks if given string matches the criteria of an id - [aA-zZ]+([-][aA-zZ]+)* . diff --git a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/Annotations.kt b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/Annotations.kt index 01a99baee09..cc0f5ab842c 100644 --- a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/Annotations.kt +++ b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/Annotations.kt @@ -31,4 +31,4 @@ internal fun String.withoutQuotes() = removeSurrounding(TRIPLE_QUOTES) private const val SINGLE_QUOTES = "\"" private const val TRIPLE_QUOTES = "\"\"\"" -private val STRING_CONCAT_REGEX = """["]\s*\+[\n\s]*["]""".toRegex() +private val STRING_CONCAT_REGEX = """"\s*\+[\n\s]*"""".toRegex()