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

[FE] Add isLocal name to ClassId constructor calls where it needed

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-09-19 13:08:42 +03:00
committed by Space Team
parent adaf8ae46a
commit 9e5ee3afa0
39 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/compiler.common.jvm/src/org/jetbrains/kotlin/builtins/jvm/JavaToKotlinClassMap.kt
+1 -1
View File
@@ -46,7 +46,7 @@ object JavaToKotlinClassMap {
)
private inline fun <reified T> mutabilityMapping(kotlinReadOnly: ClassId, kotlinMutable: FqName): PlatformMutabilityMapping {
val mutableClassId = ClassId(kotlinReadOnly.packageFqName, kotlinMutable.tail(kotlinReadOnly.packageFqName), false)
val mutableClassId = ClassId(kotlinReadOnly.packageFqName, kotlinMutable.tail(kotlinReadOnly.packageFqName), isLocal = false)
return PlatformMutabilityMapping(classId(T::class.java), kotlinReadOnly, mutableClassId)
}
core/compiler.common/src/org/jetbrains/kotlin/name/CallableId.kt
+1 -1
View File
@@ -28,7 +28,7 @@ data class CallableId(
var classId: ClassId? = null
get() {
if (field == null && className != null) {
field = ClassId(packageName, className, packageName == PACKAGE_FQ_NAME_FOR_LOCAL)
field = ClassId(packageName, className, isLocal = packageName == PACKAGE_FQ_NAME_FOR_LOCAL)
}
return field
}
core/compiler.common/src/org/jetbrains/kotlin/name/ClassId.kt
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.runIf
* the second one being the class' short name.
*/
class ClassId(val packageFqName: FqName, val relativeClassName: FqName, val isLocal: Boolean) {
constructor(packageFqName: FqName, topLevelName: Name) : this(packageFqName, FqName.topLevel(topLevelName), false)
constructor(packageFqName: FqName, topLevelName: Name) : this(packageFqName, FqName.topLevel(topLevelName), isLocal = false)
init {
assert(!relativeClassName.isRoot) { "Class name must not be root: " + packageFqName + if (isLocal) " (local)" else "" }
@@ -53,7 +53,7 @@ class ClassId(val packageFqName: FqName, val relativeClassName: FqName, val isLo
while (!name.parent().isRoot) {
name = name.parent()
}
return ClassId(packageFqName, name, false)
return ClassId(packageFqName, name, isLocal = false)
}
val isNestedClass: Boolean
core/descriptors.runtime/src/org/jetbrains/kotlin/descriptors/runtime/structure/reflectClassUtil.kt
+1 -1
View File
@@ -61,7 +61,7 @@ val Class<*>.classId: ClassId
isArray -> throw IllegalArgumentException("Can't compute ClassId for array type: $this")
enclosingMethod != null || enclosingConstructor != null || simpleName.isEmpty() -> {
val fqName = FqName(name)
ClassId(fqName.parent(), FqName.topLevel(fqName.shortName()), /* local = */ true)
ClassId(fqName.parent(), FqName.topLevel(fqName.shortName()), isLocal = true)
}
else -> declaringClass?.classId?.createNestedClassId(Name.identifier(simpleName)) ?: ClassId.topLevel(FqName(name))
}