azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/JS] Fix Companion object overriding problem inside TypeScript Definitions ^JBAI-680 Fixed

Browse Source
This commit is contained in:
Artem Kobzar
2024-02-29 17:48:24 +00:00
committed by Space Team
parent f1ed07d3bb
commit 1c2570ed7e
6 changed files with 63 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelToTsDeclarations.kt
+14 -6
View File
@@ -8,10 +8,7 @@ package org.jetbrains.kotlin.ir.backend.js.export
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
import org.jetbrains.kotlin.ir.backend.js.JsLoweredDeclarationOrigin
import org.jetbrains.kotlin.ir.backend.js.lower.isEs6PrimaryConstructorReplacement
import org.jetbrains.kotlin.ir.backend.js.utils.JsAnnotations
import org.jetbrains.kotlin.ir.backend.js.utils.getFqNameWithJsNameWhenAvailable
import org.jetbrains.kotlin.ir.backend.js.utils.getJsNameOrKotlinName
import org.jetbrains.kotlin.ir.backend.js.utils.sanitizeName
import org.jetbrains.kotlin.ir.backend.js.utils.*
import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrFunction
import org.jetbrains.kotlin.ir.util.*
@@ -323,7 +320,13 @@ class ExportModelToTsDeclarations {
val realNestedClasses = nonInnerClasses + innerClasses.map { it.withProtectedConstructors() }
val tsIgnoreForPrivateConstructorInheritance = if (hasSuperClassWithPrivateConstructor()) {
tsIgnore("extends class with private primary constructor") + "\n$indent"
} else ""
} else null
val tsIgnoreForCompanionInheritance = if (hasSuperClassAndCompanion()) {
tsIgnore("https://github.com/microsoft/TypeScript/issues/4628") + "\n$indent"
} else null
val tsIgnore = tsIgnoreForPrivateConstructorInheritance ?: tsIgnoreForCompanionInheritance ?: ""
val klassExport =
"$prefix$modifiers$keyword $name$renderedTypeParameters$superClassClause$superInterfacesClause {\n$bodyString}"
@@ -338,7 +341,7 @@ class ExportModelToTsDeclarations {
)
} else ""
return if (name.isValidES5Identifier()) tsIgnoreForPrivateConstructorInheritance + klassExport + staticsExport + interfaceCompanionsString else ""
return if (name.isValidES5Identifier()) tsIgnore + klassExport + staticsExport + interfaceCompanionsString else ""
}
private fun ExportedRegularClass.hasSuperClassWithPrivateConstructor(): Boolean {
@@ -347,6 +350,11 @@ class ExportModelToTsDeclarations {
return exportedConstructor?.let { it.visibility == DescriptorVisibilities.PRIVATE || it.hasAnnotation(JsAnnotations.jsExportIgnoreFqn) } ?: true
}
private fun ExportedRegularClass.hasSuperClassAndCompanion(): Boolean {
val superClass = superClasses.firstIsInstanceOrNull<ExportedType.ClassType>()?.ir?.takeIf { !it.isObject }
return superClass != null && ir.companionObject()?.isJsExportIgnore() == false
}
private fun List<ExportedType>.toExtendsClause(indent: String): String {
if (isEmpty()) return ""