FIR IDE: use CallableId for KtCallableSymbol instead of FqName

This commit is contained in:
Ilya Kirillov
2021-03-22 17:56:29 +01:00
parent f66a155683
commit 6f887896ff
55 changed files with 309 additions and 234 deletions
@@ -18,6 +18,14 @@ data class CallableId(
val PACKAGE_FQ_NAME_FOR_LOCAL = FqName.topLevel(LOCAL_NAME)
}
/**
* Return `true` if corresponding declaration is itself local or it is a member of local class
* Otherwise, returns `false`
*/
val isLocal: Boolean
get() = packageName == PACKAGE_FQ_NAME_FOR_LOCAL
|| classId?.isLocal == true
var classId: ClassId? = null
get() {
if (field == null && className != null) {
@@ -5,7 +5,13 @@
package org.jetbrains.kotlin.serialization.deserialization
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
@JvmField
val KOTLIN_SUSPEND_BUILT_IN_FUNCTION_FQ_NAME = FqName("kotlin.suspend")
@JvmField
val KOTLIN_SUSPEND_BUILT_IN_FUNCTION_FQ_NAME_CALLABLE_ID = CallableId(StandardNames.BUILT_INS_PACKAGE_FQ_NAME, Name.identifier("suspend"))