Resolve rebase conflicts

Kotlin · May 13, 2022 · dd1b283 · dd1b283
1 parent 9053106
commit dd1b283
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 28 deletions.
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/PropertiesMergerTransformer.kt b/plugins/base/src/main/kotlin/transformers/documentables/PropertiesMergerTransformer.kt
@@ -25,7 +25,7 @@ class PropertiesMergerTransformer : PreMergeDocumentableTransformer {
 
     private fun <T : WithScope> T.mergeAccessorsAndField(): T {
         val (functions, properties) = mergePotentialAccessorsAndField(this.functions, this.properties)
-        return when (this) {
+        val result = when (this) {
             is DClass -> {
                 this.copy(functions = functions, properties = properties)
             }
@@ -45,7 +45,10 @@ class PropertiesMergerTransformer : PreMergeDocumentableTransformer {
                 this.copy(functions = functions, properties = properties)
             }
             else -> this
-        } as T
+        }
+
+        @Suppress("UNCHECKED_CAST")
+        return result as T
     }
 
     /**

diff --git a/...base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/...base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -150,8 +150,8 @@ private class DokkaDescriptorVisitor(
         return coroutineScope {
             val descriptorsWithKind = scope.getDescriptorsWithKind(true)
 
-            val functions = async { descriptorsWithKind.functions.visitFunctions() }
-            val properties = async { descriptorsWithKind.properties.visitProperties() }
+            val functions = async { descriptorsWithKind.functions.visitFunctions(driWithPlatform) }
+            val properties = async { descriptorsWithKind.properties.visitProperties(driWithPlatform) }
             val classlikes = async { descriptorsWithKind.classlikes.visitClasslikes(driWithPlatform) }
             val typealiases = async { descriptorsWithKind.typealiases.visitTypealiases() }
 
@@ -186,8 +186,8 @@ private class DokkaDescriptorVisitor(
         return coroutineScope {
             val descriptorsWithKind = scope.getDescriptorsWithKind()
 
-            val functions = async { descriptorsWithKind.functions.visitFunctions() }
-            val properties = async { descriptorsWithKind.properties.visitProperties() }
+            val functions = async { descriptorsWithKind.functions.visitFunctions(driWithPlatform) }
+            val properties = async { descriptorsWithKind.properties.visitProperties(driWithPlatform) }
             val classlikes = async { descriptorsWithKind.classlikes.visitClasslikes(driWithPlatform) }
             val generics = async { descriptor.declaredTypeParameters.parallelMap { it.toVariantTypeParameter() } }
 
@@ -227,8 +227,8 @@ private class DokkaDescriptorVisitor(
         return coroutineScope {
             val descriptorsWithKind = scope.getDescriptorsWithKind()
 
-            val functions = async { descriptorsWithKind.functions.visitFunctions() }
-            val properties = async { descriptorsWithKind.properties.visitProperties() }
+            val functions = async { descriptorsWithKind.functions.visitFunctions(driWithPlatform) }
+            val properties = async { descriptorsWithKind.properties.visitProperties(driWithPlatform) }
             val classlikes = async { descriptorsWithKind.classlikes.visitClasslikes(driWithPlatform) }
 
             DObject(
@@ -266,8 +266,8 @@ private class DokkaDescriptorVisitor(
         return coroutineScope {
             val descriptorsWithKind = scope.getDescriptorsWithKind()
 
-            val functions = async { descriptorsWithKind.functions.visitFunctions() }
-            val properties = async { descriptorsWithKind.properties.visitProperties() }
+            val functions = async { descriptorsWithKind.functions.visitFunctions(driWithPlatform) }
+            val properties = async { descriptorsWithKind.properties.visitProperties(driWithPlatform) }
             val classlikes = async { descriptorsWithKind.classlikes.visitClasslikes(driWithPlatform) }
             val constructors =
                 async { descriptor.constructors.parallelMap { visitConstructorDescriptor(it, driWithPlatform) } }
@@ -306,8 +306,8 @@ private class DokkaDescriptorVisitor(
         return coroutineScope {
             val descriptorsWithKind = scope.getDescriptorsWithKind()
 
-            val functions = async { descriptorsWithKind.functions.visitFunctions() }
-            val properties = async { descriptorsWithKind.properties.visitProperties() }
+            val functions = async { descriptorsWithKind.functions.visitFunctions(driWithPlatform) }
+            val properties = async { descriptorsWithKind.properties.visitProperties(driWithPlatform) }
             val classlikes = async { descriptorsWithKind.classlikes.visitClasslikes(driWithPlatform) }
 
             DEnumEntry(
@@ -337,8 +337,8 @@ private class DokkaDescriptorVisitor(
         return coroutineScope {
             val descriptorsWithKind = scope.getDescriptorsWithKind()
 
-            val functions = async { descriptorsWithKind.functions.visitFunctions() }
-            val properties = async { descriptorsWithKind.properties.visitProperties() }
+            val functions = async { descriptorsWithKind.functions.visitFunctions(driWithPlatform) }
+            val properties = async { descriptorsWithKind.properties.visitProperties(driWithPlatform) }
             val classlikes = async { descriptorsWithKind.classlikes.visitClasslikes(driWithPlatform) }
             val generics = async { descriptor.declaredTypeParameters.parallelMap { it.toVariantTypeParameter() } }
             val constructors =
@@ -380,8 +380,8 @@ private class DokkaDescriptorVisitor(
         return coroutineScope {
             val descriptorsWithKind = scope.getDescriptorsWithKind()
 
-            val functions = async { descriptorsWithKind.functions.visitFunctions() }
-            val properties = async { descriptorsWithKind.properties.visitProperties() }
+            val functions = async { descriptorsWithKind.functions.visitFunctions(driWithPlatform) }
+            val properties = async { descriptorsWithKind.properties.visitProperties(driWithPlatform) }
             val classlikes = async { descriptorsWithKind.classlikes.visitClasslikes(driWithPlatform) }
             val generics = async { descriptor.declaredTypeParameters.parallelMap { it.toVariantTypeParameter() } }
             val constructors = async {
@@ -421,7 +421,10 @@ private class DokkaDescriptorVisitor(
         }
     }
 
-    private suspend fun visitPropertyDescriptor(originalDescriptor: PropertyDescriptor, ): DProperty {
+    private suspend fun visitPropertyDescriptor(
+        originalDescriptor: PropertyDescriptor,
+        parent: DRIWithPlatformInfo
+    ): DProperty {
         val (dri, _) = originalDescriptor.createDRI()
         /**
          * `createDRI` returns the DRI of the exact element and potential DRI of an element that is overriding it
@@ -482,7 +485,10 @@ private class DokkaDescriptorVisitor(
         else
             overriddenDescriptors.first().createDRI(DRI.from(this))
 
-    private suspend fun visitFunctionDescriptor(originalDescriptor: FunctionDescriptor): DFunction {
+    private suspend fun visitFunctionDescriptor(
+        originalDescriptor: FunctionDescriptor,
+        parent: DRIWithPlatformInfo
+    ): DFunction {
         val (dri, _) = originalDescriptor.createDRI()
         /**
          * To avoid redundant docs, please visit [visitPropertyDescriptor] inheritedFrom
@@ -778,11 +784,11 @@ private class DokkaDescriptorVisitor(
         )
     }
 
-    private suspend fun List<FunctionDescriptor>.visitFunctions(): List<DFunction> =
-        coroutineScope { parallelMap { visitFunctionDescriptor(it) } }
+    private suspend fun List<FunctionDescriptor>.visitFunctions(parent: DRIWithPlatformInfo): List<DFunction> =
+        coroutineScope { parallelMap { visitFunctionDescriptor(it, parent) } }
 
-    private suspend fun List<PropertyDescriptor>.visitProperties(): List<DProperty> =
-        coroutineScope { parallelMap { visitPropertyDescriptor(it) } }
+    private suspend fun List<PropertyDescriptor>.visitProperties(parent: DRIWithPlatformInfo): List<DProperty> =
+        coroutineScope { parallelMap { visitPropertyDescriptor(it, parent) } }
 
     private suspend fun List<ClassDescriptor>.visitClasslikes(parent: DRIWithPlatformInfo): List<DClasslike> =
         coroutineScope { parallelMap { visitClassDescriptor(it, parent) } }
@@ -936,8 +942,8 @@ private class DokkaDescriptorVisitor(
 
     private fun DeclarationDescriptor.getJavaDocs() = (
             ((this as? CallableDescriptor)?.overriddenDescriptors ?: emptyList()) + listOf(this)
-        )?.mapNotNull { it.findPsi() as? PsiNamedElement }
-        ?.firstOrNull()
+        ).mapNotNull { it.findPsi() as? PsiNamedElement }
+        .firstOrNull()
         ?.let { javadocParser.parseDocumentation(it) }
 
     private suspend fun ClassDescriptor.companion(dri: DRIWithPlatformInfo): DObject? = companionObjectDescriptor?.let {

diff --git a/plugins/base/src/test/kotlin/superFields/PsiSuperFieldsTest.kt b/plugins/base/src/test/kotlin/superFields/PsiSuperFieldsTest.kt
@@ -5,7 +5,6 @@ import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.Annotations
 import org.jetbrains.dokka.model.InheritedMember
 import org.jetbrains.dokka.model.isJvmField
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
@@ -14,7 +13,6 @@ import kotlin.test.assertEquals
 
 class PsiSuperFieldsTest : BaseAbstractTest() {
 
-    @Disabled // TODO: Remove with Kotlin 1.6.20
     @Test
     fun `java inheriting java`() {
         testInline(
@@ -53,7 +51,6 @@ class PsiSuperFieldsTest : BaseAbstractTest() {
         }
     }
 
-    @Disabled // TODO: Remove with Kotlin 1.6.20
     @Test
     fun `java inheriting kotlin`() {
         testInline(
@@ -94,7 +91,6 @@ class PsiSuperFieldsTest : BaseAbstractTest() {
         }
     }
 
-    @Disabled // TODO: Remove with Kotlin 1.6.20
     @Test
     fun `java inheriting kotlin with @JvmField should not inherit beans`() {
         testInline(