From 8fcb24bf5df839ee0cd29fd5a9e2ec254923564b Mon Sep 17 00:00:00 2001 From: schalkms Date: Wed, 1 Jun 2022 22:55:50 +0200 Subject: [PATCH 1/2] Simplify regular expressions --- .../io/gitlab/arturbosch/detekt/api/internal/Validation.kt | 2 +- .../io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt | 3 ++- .../arturbosch/detekt/generator/collection/Annotations.kt | 2 +- 3 files changed, 4 insertions(+), 3 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-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt b/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt index af82c994357..8712fa4c00e 100644 --- a/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt +++ b/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt @@ -8,7 +8,8 @@ import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import java.util.concurrent.atomic.AtomicInteger -class ConfigPropertySpec { +class +ConfigPropertySpec { @Nested inner class `simple property` { 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() From a84751e6791a96f28d64d768c5b1c3a78a773492 Mon Sep 17 00:00:00 2001 From: schalkms <30376729+schalkms@users.noreply.github.com> Date: Wed, 1 Jun 2022 22:59:53 +0200 Subject: [PATCH 2/2] Inline class declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Brais Gabín --- .../io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt b/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt index 8712fa4c00e..af82c994357 100644 --- a/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt +++ b/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt @@ -8,8 +8,7 @@ import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import java.util.concurrent.atomic.AtomicInteger -class -ConfigPropertySpec { +class ConfigPropertySpec { @Nested inner class `simple property` {