Code cleanups (#2165)

5 files changed, 17 insertions, 18 deletions

diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index f636f984..b6de9276 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -416,7 +416,7 @@ private class DokkaDescriptorVisitor(
                 companion = descriptor.companion(driWithPlatform),
                 sourceSets = setOf(sourceSet),
                 isExpectActual = (isExpect || isActual),
-                extra = PropertyContainer.withAll<DClass>(
+                extra = PropertyContainer.withAll(
                     descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
                     descriptor.getAnnotations().toSourceSetDependent().toAnnotations(),
                     ImplementedInterfaces(info.ancestry.allImplementedInterfaces().toSourceSetDependent()),
@@ -667,7 +667,7 @@ private class DokkaDescriptorVisitor(
                 sources = descriptor.createSources(),
                 sourceSets = setOf(sourceSet),
                 isExpectActual = (isExpect || isActual),
-                extra = PropertyContainer.withAll<DFunction>(
+                extra = PropertyContainer.withAll(
                     descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
                     descriptor.getAnnotations().toSourceSetDependent().toAnnotations()
                 )
@@ -724,7 +724,7 @@ private class DokkaDescriptorVisitor(
         val enumEntries: List<ClassDescriptor>
     )
 
-    private suspend fun MemberScope.getDescriptorsWithKind(shouldFilter: Boolean = false): DescriptorsWithKind {
+    private fun MemberScope.getDescriptorsWithKind(shouldFilter: Boolean = false): DescriptorsWithKind {
         val descriptors = getContributedDescriptors { true }.let {
             if (shouldFilter) it.filterDescriptorsInSourceSet() else it
         }
@@ -820,7 +820,7 @@ private class DokkaDescriptorVisitor(
             )
         )
 
-    private suspend fun org.jetbrains.kotlin.descriptors.annotations.Annotations.getPresentableName(): String? =
+    private fun org.jetbrains.kotlin.descriptors.annotations.Annotations.getPresentableName(): String? =
         mapNotNull { it.toAnnotation() }.singleOrNull { it.dri.classNames == "ParameterName" }?.params?.get("name")
             .safeAs<StringValue>()?.value?.let { unquotedValue(it) }
 
@@ -896,7 +896,7 @@ private class DokkaDescriptorVisitor(
                     null
                 }
             },
-            kdocLocation = toSourceElement?.containingFile?.name?.let {
+            kdocLocation = toSourceElement.containingFile.name?.let {
                 val fqName = fqNameOrNull()?.asString()
                 if (fqName != null) "$it/$fqName"
                 else it
@@ -967,8 +967,8 @@ private class DokkaDescriptorVisitor(
 
     private suspend fun Annotated.getAnnotations() = annotations.parallelMapNotNull { it.toAnnotation() }
 
-    private fun ConstantValue<*>.toValue(): AnnotationParameterValue? = when (this) {
-        is ConstantsAnnotationValue -> value.toAnnotation()?.let { AnnotationValue(it) }
+    private fun ConstantValue<*>.toValue(): AnnotationParameterValue = when (this) {
+        is ConstantsAnnotationValue -> AnnotationValue(value.toAnnotation())
         is ConstantsArrayValue -> ArrayValue(value.mapNotNull { it.toValue() })
         is ConstantsEnumValue -> EnumValue(
             fullEnumEntryName(),
@@ -1004,7 +1004,7 @@ private class DokkaDescriptorVisitor(
             DRI.from(annotationClass as DeclarationDescriptor),
             allValueArguments.map { it.key.asString() to it.value.toValue() }.filter {
                 it.second != null
-            }.toMap() as Map<String, AnnotationParameterValue>,
+            }.toMap(),
             mustBeDocumented(),
             scope
         )
@@ -1031,16 +1031,16 @@ private class DokkaDescriptorVisitor(
     private fun ValueParameterDescriptor.getDefaultValue(): Expression? =
         ((source as? KotlinSourceElement)?.psi as? KtParameter)?.defaultValue?.toDefaultValueExpression()
 
-    private suspend fun PropertyDescriptor.getDefaultValue(): Expression? =
+    private fun PropertyDescriptor.getDefaultValue(): Expression? =
         (source as? KotlinSourceElement)?.psi?.children?.filterIsInstance<KtConstantExpression>()?.firstOrNull()
             ?.toDefaultValueExpression()
 
-    private suspend fun ClassDescriptor.getAppliedConstructorParameters() =
+    private fun ClassDescriptor.getAppliedConstructorParameters() =
         (source as PsiSourceElement).psi?.children?.flatMap {
             it.safeAs<KtInitializerList>()?.initializersAsExpression().orEmpty()
         }.orEmpty()
 
-    private suspend fun KtInitializerList.initializersAsExpression() =
+    private fun KtInitializerList.initializersAsExpression() =
         initializers.firstIsInstanceOrNull<KtCallElement>()
             ?.getValueArgumentsInParentheses()
             ?.map { it.getArgumentExpression()?.toDefaultValueExpression() ?: ComplexExpression("") }
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 946d6416..e2aca6f9 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -269,7 +269,7 @@ open class DefaultPageCreator(
                         it.sourceSets.toSet(),
                         kind = ContentKind.SourceSetDependentHint,
                         styles = emptySet(),
-                        extra = PropertyContainer.empty<ContentNode>()
+                        extra = PropertyContainer.empty()
                     ) {
                         +buildSignature(it)
                         contentForBrief(it)
@@ -293,7 +293,7 @@ open class DefaultPageCreator(
                         it.dri,
                         it.sourceSets.toSet(),
                         kind = ContentKind.SourceSetDependentHint,
-                        extra = PropertyContainer.empty<ContentNode>()
+                        extra = PropertyContainer.empty()
                     ) {
                         +buildSignature(it)
                         contentForBrief(it)
@@ -722,7 +722,7 @@ open class DefaultPageCreator(
         }.groupBy { it.second::class }
 
     private val Documentable.descriptions: SourceSetDependent<Description>
-        get() = groupedTags.withTypeUnnamed<Description>()
+        get() = groupedTags.withTypeUnnamed()
 
     private val Documentable.customTags: Map<String, SourceSetDependent<CustomTagWrapper>>
         get() = groupedTags.withTypeNamed()
diff --git a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
index 88c51b02..7acf735a 100644
--- a/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/DefaultPsiToDocumentableTranslator.kt
@@ -540,7 +540,7 @@ class DefaultPsiToDocumentableTranslator(
                 }
 
         private fun PsiClass.splitFunctionsAndAccessors(): Pair<MutableList<PsiMethod>, MutableMap<PsiField, MutableList<PsiMethod>>> {
-            val fieldNames = fields.map { it.name to it }.toMap()
+            val fieldNames = fields.associateBy { it.name }
             val accessors = mutableMapOf<PsiField, MutableList<PsiMethod>>()
             val regularMethods = mutableListOf<PsiMethod>()
             methods.forEach { method ->
@@ -572,7 +572,7 @@ class DefaultPsiToDocumentableTranslator(
                 emptyList(),
                 false,
                 psi.additionalExtras().let {
-                    PropertyContainer.withAll<DProperty>(
+                    PropertyContainer.withAll(
                         it.toSourceSetDependent().toAdditionalModifiers(),
                         (psi.annotations.toList()
                             .toListOfAnnotations() + it.toListOfAnnotations()).toSourceSetDependent()
diff --git a/plugins/base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt b/plugins/base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt
index f93f7d6d..a228e95a 100644
--- a/plugins/base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/parsers/JavadocParser.kt
@@ -85,7 +85,7 @@ class JavadocParser(
             parseWithChildren = parseWithChildren
         )
 
-    private fun parseDocTag(tag: PsiDocTag, docComment: PsiDocComment, analysedElement: PsiNamedElement): TagWrapper? =
+    private fun parseDocTag(tag: PsiDocTag, docComment: PsiDocComment, analysedElement: PsiNamedElement): TagWrapper =
         enumValueOrNull<JavadocTag>(tag.name)?.let { javadocTag ->
             val resolutionContext = CommentResolutionContext(comment = docComment, tag = javadocTag)
             when (resolutionContext.tag) {
diff --git a/plugins/base/src/main/kotlin/translators/psi/parsers/exceptionTag.kt b/plugins/base/src/main/kotlin/translators/psi/parsers/exceptionTag.kt
index 6e1850bb..3cc16251 100644
--- a/plugins/base/src/main/kotlin/translators/psi/parsers/exceptionTag.kt
+++ b/plugins/base/src/main/kotlin/translators/psi/parsers/exceptionTag.kt
@@ -3,7 +3,6 @@ package org.jetbrains.dokka.base.translators.psi.parsers
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiJavaCodeReferenceElement
 import com.intellij.psi.impl.source.tree.JavaDocElementType
-import com.intellij.psi.javadoc.PsiDocTag
 import com.intellij.psi.util.PsiTreeUtil
 
 internal fun PsiElement.referenceElementOrSelf(): PsiElement? =