From 472a4da0d2bbebef9bf8a6424e1024aaa57b1951 Mon Sep 17 00:00:00 2001
From: vmishenev <vad-mishenev@yandex.ru>
Date: Mon, 20 Dec 2021 12:36:39 +0300
Subject: [PATCH] Improve code style

---
 ...DocumentableVisibilityFilterTransformer.kt | 19 ++++++++++---------
 .../transformers/SuppressTagFilterTest.kt     |  3 +--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilterTransformer.kt b/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilterTransformer.kt
index ca364dae96..bd39b04062 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilterTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilterTransformer.kt
@@ -81,9 +81,12 @@ class DocumentableVisibilityFilterTransformer(val context: DokkaContext) : PreMe
             return Pair(packagesListChanged, filteredPackages)
         }
 
+        @Suppress("UNUSED_PARAMETER")
         private fun <T : WithVisibility> alwaysTrue(a: T, p: DokkaSourceSet) = true
+        @Suppress("UNUSED_PARAMETER")
         private fun <T : WithVisibility> alwaysFalse(a: T, p: DokkaSourceSet) = false
-        private fun <T> alwaysNoModify(a: T, sourceSets: Set<DokkaSourceSet>) = Pair(false, a)
+        @Suppress("UNUSED_PARAMETER")
+        private fun <T> alwaysNoModify(a: T, sourceSets: Set<DokkaSourceSet>) = false to a
 
         private fun WithVisibility.visibilityForPlatform(data: DokkaSourceSet): Visibility? = visibility[data]
 
@@ -159,16 +162,14 @@ class DocumentableVisibilityFilterTransformer(val context: DokkaContext) : PreMe
 
                     val modified = setter?.first == true || getter?.first == true
 
-                    Pair(modified,
+                    val property =
                         if (modified)
-                            with(original) {
-                                copy(
-                                    setter = setter?.second?.firstOrNull(),
-                                    getter = getter?.second?.firstOrNull()
-                                )
-                            }
+                            original.copy(
+                                setter = setter?.second?.firstOrNull(),
+                                getter = getter?.second?.firstOrNull()
+                            )
                         else original
-                    )
+                    modified to property
                 }
 
             return properties.transform(
diff --git a/plugins/base/src/test/kotlin/transformers/SuppressTagFilterTest.kt b/plugins/base/src/test/kotlin/transformers/SuppressTagFilterTest.kt
index 4c4267609a..de1ee46ce9 100644
--- a/plugins/base/src/test/kotlin/transformers/SuppressTagFilterTest.kt
+++ b/plugins/base/src/test/kotlin/transformers/SuppressTagFilterTest.kt
@@ -2,7 +2,6 @@ package transformers
 
 import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest
 import org.jetbrains.dokka.model.DEnum
-import org.jetbrains.dokka.model.DProperty
 import org.jetbrains.dokka.model.WithCompanion
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
@@ -101,7 +100,7 @@ class SuppressTagFilterTest : BaseAbstractTest() {
         ) {
             preMergeDocumentablesTransformationStage = { modules ->
                 val prop = modules.flatMap { it.packages }.flatMap { it.properties }
-                    .firstOrNull { it.name == "property" } as? DProperty
+                    .find { it.name == "property" }
                 assertNotNull(prop)
                 assertNotNull(prop.getter)
                 assertNull(prop.setter)