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

[K/JS] Remove FILE target from JsName annotation and use the new experimental JsFileName annotation instead

Browse Source
This commit is contained in:
Artem Kobzar
2023-07-27 09:44:28 +00:00
committed by Space Team
parent 029c71ebb1
commit 85ee2d71d2
16 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt
+1 -1
View File
@@ -338,7 +338,7 @@ class IrModuleToJsTransformer(
val staticContext = JsStaticContext(backendContext, nameGenerator, globalNameScope, mode)
val result = JsIrProgramFragment(
fileExports.file.getJsName() ?: fileExports.file.nameWithoutExtension,
fileExports.file.getJsFileName() ?: fileExports.file.nameWithoutExtension,
fileExports.file.packageFqName.asString()
).apply {
if (shouldGeneratePolyfills) {
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/ModuleFragmentToExternalName.kt
+2 -1
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs
import org.jetbrains.kotlin.ir.backend.js.utils.getJsFileName
import org.jetbrains.kotlin.ir.backend.js.utils.getJsName
import org.jetbrains.kotlin.ir.backend.js.utils.nameWithoutExtension
import org.jetbrains.kotlin.ir.backend.js.utils.sanitizeName
@@ -67,6 +68,6 @@ class ModuleFragmentToExternalName(private val jsOutputNamesMapping: Map<IrModul
return "$prefix${if (prefix.isNotEmpty()) "/" else ""}$fileName"
}
private val IrFile.outputName: String get() = getJsName() ?: nameWithoutExtension
private val IrFile.outputName: String get() = getJsFileName() ?: nameWithoutExtension
private val IrFile.stableFileName: String get() = getFileStableName(outputName, packageFqName.asString())
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/AnnotationUtils.kt
+5 -4
View File
@@ -6,10 +6,7 @@
package org.jetbrains.kotlin.ir.backend.js.utils
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer
import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrDeclarationWithName
import org.jetbrains.kotlin.ir.declarations.IrOverridableDeclaration
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.IrClassReference
import org.jetbrains.kotlin.ir.expressions.IrConst
import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
@@ -22,6 +19,7 @@ object JsAnnotations {
val jsModuleFqn = FqName("kotlin.js.JsModule")
val jsNonModuleFqn = FqName("kotlin.js.JsNonModule")
val jsNameFqn = FqName("kotlin.js.JsName")
val jsFileNameFqn = FqName("kotlin.js.JsFileName")
val jsQualifierFqn = FqName("kotlin.js.JsQualifier")
val jsExportFqn = FqName("kotlin.js.JsExport")
val jsImplicitExportFqn = FqName("kotlin.js.JsImplicitExport")
@@ -46,6 +44,9 @@ fun IrAnnotationContainer.isJsNonModule(): Boolean =
fun IrAnnotationContainer.getJsQualifier(): String? =
getAnnotation(JsAnnotations.jsQualifierFqn)?.getSingleConstStringArgument()
fun IrFile.getJsFileName(): String? =
getAnnotation(JsAnnotations.jsFileNameFqn)?.getSingleConstStringArgument()
fun IrAnnotationContainer.getJsName(): String? =
getAnnotation(JsAnnotations.jsNameFqn)?.getSingleConstStringArgument()