From 210e8750f48fa16ccd078ca98afb9249d54cb505 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Wed, 5 Apr 2023 12:52:05 +0200 Subject: [PATCH] [FIR] Deserialize nested typealias #KT-57689 Fixed --- .../kotlin/fir/deserialization/ClassDeserialization.kt | 4 ++++ .../testData/box/inlineMultiModule/typealiases.kt | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt index 19d54a6e799..cb9f41873e2 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt @@ -157,6 +157,10 @@ fun deserializeClassToSymbol( } ) + addDeclarations( + classProto.typeAliasList.mapNotNull(classDeserializer::loadTypeAlias) + ) + addDeclarations( classProto.enumEntryList.mapNotNull { enumEntryProto -> val enumEntryName = nameResolver.getName(enumEntryProto.name) diff --git a/js/js.translator/testData/box/inlineMultiModule/typealiases.kt b/js/js.translator/testData/box/inlineMultiModule/typealiases.kt index 5fa9477b960..48aa0e5fb1c 100644 --- a/js/js.translator/testData/box/inlineMultiModule/typealiases.kt +++ b/js/js.translator/testData/box/inlineMultiModule/typealiases.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND_K2: JS_IR // EXPECTED_REACHABLE_NODES: 1286 // MODULE: lib // FILE: lib.kt @@ -25,4 +24,4 @@ package foo import lib.* -fun box() = A.x + C.B.y \ No newline at end of file +fun box() = A.x + C.B.y