From f5b7797255576e5f1c230e2ca3fcb5f4e602387c Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Mon, 21 Feb 2022 22:01:06 +0800
Subject: Code cleanups (#2165)

---
 .../kotlin/transformers/pages/samples/DefaultSamplesTransformer.kt  | 3 +--
 .../main/kotlin/transformers/pages/samples/SamplesTransformer.kt    | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'plugins/base/src/main/kotlin/transformers/pages/samples')

diff --git a/plugins/base/src/main/kotlin/transformers/pages/samples/DefaultSamplesTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/samples/DefaultSamplesTransformer.kt
index cadd3de0..c5b0f221 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/samples/DefaultSamplesTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/samples/DefaultSamplesTransformer.kt
@@ -19,8 +19,7 @@ class DefaultSamplesTransformer(context: DokkaContext) : SamplesTransformer(cont
 
     private fun processSampleBody(psiElement: PsiElement): String = when (psiElement) {
         is KtDeclarationWithBody -> {
-            val bodyExpression = psiElement.bodyExpression
-            when (bodyExpression) {
+            when (val bodyExpression = psiElement.bodyExpression) {
                 is KtBlockExpression -> bodyExpression.text.removeSurrounding("{", "}")
                 else -> bodyExpression!!.text
             }
diff --git a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
index 43252be3..3ff7a77d 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt
@@ -46,8 +46,8 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
         }
     }
 
-    private fun setUpAnalysis(context: DokkaContext) = context.configuration.sourceSets.map { sourceSet ->
-        sourceSet to if (sourceSet.samples.isEmpty()) context.plugin<DokkaBase>()
+    private fun setUpAnalysis(context: DokkaContext) = context.configuration.sourceSets.associateWith { sourceSet ->
+        if (sourceSet.samples.isEmpty()) context.plugin<DokkaBase>()
             .querySingle { kotlinAnalysis }[sourceSet] // from sourceSet.sourceRoots
         else AnalysisEnvironment(DokkaMessageCollector(context.logger), sourceSet.analysisPlatform).run {
             if (analysisPlatform == Platform.jvm) {
@@ -63,7 +63,7 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer {
             val (facade, _) = createResolutionFacade(environment)
             EnvironmentAndFacade(environment, facade)
         }
-    }.toMap()
+    }
 
     private fun ContentNode.addSample(
         contentPage: ContentPage,
-- 
cgit