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

FIR: Minor. Add some minor fixes and clarifications to CallableId

Browse Source
This commit is contained in:
Denis Zharkov
2020-04-20 14:51:15 +03:00
parent 8aea75d8b9
commit 64eeedd21a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/CallableId.kt
+4 -3
View File
@@ -14,7 +14,8 @@ data class CallableId(
val packageName: FqName, val packageName: FqName,
val className: FqName?, val className: FqName?,
val callableName: Name, val callableName: Name,
val pathToLocal: FqName? = null // Currently, it's only used for debug info
private val pathToLocal: FqName? = null
) { ) {
private companion object { private companion object {
val LOCAL_NAME = Name.special("<local>") val LOCAL_NAME = Name.special("<local>")
@@ -38,6 +39,7 @@ data class CallableId(
@Deprecated("TODO: Better solution for local callables?") @Deprecated("TODO: Better solution for local callables?")
constructor( constructor(
callableName: Name, callableName: Name,
// Currently, it's only used for debug info
pathToLocal: FqName? = null pathToLocal: FqName? = null
) : this( ) : this(
PACKAGE_FQ_NAME_FOR_LOCAL, PACKAGE_FQ_NAME_FOR_LOCAL,
@@ -49,8 +51,7 @@ data class CallableId(
fun asFqNameForDebugInfo(): FqName { fun asFqNameForDebugInfo(): FqName {
if (pathToLocal != null) return pathToLocal.child(callableName) if (pathToLocal != null) return pathToLocal.child(callableName)
if (className == null) return packageName.child(callableName) return classId?.asSingleFqName()?.child(callableName) ?: packageName.child(callableName)
return classId!!.asSingleFqName().child(callableName)
} }
override fun toString(): String { override fun toString(): String {