Use list config for FunctionOnlyReturningConstant>excludedFunctions

detekt · Jul 23, 2022 · 9206311 · 9206311
1 parent 855065b
commit 9206311
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/.../src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/FunctionOnlyReturningConstant.kt b/.../src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/FunctionOnlyReturningConstant.kt
@@ -8,10 +8,10 @@ import io.gitlab.arturbosch.detekt.api.Entity
 import io.gitlab.arturbosch.detekt.api.Issue
 import io.gitlab.arturbosch.detekt.api.Rule
 import io.gitlab.arturbosch.detekt.api.Severity
-import io.gitlab.arturbosch.detekt.api.SplitPattern
 import io.gitlab.arturbosch.detekt.api.config
 import io.gitlab.arturbosch.detekt.api.internal.ActiveByDefault
 import io.gitlab.arturbosch.detekt.api.internal.Configuration
+import io.gitlab.arturbosch.detekt.api.simplePatternToRegex
 import io.gitlab.arturbosch.detekt.rules.isActual
 import io.gitlab.arturbosch.detekt.rules.isOpen
 import io.gitlab.arturbosch.detekt.rules.isOverride
@@ -52,7 +52,7 @@ class FunctionOnlyReturningConstant(config: Config = Config.empty) : Rule(config
     private val ignoreActualFunction: Boolean by config(true)
 
     @Configuration("excluded functions")
-    private val excludedFunctions: SplitPattern by config("") { SplitPattern(it) }
+    private val excludedFunctions: List<Regex> by config(listOf<String>()) { it.map(String::simplePatternToRegex) }
 
     @Configuration("allows to provide a list of annotations that disable this check")
     @Deprecated("Use `ignoreAnnotated` instead")
@@ -110,7 +110,7 @@ class FunctionOnlyReturningConstant(config: Config = Config.empty) : Rule(config
         }
 
     private fun isNotExcluded(function: KtNamedFunction) =
-        !excludedFunctions.contains(function.name) && !annotationExcluder.shouldExclude(function.annotationEntries)
+        function.name !in excludedFunctions && !annotationExcluder.shouldExclude(function.annotationEntries)
 
     private fun isReturningAConstant(function: KtNamedFunction) =
         isConstantExpression(function.bodyExpression) || returnsConstant(function)
@@ -127,3 +127,8 @@ class FunctionOnlyReturningConstant(config: Config = Config.empty) : Rule(config
         return isConstantExpression(returnExpression?.returnedExpression)
     }
 }
+
+private operator fun Iterable<Regex>.contains(input: String?): Boolean {
+    input ?: return false
+    return any { it.matches(input) }
+}
diff --git a/.../test/kotlin/io/gitlab/arturbosch/detekt/rules/style/FunctionOnlyReturningConstantSpec.kt b/.../test/kotlin/io/gitlab/arturbosch/detekt/rules/style/FunctionOnlyReturningConstantSpec.kt
@@ -63,13 +63,21 @@ class FunctionOnlyReturningConstantSpec {
         }
 
         @Test
-        fun `does not report excluded function which returns a constant`() {
+        fun `does not report excluded function which returns a constant (with string configuration)`() {
             val code = "fun f() = 1"
             val config = TestConfig(mapOf(EXCLUDED_FUNCTIONS to "f"))
             val rule = FunctionOnlyReturningConstant(config)
             assertThat(rule.compileAndLint(code)).isEmpty()
         }
 
+        @Test
+        fun `does not report excluded function which returns a constant`() {
+            val code = "fun f() = 1"
+            val config = TestConfig(mapOf(EXCLUDED_FUNCTIONS to listOf("f")))
+            val rule = FunctionOnlyReturningConstant(config)
+            assertThat(rule.compileAndLint(code)).isEmpty()
+        }
+
         @Test
         @DisplayName(
             "does not report excluded annotated function which returns a constant when given \"kotlin.SinceKotlin\""