Enable UseAnyOrNoneInsteadOfFind

detekt · Dec 9, 2021 · 15b265a · 15b265a
1 parent 92433ea
commit 15b265a
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
@@ -227,6 +227,8 @@ style:
   UnusedPrivateMember:
     active: true
     allowedNames: '(_|ignored|expected)'
+  UseAnyOrNoneInsteadOfFind:
+    active: true
   UseCheckOrError:
     active: true
   UseEmptyCounterpart:

diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/AnnotationExcluder.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/AnnotationExcluder.kt
@@ -28,8 +28,7 @@ class AnnotationExcluder(
      * Is true if any given annotation name is declared in the SplitPattern
      * which basically describes entries to exclude.
      */
-    fun shouldExclude(annotations: List<KtAnnotationEntry>): Boolean =
-        annotations.firstOrNull(::isExcluded) != null
+    fun shouldExclude(annotations: List<KtAnnotationEntry>): Boolean = annotations.any(::isExcluded)
 
     private fun isExcluded(annotation: KtAnnotationEntry): Boolean {
         val annotationText = annotation.typeReference?.text

diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/FileProcessorLocatorSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/FileProcessorLocatorSpec.kt
@@ -25,7 +25,7 @@ class FileProcessorLocatorSpec : Spek({
 
             assertThat(processorClasses).isNotEmpty
             processorClasses
-                .filter { clazz -> processors.firstOrNull { clazz == it.javaClass } == null }
+                .filter { clazz -> processors.any { clazz == it.javaClass } }
                 .forEach { fail("$it processor is not loaded by the FileProcessorLocator") }
         }
 

diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/rules/RuleSetLocatorSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/rules/RuleSetLocatorSpec.kt
@@ -20,7 +20,7 @@ class RuleSetLocatorSpec : Spek({
 
             assertThat(providerClasses).isNotEmpty
             providerClasses
-                .filter { clazz -> providers.firstOrNull { it.javaClass == clazz } == null }
+                .filter { clazz -> providers.any { it.javaClass == clazz } }
                 .forEach { fail("$it rule set is not loaded by the RuleSetLocator") }
         }
 

diff --git a/...kt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/Deprecation.kt b/...kt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/Deprecation.kt
@@ -41,5 +41,5 @@ class Deprecation(config: Config) : Rule(config) {
     private fun hasDeprecationCompilerWarnings(element: PsiElement) =
         bindingContext.diagnostics
             .forElement(element)
-            .firstOrNull { it.factory == Errors.DEPRECATION } != null
+            .any { it.factory == Errors.DEPRECATION }
 }
diff --git a/.../src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/optional/MandatoryBracesLoops.kt b/.../src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/optional/MandatoryBracesLoops.kt
@@ -79,7 +79,8 @@ class MandatoryBracesLoops(config: Config = Config.empty) : Rule(config) {
             val hasNoBraces = expression.rightParenthesis
                 ?.siblings(forward = true, withItself = false)
                 ?.filterIsInstance<PsiWhiteSpace>()
-                ?.firstOrNull { it.textContains('\n') } != null
+                ?.any { it.textContains('\n') }
+                ?: false
             if (hasNoBraces) {
                 report(CodeSmell(issue, Entity.from(expression.body ?: expression), message = DESCRIPTION))
             }
@@ -92,7 +93,7 @@ class MandatoryBracesLoops(config: Config = Config.empty) : Rule(config) {
             val hasNoBraces = expression.siblings(forward = true, withItself = false)
                 .takeWhile { it != expression.whileKeyword }
                 .filterIsInstance<PsiWhiteSpace>()
-                .firstOrNull { it.textContains('\n') } != null
+                .any { it.textContains('\n') }
             if (hasNoBraces) {
                 report(CodeSmell(issue, Entity.from(expression.body ?: expression), message = DESCRIPTION))
             }