JS: repair serialization of type aliases
This commit is contained in:
+1
-1
@@ -135,7 +135,7 @@ object KotlinJavascriptSerializationUtil {
|
||||
val packageStream = ByteArrayOutputStream()
|
||||
val fragments = packageView.fragments
|
||||
val packageProto = serializer.packageProto(fragments, skip).build() ?: error("Package fragments not serialized: $fragments")
|
||||
if (packageProto.functionCount > 0 || packageProto.propertyCount > 0) {
|
||||
if (packageProto.functionCount > 0 || packageProto.propertyCount > 0 || packageProto.typeAliasCount > 0) {
|
||||
packageProto.writeTo(packageStream)
|
||||
writeFun(KotlinJavascriptSerializedResourcePaths.getPackageFilePath(fqName), packageStream.toByteArray())
|
||||
}
|
||||
|
||||
@@ -41,6 +41,12 @@ public class MultiModuleTestGenerated extends AbstractMultiModuleTest {
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("typealiases")
|
||||
public void testTypealiases() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/multiModule/cases/typealiases/");
|
||||
doTest(fileName);
|
||||
}
|
||||
|
||||
@TestMetadata("useElementsFromDefaultPackageInAnotherModule")
|
||||
public void testUseElementsFromDefaultPackageInAnotherModule() throws Exception {
|
||||
String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/multiModule/cases/useElementsFromDefaultPackageInAnotherModule/");
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
lib->
|
||||
main->lib
|
||||
@@ -0,0 +1,13 @@
|
||||
package lib
|
||||
|
||||
object O {
|
||||
val x = "O"
|
||||
|
||||
val y = "K"
|
||||
}
|
||||
|
||||
class C {
|
||||
typealias B = O
|
||||
}
|
||||
|
||||
typealias A = O
|
||||
@@ -0,0 +1,5 @@
|
||||
package foo
|
||||
|
||||
import lib.*
|
||||
|
||||
fun box() = A.x + C.B.y
|
||||
Reference in New Issue
Block a user