[StubIr] Perform declaration mangling when emitting text
This commit is contained in:
committed by
Sergey Bogolepov
parent
06dba7fc09
commit
b58f9985d2
+2
-2
@@ -311,7 +311,7 @@ abstract class KotlinFile(
|
||||
}
|
||||
alreadyDeclared.add(topLevelName)
|
||||
|
||||
return topLevelName.asSimpleName()
|
||||
return topLevelName
|
||||
}
|
||||
|
||||
override fun declareProperty(name: String): String? =
|
||||
@@ -320,7 +320,7 @@ abstract class KotlinFile(
|
||||
// TODO: using original global name should be preferred to importing the clashed name.
|
||||
} else {
|
||||
declaredProperties.add(name)
|
||||
name.asSimpleName()
|
||||
name
|
||||
}
|
||||
|
||||
fun buildImports(): List<String> = importedNameToPkg.mapNotNull { (name, pkg) ->
|
||||
|
||||
+2
-2
@@ -286,7 +286,7 @@ class StubIrTextEmitter(
|
||||
val modality = "$override${renderMemberModality(element.modality, owner)}"
|
||||
val receiver = if (element.receiverType != null) "${renderStubType(element.receiverType)}." else ""
|
||||
val name = if (owner?.isTopLevelContainer == true) {
|
||||
getTopLevelPropertyDeclarationName(kotlinFile, element.name)
|
||||
getTopLevelPropertyDeclarationName(kotlinFile, element.name).asSimpleName()
|
||||
} else {
|
||||
element.name.asSimpleName()
|
||||
}
|
||||
@@ -391,7 +391,7 @@ class StubIrTextEmitter(
|
||||
}
|
||||
|
||||
private fun renderClassifierDeclaration(classifier: Classifier): String =
|
||||
kotlinFile.declare(classifier)
|
||||
kotlinFile.declare(classifier).asSimpleName()
|
||||
|
||||
private fun renderClassStubModality(classStubModality: ClassStubModality): String = when (classStubModality) {
|
||||
ClassStubModality.INTERFACE -> "interface "
|
||||
|
||||
Reference in New Issue
Block a user