Fix KT-68341

Kotlin · Jun 18, 2024 · a40d825 · a40d825
1 parent ab507fe
commit a40d825
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/translators/TypeTranslator.kt b/...src/main/kotlin/org/jetbrains/dokka/analysis/kotlin/symbols/translators/TypeTranslator.kt
@@ -74,7 +74,9 @@ internal class TypeTranslator(
     fun KaSession.toBoundFrom(type: KaType): Bound =
         when (type) {
             is KaUsualClassType -> {
-                if (type.symbol is KaTypeAliasSymbol) toBoundFromTypeAliased(type)
+                // after KT-66996, [type] is an expanded type
+                val abbreviatedType = type.abbreviatedType
+                if (abbreviatedType != null) toBoundFromTypeAliased(abbreviatedType)
                 else toTypeConstructorFrom(type)
             }
 
@@ -89,8 +91,10 @@ internal class TypeTranslator(
 
             is KaClassErrorType -> UnresolvedBound(type.toString())
             is KaFunctionalType -> {
-                if (type.symbol is KaTypeAliasSymbol) toBoundFromTypeAliased(type)
-                else toFunctionalTypeConstructorFrom(type)
+                // after KT-66996, [type] is an expanded type
+                val abbreviatedType = type.abbreviatedType
+                if (abbreviatedType != null) toBoundFromTypeAliased(abbreviatedType)
+                else toTypeConstructorFrom(type)
             }
             is KaDynamicType -> Dynamic
             is KaDefinitelyNotNullType -> DefinitelyNonNullable(

diff --git a/dokka-subprojects/plugin-base/src/test/kotlin/model/TypesTest.kt b/dokka-subprojects/plugin-base/src/test/kotlin/model/TypesTest.kt
@@ -8,12 +8,14 @@ import org.jetbrains.dokka.base.signatures.KotlinSignatureUtils.driOrNull
 import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.*
 import utils.AbstractModelTest
+import utils.OnlyDescriptors
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
 class TypesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "types") {
 
     @Test
+    @OnlyDescriptors("#3649")
     fun `type with typealias to functional type with parameter`() {
         inlineModelTest(
             """
@@ -42,6 +44,7 @@ class TypesTest : AbstractModelTest("/src/main/kotlin/classes/Test.kt", "types")
     }
 
     @Test
+    @OnlyDescriptors("#3649")
     fun `type with typealias to functional type`() {
         inlineModelTest(
             """