FIR IDE: use CallableId for KtCallableSymbol instead of FqName

core/compiler.common/src/org/jetbrains/kotlin/name/CallableId.kt

@@ -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) {

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/suspendFunctionTypeUtil.kt

@@ -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"))

idea/idea-core/src/org/jetbrains/kotlin/idea/core/Utils.kt

@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.idea.resolve.getDataFlowValueFactory
 import org.jetbrains.kotlin.idea.resolve.getLanguageVersionSettings
 import org.jetbrains.kotlin.idea.util.getImplicitReceiversWithInstanceToExpression
 import org.jetbrains.kotlin.idea.util.getResolutionScope
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.parentOrNull
 import org.jetbrains.kotlin.psi.*
@@ -170,6 +171,9 @@ fun FqName.quoteSegmentsIfNeeded(): String {
 
 fun FqName.quoteIfNeeded() = FqName(quoteSegmentsIfNeeded())
 
+fun CallableId.asFqNameWithRootPrefixIfNeeded() =
+    asFqNameForDebugInfo().withRootPrefixIfNeeded()
+
 fun FqName.withRootPrefixIfNeeded(targetElement: KtElement? = null) =
     if (canAddRootPrefix() && targetElement?.canAddRootPrefix() != false)
         FqName(QualifiedExpressionResolver.ROOT_PREFIX_FOR_IDE_RESOLUTION_MODE_WITH_DOT + asString())

idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirLookupElementFactory.kt

@@ -16,7 +16,7 @@ import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.idea.core.withRootPrefixIfNeeded
+import org.jetbrains.kotlin.idea.core.asFqNameWithRootPrefixIfNeeded
 import org.jetbrains.kotlin.idea.frontend.api.HackToForceAllowRunningAnalyzeOnEDT
 import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.analyse
@@ -26,10 +26,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtNamedSymbol
 import org.jetbrains.kotlin.idea.frontend.api.types.KtFunctionalType
 import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.name.ClassId
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.name.SpecialNames
+import org.jetbrains.kotlin.name.*
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtTypeArgumentList
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
@@ -58,8 +55,8 @@ internal class KotlinFirLookupElementFactory {
 
 private sealed class CallableImportStrategy {
     object DoNothing : CallableImportStrategy()
-    data class AddImport(val nameToImport: FqName) : CallableImportStrategy()
-    data class InsertFqNameAndShorten(val fqName: FqName) : CallableImportStrategy()
+    data class AddImport(val nameToImport: CallableId) : CallableImportStrategy()
+    data class InsertFqNameAndShorten(val callableId: CallableId) : CallableImportStrategy()
 }
 
 /**
@@ -307,7 +304,7 @@ private object FunctionInsertionHandler : QuotedNamesAwareInsertionHandler() {
             context.document.replaceString(
                 context.startOffset,
                 context.tailOffset,
-                importStrategy.fqName.withRootPrefixIfNeeded().render()
+                importStrategy.callableId.asFqNameWithRootPrefixIfNeeded().render()
             )
             context.commitDocument()
 
@@ -340,7 +337,7 @@ private object VariableInsertionHandler : InsertHandler<LookupElement> {
                 context.document.replaceString(
                     context.startOffset,
                     context.tailOffset,
-                    importStrategy.fqName.withRootPrefixIfNeeded().render()
+                    importStrategy.callableId.asFqNameWithRootPrefixIfNeeded().render()
                 )
 
                 context.commitDocument()
@@ -366,22 +363,22 @@ private open class QuotedNamesAwareInsertionHandler : InsertHandler<LookupElemen
     }
 }
 
-private fun addCallableImportIfRequired(targetFile: KtFile, nameToImport: FqName) {
+private fun addCallableImportIfRequired(targetFile: KtFile, nameToImport: CallableId) {
     if (!alreadyHasImport(targetFile, nameToImport)) {
         addImportToFile(targetFile.project, targetFile, nameToImport)
     }
 }
 
-private fun alreadyHasImport(file: KtFile, nameToImport: FqName): Boolean {
-    if (file.importDirectives.any { it.importPath?.fqName == nameToImport }) return true
+private fun alreadyHasImport(file: KtFile, nameToImport: CallableId): Boolean {
+    if (file.importDirectives.any { it.importPath?.fqName == nameToImport.asFqNameForDebugInfo() }) return true
 
     withAllowedResolve {
         analyse(file) {
             val scopes = file.getScopeContextForFile().scopes
-            if (!scopes.containsName(nameToImport.shortName())) return false
+            if (!scopes.containsName(nameToImport.callableName)) return false
 
             return scopes
-                .getCallableSymbols { it == nameToImport.shortName() }
+                .getCallableSymbols { it == nameToImport.callableName }
                 .any {
                     it is KtKotlinPropertySymbol && it.callableIdIfNonLocal == nameToImport ||
                             it is KtFunctionSymbol && it.callableIdIfNonLocal == nameToImport
@@ -415,7 +412,7 @@ private fun CharSequence.indexOfSkippingSpace(c: Char, startIndex: Int): Int? {
 
 private fun shortenReferences(targetFile: KtFile, textRange: TextRange) {
     val shortenings = withAllowedResolve {
-        analyze(targetFile) {
+        analyse(targetFile) {
             collectPossibleReferenceShortenings(targetFile, textRange)
         }
     }

idea/idea-fir/src/org/jetbrains/kotlin/idea/fir/highlighter/visitors/FunctionCallHighlightingVisitor.kt

@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.serialization.deserialization.KOTLIN_SUSPEND_BUILT_IN_FUNCTION_FQ_NAME
+import org.jetbrains.kotlin.serialization.deserialization.KOTLIN_SUSPEND_BUILT_IN_FUNCTION_FQ_NAME_CALLABLE_ID
 import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingColors as Colors
 
 internal class FunctionCallHighlightingVisitor(
@@ -55,7 +56,7 @@ internal class FunctionCallHighlightingVisitor(
             is KtConstructorSymbol -> Colors.CONSTRUCTOR_CALL
             is KtAnonymousFunctionSymbol -> null
             is KtFunctionSymbol -> when {
-                function.callableIdIfNonLocal == KOTLIN_SUSPEND_BUILT_IN_FUNCTION_FQ_NAME -> Colors.KEYWORD
+                function.callableIdIfNonLocal == KOTLIN_SUSPEND_BUILT_IN_FUNCTION_FQ_NAME_CALLABLE_ID -> Colors.KEYWORD
                 function.isExtension -> Colors.EXTENSION_FUNCTION_CALL
                 function.symbolKind == KtSymbolKind.TOP_LEVEL -> Colors.PACKAGE_FUNCTION_CALL
                 else -> Colors.FUNCTION_CALL

idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/DebugSymbolRenderer.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.idea.frontend.api.symbols
 
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
 import org.jetbrains.kotlin.idea.frontend.api.types.KtType
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -39,6 +40,7 @@ object DebugSymbolRenderer {
         is Name -> value.asString()
         is FqName -> value.asString()
         is ClassId -> value.asString()
+        is CallableId -> value.toString()
         is Enum<*> -> value.name
         is List<*> -> buildString {
             append("[")

idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtCallableSymbol.kt

@@ -7,7 +7,9 @@ package org.jetbrains.kotlin.idea.frontend.api.symbols
 
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypedSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.name.CallableId
 
 abstract class KtCallableSymbol : KtSymbol, KtTypedSymbol {
+    abstract val callableIdIfNonLocal: CallableId?
     abstract override fun createPointer(): KtSymbolPointer<KtCallableSymbol>
 }

idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtFunctionLikeSymbol.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.idea.frontend.api.symbols
 
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 
@@ -18,6 +19,7 @@ abstract class KtFunctionLikeSymbol : KtCallableSymbol(), KtSymbolWithKind {
 
 abstract class KtAnonymousFunctionSymbol : KtFunctionLikeSymbol(), KtPossibleExtensionSymbol {
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.LOCAL
+    final override val callableIdIfNonLocal: CallableId? get() = null
 
     abstract override fun createPointer(): KtSymbolPointer<KtAnonymousFunctionSymbol>
 }
@@ -30,7 +32,6 @@ abstract class KtFunctionSymbol : KtFunctionLikeSymbol(),
     KtSymbolWithModality<KtCommonSymbolModality>,
     KtSymbolWithVisibility,
     KtAnnotatedSymbol {
-    abstract val callableIdIfNonLocal: FqName?
 
     abstract val isSuspend: Boolean
     abstract val isOperator: Boolean
@@ -49,6 +50,7 @@ abstract class KtConstructorSymbol : KtFunctionLikeSymbol(),
     abstract val isPrimary: Boolean
     abstract val containingClassIdIfNonLocal: ClassId?
 
+    final override val callableIdIfNonLocal: CallableId? get() = null
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER
 
     abstract override fun createPointer(): KtSymbolPointer<KtConstructorSymbol>

idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtPropertyAccessorSymbol.kt

@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.idea.frontend.api.symbols
 
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.name.CallableId
 
 sealed class KtPropertyAccessorSymbol : KtCallableSymbol(),
     KtPossibleMemberSymbol,
@@ -14,6 +15,8 @@ sealed class KtPropertyAccessorSymbol : KtCallableSymbol(),
     KtSymbolWithVisibility,
     KtAnnotatedSymbol {
 
+    final override val callableIdIfNonLocal: CallableId? get() = null
+
     abstract val isDefault: Boolean
     abstract val isInline: Boolean
     abstract val isOverride: Boolean

idea/idea-frontend-api/src/org/jetbrains/kotlin/idea/frontend/api/symbols/KtVariableLikeSymbol.kt

@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.frontend.api.symbols
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -34,6 +35,7 @@ abstract class KtBackingFieldSymbol : KtVariableLikeSymbol() {
     final override val psi: PsiElement? get() = null
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.LOCAL
     final override val origin: KtSymbolOrigin get() = KtSymbolOrigin.PROPERTY_BACKING_FIELD
+    final override val callableIdIfNonLocal: CallableId? get() = null
 
     abstract override fun createPointer(): KtSymbolPointer<KtVariableLikeSymbol>
 
@@ -63,8 +65,6 @@ abstract class KtJavaFieldSymbol :
     KtSymbolWithKind {
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER
 
-    abstract val callableIdIfNonLocal: FqName?
-
     abstract override fun createPointer(): KtSymbolPointer<KtJavaFieldSymbol>
 }
 
@@ -82,8 +82,6 @@ sealed class KtPropertySymbol : KtVariableSymbol(),
     abstract val getter: KtPropertyGetterSymbol?
     abstract val setter: KtPropertySetterSymbol?
 
-    abstract val callableIdIfNonLocal: FqName?
-
     abstract val hasBackingField: Boolean
 
     abstract val isOverride: Boolean
@@ -115,11 +113,14 @@ abstract class KtSyntheticJavaPropertySymbol : KtPropertySymbol() {
 }
 
 abstract class KtLocalVariableSymbol : KtVariableSymbol(), KtSymbolWithKind {
+    final override val callableIdIfNonLocal: CallableId? get() = null
+
     abstract override fun createPointer(): KtSymbolPointer<KtLocalVariableSymbol>
 }
 
 abstract class KtValueParameterSymbol : KtVariableLikeSymbol(), KtSymbolWithKind, KtAnnotatedSymbol {
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.LOCAL
+    final override val callableIdIfNonLocal: CallableId? get() = null
 
     abstract val hasDefaultValue: Boolean
     abstract val isVararg: Boolean

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt

@@ -86,8 +86,8 @@ internal class KtFirSymbolContainingDeclarationProvider(
                 classId.outerClassId
             }
             is KtFunctionSymbol -> {
-                val fqName = symbol.callableIdIfNonLocal ?: error("fqName should not be null for non-local declaration")
-                fqName.parent().let { ClassId.topLevel(it) }
+                val fqName = symbol.callableIdIfNonLocal ?: error("callableIdIfNonLocal should not be null for non-local declaration")
+                fqName.classId
             }
             is KtEnumEntrySymbol -> {
                 val classId = symbol.containingEnumClassIdIfNonLocal ?: error("fqName should not be null for non-local declaration")
@@ -95,7 +95,7 @@ internal class KtFirSymbolContainingDeclarationProvider(
             }
             is KtPropertySymbol -> {
                 val fqName = symbol.callableIdIfNonLocal ?: error("fqName should not be null for non-local declaration")
-                fqName.parent().let { ClassId.topLevel(it) }
+                fqName.classId
             }
             else -> error("We should not have a ${symbol::class} from a library")
         } ?: error("outerClassId should not be null for member declaration")

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirEnumEntrySymbol.kt

@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.KtEnumEntrySymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 
@@ -43,6 +44,8 @@ internal class KtFirEnumEntrySymbol(
     override val containingEnumClassIdIfNonLocal: ClassId?
         get() = firRef.withFir { it.containingClass()?.classId?.takeUnless { it.isLocal } }
 
+    override val callableIdIfNonLocal: CallableId? get() = getCallableIdIfNonLocal()
+
     override fun createPointer(): KtSymbolPointer<KtEnumEntrySymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         return firRef.withFir { fir ->

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirFunctionSymbol.kt

@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.CanNotCreateSymbo
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.types.KtType
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -78,10 +79,8 @@ internal class KtFirFunctionSymbol(
     override val isExternal: Boolean get() = firRef.withFir { it.isExternal }
     override val isInline: Boolean get() = firRef.withFir { it.isInline }
     override val isExtension: Boolean get() = firRef.withFir { it.receiverTypeRef != null }
-    override val callableIdIfNonLocal: FqName?
-        get() = firRef.withFir { fir ->
-            fir.symbol.callableId.takeUnless { fir.isLocal }?.asFqNameForDebugInfo()
-        }
+    override val callableIdIfNonLocal: CallableId? get() = getCallableIdIfNonLocal()
+
     override val symbolKind: KtSymbolKind
         get() = firRef.withFir { fir ->
             when {
@@ -108,7 +107,7 @@ internal class KtFirFunctionSymbol(
                 )
             }
             KtSymbolKind.LOCAL -> throw CanNotCreateSymbolPointerForLocalLibraryDeclarationException(
-                callableIdIfNonLocal?.asString() ?: name.asString()
+                callableIdIfNonLocal?.toString() ?: name.asString()
             )
         }
     }

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirJavaFieldSymbol.kt

@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.KtJavaFieldSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtTypeAndAnnotations
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
@@ -40,10 +41,7 @@ internal class KtFirJavaFieldSymbol(
     override val isVal: Boolean get() = firRef.withFir { it.isVal }
     override val name: Name get() = firRef.withFir { it.name }
 
-    override val callableIdIfNonLocal: FqName?
-        get() = firRef.withFir { fir ->
-            fir.symbol.callableId.asFqNameForDebugInfo() // todo check if local
-        }
+    override val callableIdIfNonLocal: CallableId? get() = getCallableIdIfNonLocal()
 
     override val modality: KtCommonSymbolModality get() = getModality()
 

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirKotlinPropertySymbol.kt

@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtPsiBasedSymbolP
 import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.idea.frontend.api.types.KtType
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
@@ -83,10 +84,8 @@ internal class KtFirKotlinPropertySymbol(
     override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId)
     override val annotationClassIds: Collection<ClassId> by cached { firRef.getAnnotationClassIds() }
 
-    override val callableIdIfNonLocal: FqName?
-        get() = firRef.withFir { fir ->
-            fir.symbol.callableId.takeUnless { fir.isLocal }?.asFqNameForDebugInfo()
-        }
+    override val callableIdIfNonLocal: CallableId? get() = getCallableIdIfNonLocal()
+
 
     override val getter: KtPropertyGetterSymbol? by firRef.withFirAndCache(FirResolvePhase.RAW_FIR) { property ->
         property.getter?.let { builder.callableBuilder.buildPropertyAccessorSymbol(it) } as? KtPropertyGetterSymbol

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSymbol.kt

@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.utils.FirRefWithValidityCheck
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
 import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbolOrigin
 
-internal interface KtFirSymbol<F : FirDeclaration> : KtSymbol, ValidityTokenOwner {
+internal interface KtFirSymbol<out F : FirDeclaration> : KtSymbol, ValidityTokenOwner {
     val firRef: FirRefWithValidityCheck<F>
 
     override val origin: KtSymbolOrigin get() = firRef.withFir { it.ktSymbolOrigin() }

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirSyntheticJavaPropertySymbol.kt

@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.pointers.KtSymbolPointer
 import org.jetbrains.kotlin.idea.frontend.api.withValidityAssertion
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.idea.frontend.api.types.KtType
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 
@@ -66,10 +67,8 @@ internal class KtFirSyntheticJavaPropertySymbol(
     override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId)
     override val annotationClassIds: Collection<ClassId> by cached { firRef.getAnnotationClassIds() }
 
-    override val callableIdIfNonLocal: FqName?
-        get() = firRef.withFir { fir ->
-            fir.symbol.callableId.takeUnless { fir.isLocal }?.asFqNameForDebugInfo()
-        }
+    override val callableIdIfNonLocal: CallableId? get() = getCallableIdIfNonLocal()
+
 
     override val getter: KtPropertyGetterSymbol by firRef.withFirAndCache(FirResolvePhase.RAW_FIR) { property ->
         property.getter.let { builder.callableBuilder.buildPropertyAccessorSymbol(it) } as KtPropertyGetterSymbol

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/firSymbolUtils.kt

@@ -8,18 +8,17 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.FirSession
-import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration
-import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
-import org.jetbrains.kotlin.fir.declarations.modality
-import org.jetbrains.kotlin.fir.declarations.visibility
+import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
 import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
 import org.jetbrains.kotlin.fir.types.ConeClassLikeType
 import org.jetbrains.kotlin.fir.types.coneType
+import org.jetbrains.kotlin.idea.frontend.api.fir.utils.FirRefWithValidityCheck
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtCommonSymbolModality
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolModality
 import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.name.CallableId
 
 internal inline fun <reified M : KtSymbolModality> Modality?.getSymbolModality(): M = when (this) {
     Modality.FINAL -> KtCommonSymbolModality.FINAL
@@ -36,6 +35,8 @@ internal inline fun <F : FirMemberDeclaration, reified M : KtSymbolModality> KtF
 internal fun <F : FirMemberDeclaration> KtFirSymbol<F>.getVisibility(): Visibility =
     firRef.withFir(FirResolvePhase.STATUS) { fir -> fir.visibility }
 
+internal fun KtFirSymbol<FirCallableDeclaration<*>>.getCallableIdIfNonLocal(): CallableId? =
+    firRef.withFir { fir -> fir.symbol.callableId.takeUnless { it.isLocal } }
 
 internal fun ConeClassLikeType.expandTypeAliasIfNeeded(session: FirSession): ConeClassLikeType {
     val firTypeAlias = lookupTag.toSymbol(session) as? FirTypeAliasSymbol ?: return this

idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/shortenReferencesUtils.kt

@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.idea.frontend.api.fir.utils
 
 import com.intellij.openapi.project.Project
+import org.jetbrains.kotlin.name.CallableId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtCodeFragment
@@ -16,6 +17,16 @@ import org.jetbrains.kotlin.resolve.ImportPath
 
 private val SimpleImportPathComparator: Comparator<ImportPath> = compareBy(ImportPath::toString)
 
+fun addImportToFile(
+    project: Project,
+    file: KtFile,
+    callableId: CallableId,
+    allUnder: Boolean = false,
+    alias: Name? = null
+) {
+    addImportToFile(project, file, callableId.asFqNameForDebugInfo(), allUnder, alias)
+}
+
 /**
  * This is a partial copy from `org.jetbrains.kotlin.idea.util.ImportInsertHelperImpl.Companion.addImport`.
  *

idea/idea-frontend-fir/testData/analysisSession/resolveCall/functionCallInTheSameFile.kt

@@ -4,4 +4,4 @@ fun call() {
     <selection>function(1)</selection>
 }
 
-// CALL: KtFunctionCall: targetFunction = function(a: kotlin.Int): kotlin.Unit
+// CALL: KtFunctionCall: targetFunction = /function(a: kotlin.Int): kotlin.Unit

idea/idea-frontend-fir/testData/analysisSession/resolveCall/functionWithReceiverCall.kt

@@ -4,4 +4,4 @@ fun call() {
    "str".<selection>function(1)</selection>
 }
 
-// CALL: KtFunctionCall: targetFunction = function(<receiver>: kotlin.String, a: kotlin.Int): kotlin.Unit
+// CALL: KtFunctionCall: targetFunction = /function(<receiver>: kotlin.String, a: kotlin.Int): kotlin.Unit

idea/idea-frontend-fir/testData/analysisSession/resolveCall/functionWithReceiverSafeCall.kt

@@ -4,4 +4,4 @@ fun call() {
     "str"?.<selection>function(1)</selection>
 }
 
-// CALL: KtFunctionCall: targetFunction = function(<receiver>: kotlin.String, a: kotlin.Int): kotlin.Unit
+// CALL: KtFunctionCall: targetFunction = /function(<receiver>: kotlin.String, a: kotlin.Int): kotlin.Unit

idea/idea-frontend-fir/testData/analysisSession/resolveCall/javaFunctionCall.kt

@@ -3,4 +3,4 @@ fun call() {
     javaClass.<selection>javaMethod()</selection>
 }
 
-// CALL: KtFunctionCall: targetFunction = JavaClass.javaMethod(): kotlin.Unit
+// CALL: KtFunctionCall: targetFunction = /JavaClass.javaMethod(): kotlin.Unit

idea/idea-frontend-fir/testData/analysisSession/resolveCall/resolveCallInSuperConstructorParam.kt

@@ -4,4 +4,4 @@ open class A<T>(x: T)
 
 class B : A(<selection>1 to 2</selection>)
 
-// CALL: KtFunctionCall: targetFunction = to(<receiver>: A, other: B): A
+// CALL: KtFunctionCall: targetFunction = /to(<receiver>: A, other: B): A

idea/idea-frontend-fir/testData/analysisSession/resolveCall/simpleCallWithNonMatchingArgs.kt

@@ -4,4 +4,4 @@ fun x() {
 
 fun foo(){}
 
-// CALL: KtFunctionCall: targetFunction = ERR<Inapplicable candidate(s): /foo, [foo(): kotlin.Unit]>
+// CALL: KtFunctionCall: targetFunction = ERR<Inapplicable candidate(s): /foo, [/foo(): kotlin.Unit]>

idea/idea-frontend-fir/testData/analysisSession/resolveCall/variableAsFunctionLikeCall.kt

@@ -4,4 +4,4 @@ fun call(x: kotlin.int) {
     <selection>x()</selection>
 }
 
-// CALL: KtFunctionCall: targetFunction = invoke(<receiver>: kotlin.Int): kotlin.String
+// CALL: KtFunctionCall: targetFunction = /invoke(<receiver>: kotlin.Int): kotlin.String

idea/idea-frontend-fir/testData/components/overridenDeclarations/javaAccessors.kt

@@ -19,8 +19,8 @@ abstract class C {
 
 // RESULT
 // ALL:
-// B.x: Int
+// /B.x: Int
 // C.x: Int
 
 // DIRECT:
-// B.x: Int
+// /B.x: Int

idea/idea-frontend-fir/testData/fileScopeTest/simpleFileScope.kt.result

@@ -12,7 +12,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: test
+  callableIdIfNonLocal: /test
   dispatchType: null
   isExtension: false
   isExternal: false
@@ -33,7 +33,7 @@ KtFirKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: testVal
+  callableIdIfNonLocal: /testVal
   dispatchType: null
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true

idea/idea-frontend-fir/testData/memberScopeByFqName/Int.kt

@@ -9,7 +9,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.and
+  callableIdIfNonLocal: kotlin/Int.and
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -30,7 +30,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin/Int.compareTo
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -51,7 +51,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin/Int.compareTo
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -72,7 +72,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin/Int.compareTo
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -93,7 +93,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin/Int.compareTo
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -114,7 +114,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin/Int.compareTo
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -135,7 +135,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin/Int.compareTo
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -156,7 +156,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.dec
+  callableIdIfNonLocal: kotlin/Int.dec
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -177,7 +177,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.div
+  callableIdIfNonLocal: kotlin/Int.div
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -198,7 +198,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Double
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.div
+  callableIdIfNonLocal: kotlin/Int.div
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -219,7 +219,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Float
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.div
+  callableIdIfNonLocal: kotlin/Int.div
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -240,7 +240,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.div
+  callableIdIfNonLocal: kotlin/Int.div
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -261,7 +261,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Long
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.div
+  callableIdIfNonLocal: kotlin/Int.div
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -282,7 +282,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.div
+  callableIdIfNonLocal: kotlin/Int.div
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -303,7 +303,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.inc
+  callableIdIfNonLocal: kotlin/Int.inc
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -324,7 +324,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.inv
+  callableIdIfNonLocal: kotlin/Int.inv
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -345,7 +345,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin/Int.minus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -366,7 +366,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Double
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin/Int.minus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -387,7 +387,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Float
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin/Int.minus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -408,7 +408,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin/Int.minus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -429,7 +429,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Long
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin/Int.minus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -450,7 +450,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin/Int.minus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -471,7 +471,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.or
+  callableIdIfNonLocal: kotlin/Int.or
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -492,7 +492,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin/Int.plus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -513,7 +513,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Double
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin/Int.plus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -534,7 +534,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Float
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin/Int.plus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -555,7 +555,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin/Int.plus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -576,7 +576,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Long
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin/Int.plus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -597,7 +597,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin/Int.plus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -618,7 +618,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/ranges/IntRange
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.rangeTo
+  callableIdIfNonLocal: kotlin/Int.rangeTo
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -639,7 +639,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/ranges/IntRange
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.rangeTo
+  callableIdIfNonLocal: kotlin/Int.rangeTo
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -660,7 +660,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/ranges/LongRange
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.rangeTo
+  callableIdIfNonLocal: kotlin/Int.rangeTo
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -681,7 +681,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/ranges/IntRange
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.rangeTo
+  callableIdIfNonLocal: kotlin/Int.rangeTo
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -702,7 +702,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: [kotlin/SinceKotlin]
   annotations: [kotlin/SinceKotlin(version = 1.1)]
-  callableIdIfNonLocal: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin/Int.rem
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -723,7 +723,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Double
   annotationClassIds: [kotlin/SinceKotlin]
   annotations: [kotlin/SinceKotlin(version = 1.1)]
-  callableIdIfNonLocal: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin/Int.rem
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -744,7 +744,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Float
   annotationClassIds: [kotlin/SinceKotlin]
   annotations: [kotlin/SinceKotlin(version = 1.1)]
-  callableIdIfNonLocal: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin/Int.rem
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -765,7 +765,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: [kotlin/SinceKotlin]
   annotations: [kotlin/SinceKotlin(version = 1.1)]
-  callableIdIfNonLocal: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin/Int.rem
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -786,7 +786,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Long
   annotationClassIds: [kotlin/SinceKotlin]
   annotations: [kotlin/SinceKotlin(version = 1.1)]
-  callableIdIfNonLocal: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin/Int.rem
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -807,7 +807,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: [kotlin/SinceKotlin]
   annotations: [kotlin/SinceKotlin(version = 1.1)]
-  callableIdIfNonLocal: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin/Int.rem
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -828,7 +828,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.shl
+  callableIdIfNonLocal: kotlin/Int.shl
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -849,7 +849,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.shr
+  callableIdIfNonLocal: kotlin/Int.shr
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -870,7 +870,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.times
+  callableIdIfNonLocal: kotlin/Int.times
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -891,7 +891,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Double
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.times
+  callableIdIfNonLocal: kotlin/Int.times
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -912,7 +912,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Float
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.times
+  callableIdIfNonLocal: kotlin/Int.times
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -933,7 +933,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.times
+  callableIdIfNonLocal: kotlin/Int.times
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -954,7 +954,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Long
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.times
+  callableIdIfNonLocal: kotlin/Int.times
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -975,7 +975,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.times
+  callableIdIfNonLocal: kotlin/Int.times
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -996,7 +996,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Byte
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.toByte
+  callableIdIfNonLocal: kotlin/Int.toByte
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -1017,7 +1017,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Char
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.toChar
+  callableIdIfNonLocal: kotlin/Int.toChar
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -1038,7 +1038,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Double
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.toDouble
+  callableIdIfNonLocal: kotlin/Int.toDouble
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -1059,7 +1059,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Float
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.toFloat
+  callableIdIfNonLocal: kotlin/Int.toFloat
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -1080,7 +1080,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.toInt
+  callableIdIfNonLocal: kotlin/Int.toInt
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -1101,7 +1101,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Long
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.toLong
+  callableIdIfNonLocal: kotlin/Int.toLong
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -1122,7 +1122,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Short
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.toShort
+  callableIdIfNonLocal: kotlin/Int.toShort
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -1143,7 +1143,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.unaryMinus
+  callableIdIfNonLocal: kotlin/Int.unaryMinus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -1164,7 +1164,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.unaryPlus
+  callableIdIfNonLocal: kotlin/Int.unaryPlus
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -1185,7 +1185,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.ushr
+  callableIdIfNonLocal: kotlin/Int.ushr
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -1206,7 +1206,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Int.xor
+  callableIdIfNonLocal: kotlin/Int.xor
   dispatchType: kotlin/Int
   isExtension: false
   isExternal: false
@@ -1227,7 +1227,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Any.equals
+  callableIdIfNonLocal: kotlin/Any.equals
   dispatchType: kotlin/Any
   isExtension: false
   isExternal: false
@@ -1248,7 +1248,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Any.hashCode
+  callableIdIfNonLocal: kotlin/Any.hashCode
   dispatchType: kotlin/Any
   isExtension: false
   isExternal: false
@@ -1269,7 +1269,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Any.toString
+  callableIdIfNonLocal: kotlin/Any.toString
   dispatchType: kotlin/Any
   isExtension: false
   isExternal: false
@@ -1309,6 +1309,7 @@ KtFirConstructorSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: kotlin/Int
   dispatchType: null
   isPrimary: true

idea/idea-frontend-fir/testData/memberScopeByFqName/MutableList.kt

@@ -6,7 +6,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.add
+  callableIdIfNonLocal: kotlin/collections/MutableList.add
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -27,7 +27,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.add
+  callableIdIfNonLocal: kotlin/collections/MutableList.add
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -48,7 +48,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.addAll
+  callableIdIfNonLocal: kotlin/collections/MutableList.addAll
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -69,7 +69,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.addAll
+  callableIdIfNonLocal: kotlin/collections/MutableList.addAll
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -90,7 +90,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.clear
+  callableIdIfNonLocal: kotlin/collections/MutableList.clear
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -111,7 +111,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/collections/MutableListIterator<E>
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.listIterator
+  callableIdIfNonLocal: kotlin/collections/MutableList.listIterator
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -132,7 +132,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/collections/MutableListIterator<E>
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.listIterator
+  callableIdIfNonLocal: kotlin/collections/MutableList.listIterator
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -153,7 +153,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.remove
+  callableIdIfNonLocal: kotlin/collections/MutableList.remove
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -174,7 +174,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.removeAll
+  callableIdIfNonLocal: kotlin/collections/MutableList.removeAll
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -195,7 +195,7 @@ KtFirFunctionSymbol:
   annotatedType: [] E
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.removeAt
+  callableIdIfNonLocal: kotlin/collections/MutableList.removeAt
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -216,7 +216,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.retainAll
+  callableIdIfNonLocal: kotlin/collections/MutableList.retainAll
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -237,7 +237,7 @@ KtFirFunctionSymbol:
   annotatedType: [] E
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.set
+  callableIdIfNonLocal: kotlin/collections/MutableList.set
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -258,7 +258,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/collections/MutableList<E>
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.subList
+  callableIdIfNonLocal: kotlin/collections/MutableList.subList
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -279,7 +279,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.contains
+  callableIdIfNonLocal: kotlin/collections/MutableList.contains
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -300,7 +300,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.containsAll
+  callableIdIfNonLocal: kotlin/collections/MutableList.containsAll
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -321,7 +321,7 @@ KtFirFunctionSymbol:
   annotatedType: [] E
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.get
+  callableIdIfNonLocal: kotlin/collections/MutableList.get
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -342,7 +342,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.indexOf
+  callableIdIfNonLocal: kotlin/collections/MutableList.indexOf
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -363,7 +363,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.isEmpty
+  callableIdIfNonLocal: kotlin/collections/MutableList.isEmpty
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -384,7 +384,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/collections/MutableIterator<E>
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.iterator
+  callableIdIfNonLocal: kotlin/collections/MutableList.iterator
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -405,7 +405,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.MutableList.lastIndexOf
+  callableIdIfNonLocal: kotlin/collections/MutableList.lastIndexOf
   dispatchType: kotlin/collections/MutableList<E>
   isExtension: false
   isExternal: false
@@ -426,7 +426,7 @@ KtFirKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.List.size
+  callableIdIfNonLocal: kotlin/collections/List.size
   dispatchType: kotlin/collections/MutableList<E>
   getter: null
   hasBackingField: false
@@ -450,7 +450,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Any.equals
+  callableIdIfNonLocal: kotlin/Any.equals
   dispatchType: kotlin/Any
   isExtension: false
   isExternal: false
@@ -471,7 +471,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Any.hashCode
+  callableIdIfNonLocal: kotlin/Any.hashCode
   dispatchType: kotlin/Any
   isExtension: false
   isExternal: false
@@ -492,7 +492,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Any.toString
+  callableIdIfNonLocal: kotlin/Any.toString
   dispatchType: kotlin/Any
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/memberScopeByFqName/java.lang.String.kt

@@ -6,7 +6,7 @@
 /*
 KtFirJavaFieldSymbol:
   annotatedType: [] ft<kotlin/CharArray, kotlin/CharArray?>
-  callableIdIfNonLocal: java.lang.String.value
+  callableIdIfNonLocal: java/lang/String.value
   isVal: true
   modality: FINAL
   name: value
@@ -16,7 +16,7 @@ KtFirJavaFieldSymbol:
 
 KtFirJavaFieldSymbol:
   annotatedType: [] kotlin/Int
-  callableIdIfNonLocal: java.lang.String.hash
+  callableIdIfNonLocal: java/lang/String.hash
   isVal: false
   modality: OPEN
   name: hash
@@ -28,7 +28,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.hash32
+  callableIdIfNonLocal: java/lang/String.hash32
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -47,7 +47,7 @@ KtFirFunctionSymbol:
 
 KtFirJavaFieldSymbol:
   annotatedType: [] kotlin/Int
-  callableIdIfNonLocal: java.lang.String.hash32
+  callableIdIfNonLocal: java/lang/String.hash32
   isVal: false
   modality: OPEN
   name: hash32
@@ -59,7 +59,7 @@ KtFirSyntheticJavaPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.length
+  callableIdIfNonLocal: java/lang/String.length
   dispatchType: java/lang/String
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -83,7 +83,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.isEmpty
+  callableIdIfNonLocal: java/lang/String.isEmpty
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -104,7 +104,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Char
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.charAt
+  callableIdIfNonLocal: java/lang/String.charAt
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -125,7 +125,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.codePointAt
+  callableIdIfNonLocal: java/lang/String.codePointAt
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -146,7 +146,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.codePointBefore
+  callableIdIfNonLocal: java/lang/String.codePointBefore
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -167,7 +167,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.codePointCount
+  callableIdIfNonLocal: java/lang/String.codePointCount
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -188,7 +188,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.offsetByCodePoints
+  callableIdIfNonLocal: java/lang/String.offsetByCodePoints
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -209,7 +209,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.getChars
+  callableIdIfNonLocal: java/lang/String.getChars
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -230,7 +230,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.getChars
+  callableIdIfNonLocal: java/lang/String.getChars
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -251,7 +251,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: [kotlin/Deprecated]
   annotations: [kotlin/Deprecated(message = Deprecated in Java)]
-  callableIdIfNonLocal: java.lang.String.getBytes
+  callableIdIfNonLocal: java/lang/String.getBytes
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -272,7 +272,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/ByteArray
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.getBytes
+  callableIdIfNonLocal: java/lang/String.getBytes
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -293,7 +293,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/ByteArray
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.getBytes
+  callableIdIfNonLocal: java/lang/String.getBytes
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -314,7 +314,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/ByteArray
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.getBytes
+  callableIdIfNonLocal: java/lang/String.getBytes
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -335,7 +335,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.equals
+  callableIdIfNonLocal: java/lang/String.equals
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -356,7 +356,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.contentEquals
+  callableIdIfNonLocal: java/lang/String.contentEquals
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -377,7 +377,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.contentEquals
+  callableIdIfNonLocal: java/lang/String.contentEquals
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -398,7 +398,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.equalsIgnoreCase
+  callableIdIfNonLocal: java/lang/String.equalsIgnoreCase
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -419,7 +419,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.compareTo
+  callableIdIfNonLocal: java/lang/String.compareTo
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -440,7 +440,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.compareToIgnoreCase
+  callableIdIfNonLocal: java/lang/String.compareToIgnoreCase
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -461,7 +461,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.regionMatches
+  callableIdIfNonLocal: java/lang/String.regionMatches
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -482,7 +482,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.regionMatches
+  callableIdIfNonLocal: java/lang/String.regionMatches
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -503,7 +503,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.startsWith
+  callableIdIfNonLocal: java/lang/String.startsWith
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -524,7 +524,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.startsWith
+  callableIdIfNonLocal: java/lang/String.startsWith
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -545,7 +545,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.endsWith
+  callableIdIfNonLocal: java/lang/String.endsWith
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -566,7 +566,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.hashCode
+  callableIdIfNonLocal: java/lang/String.hashCode
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -587,7 +587,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.indexOf
+  callableIdIfNonLocal: java/lang/String.indexOf
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -608,7 +608,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.indexOf
+  callableIdIfNonLocal: java/lang/String.indexOf
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -629,7 +629,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.indexOf
+  callableIdIfNonLocal: java/lang/String.indexOf
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -650,7 +650,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.indexOf
+  callableIdIfNonLocal: java/lang/String.indexOf
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -671,7 +671,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.indexOfSupplementary
+  callableIdIfNonLocal: java/lang/String.indexOfSupplementary
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -692,7 +692,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.lastIndexOf
+  callableIdIfNonLocal: java/lang/String.lastIndexOf
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -713,7 +713,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.lastIndexOf
+  callableIdIfNonLocal: java/lang/String.lastIndexOf
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -734,7 +734,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.lastIndexOf
+  callableIdIfNonLocal: java/lang/String.lastIndexOf
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -755,7 +755,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.lastIndexOf
+  callableIdIfNonLocal: java/lang/String.lastIndexOf
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -776,7 +776,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.lastIndexOfSupplementary
+  callableIdIfNonLocal: java/lang/String.lastIndexOfSupplementary
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -797,7 +797,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.substring
+  callableIdIfNonLocal: java/lang/String.substring
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -818,7 +818,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.substring
+  callableIdIfNonLocal: java/lang/String.substring
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -839,7 +839,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/CharSequence
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.subSequence
+  callableIdIfNonLocal: java/lang/String.subSequence
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -860,7 +860,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.concat
+  callableIdIfNonLocal: java/lang/String.concat
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -881,7 +881,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.replace
+  callableIdIfNonLocal: java/lang/String.replace
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -902,7 +902,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.replace
+  callableIdIfNonLocal: java/lang/String.replace
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -923,7 +923,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.matches
+  callableIdIfNonLocal: java/lang/String.matches
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -944,7 +944,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.contains
+  callableIdIfNonLocal: java/lang/String.contains
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -965,7 +965,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.replaceFirst
+  callableIdIfNonLocal: java/lang/String.replaceFirst
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -986,7 +986,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.replaceAll
+  callableIdIfNonLocal: java/lang/String.replaceAll
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -1007,7 +1007,7 @@ KtFirFunctionSymbol:
   annotatedType: [] ft<@EnhancedNullability kotlin/Array<ft<kotlin/String, kotlin/String?>>, @EnhancedNullability kotlin/Array<out ft<kotlin/String, kotlin/String?>>>
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.split
+  callableIdIfNonLocal: java/lang/String.split
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -1028,7 +1028,7 @@ KtFirFunctionSymbol:
   annotatedType: [] ft<@EnhancedNullability kotlin/Array<ft<kotlin/String, kotlin/String?>>, @EnhancedNullability kotlin/Array<out ft<kotlin/String, kotlin/String?>>>
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.split
+  callableIdIfNonLocal: java/lang/String.split
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -1049,7 +1049,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.toLowerCase
+  callableIdIfNonLocal: java/lang/String.toLowerCase
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -1070,7 +1070,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.toLowerCase
+  callableIdIfNonLocal: java/lang/String.toLowerCase
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -1091,7 +1091,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.toUpperCase
+  callableIdIfNonLocal: java/lang/String.toUpperCase
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -1112,7 +1112,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.toUpperCase
+  callableIdIfNonLocal: java/lang/String.toUpperCase
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -1133,7 +1133,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.trim
+  callableIdIfNonLocal: java/lang/String.trim
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -1154,7 +1154,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: java.lang.String.toString
+  callableIdIfNonLocal: java/lang/String.toString
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -1175,7 +1175,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/CharArray
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.toCharArray
+  callableIdIfNonLocal: java/lang/String.toCharArray
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -1196,7 +1196,7 @@ KtFirFunctionSymbol:
   annotatedType: [] @EnhancedNullability kotlin/String
   annotationClassIds: [org/jetbrains/annotations/NotNull]
   annotations: [org/jetbrains/annotations/NotNull()]
-  callableIdIfNonLocal: java.lang.String.intern
+  callableIdIfNonLocal: java/lang/String.intern
   dispatchType: java/lang/String
   isExtension: false
   isExternal: false
@@ -1217,7 +1217,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Char
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.CharSequence.get
+  callableIdIfNonLocal: kotlin/CharSequence.get
   dispatchType: kotlin/CharSequence
   isExtension: false
   isExternal: false
@@ -1257,6 +1257,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1270,6 +1271,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1283,6 +1285,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1296,6 +1299,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1309,6 +1313,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1322,6 +1327,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: [kotlin/Deprecated]
   annotations: [kotlin/Deprecated(message = Deprecated in Java)]
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1335,6 +1341,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: [kotlin/Deprecated]
   annotations: [kotlin/Deprecated(message = Deprecated in Java)]
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1348,6 +1355,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1361,6 +1369,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1374,6 +1383,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1387,6 +1397,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1400,6 +1411,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1413,6 +1425,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1426,6 +1439,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1439,6 +1453,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1452,6 +1467,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false
@@ -1465,6 +1481,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/lang/String
   annotationClassIds: [kotlin/Deprecated]
   annotations: [kotlin/Deprecated(message = Deprecated in Java)]
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/lang/String
   dispatchType: null
   isPrimary: false

idea/idea-frontend-fir/testData/memberScopeByFqName/kotlin.Function2.kt

@@ -8,7 +8,7 @@ KtFirFunctionSymbol:
   annotatedType: [] R
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Function2.invoke
+  callableIdIfNonLocal: kotlin/Function2.invoke
   dispatchType: kotlin/Function2<P1, P2, R>
   isExtension: false
   isExternal: false
@@ -29,7 +29,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Boolean
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Any.equals
+  callableIdIfNonLocal: kotlin/Any.equals
   dispatchType: kotlin/Any
   isExtension: false
   isExternal: false
@@ -50,7 +50,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Any.hashCode
+  callableIdIfNonLocal: kotlin/Any.hashCode
   dispatchType: kotlin/Any
   isExtension: false
   isExternal: false
@@ -71,7 +71,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.Any.toString
+  callableIdIfNonLocal: kotlin/Any.toString
   dispatchType: kotlin/Any
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByFqName/enumEntry.kt

@@ -6,6 +6,7 @@
 /*
 KtFirEnumEntrySymbol:
   annotatedType: [] kotlin/LazyThreadSafetyMode
+  callableIdIfNonLocal: kotlin/LazyThreadSafetyMode.SYNCHRONIZED
   containingEnumClassIdIfNonLocal: kotlin/LazyThreadSafetyMode
   name: SYNCHRONIZED
   origin: LIBRARY

idea/idea-frontend-fir/testData/symbols/symbolByFqName/fileWalkDirectionEnum.kt

@@ -8,7 +8,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/collections/List<T>
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.listOf
+  callableIdIfNonLocal: kotlin/collections/listOf
   dispatchType: null
   isExtension: false
   isExternal: false
@@ -29,7 +29,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/collections/List<T>
   annotationClassIds: [kotlin/internal/InlineOnly]
   annotations: [kotlin/internal/InlineOnly()]
-  callableIdIfNonLocal: kotlin.collections.listOf
+  callableIdIfNonLocal: kotlin/collections/listOf
   dispatchType: null
   isExtension: false
   isExternal: false
@@ -50,7 +50,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/collections/List<T>
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.listOf
+  callableIdIfNonLocal: kotlin/collections/listOf
   dispatchType: null
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunction.kt

@@ -6,7 +6,7 @@ KtFirFunctionSymbol:
   annotatedType: [] E
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.List.get
+  callableIdIfNonLocal: kotlin/collections/List.get
   dispatchType: kotlin/collections/List<E>
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByFqName/memberFunctionWithOverloads.kt

@@ -6,7 +6,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/collections/ListIterator<E>
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.List.listIterator
+  callableIdIfNonLocal: kotlin/collections/List.listIterator
   dispatchType: kotlin/collections/List<E>
   isExtension: false
   isExternal: false
@@ -27,7 +27,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/collections/ListIterator<E>
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: kotlin.collections.List.listIterator
+  callableIdIfNonLocal: kotlin/collections/List.listIterator
   dispatchType: kotlin/collections/List<E>
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/annotations.kt

@@ -14,6 +14,7 @@ KtFirValueParameterSymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   hasDefaultValue: false
   isVararg: false
   name: param1
@@ -24,6 +25,7 @@ KtFirValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   hasDefaultValue: false
   isVararg: false
   name: param2
@@ -34,6 +36,7 @@ KtFirConstructorSymbol:
   annotatedType: [] Anno
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: Anno
   dispatchType: null
   isPrimary: true
@@ -66,7 +69,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: [Anno]
   annotations: [Anno(param1 = funparam, param2 = 3)]
-  callableIdIfNonLocal: X.x
+  callableIdIfNonLocal: /X.x
   dispatchType: X
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/anonymousObject.kt

@@ -13,7 +13,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: <anonymous>.run
+  callableIdIfNonLocal: null
   dispatchType: <anonymous>
   isExtension: false
   isExternal: false
@@ -34,7 +34,7 @@ KtFirKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: <anonymous>.data
+  callableIdIfNonLocal: null
   dispatchType: <anonymous>
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -68,7 +68,7 @@ KtFirKotlinPropertySymbol:
   annotatedType: [] java/lang/Runnable
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: AnonymousContainer.anonymousObject
+  callableIdIfNonLocal: /AnonymousContainer.anonymousObject
   dispatchType: AnonymousContainer
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true

idea/idea-frontend-fir/testData/symbols/symbolByPsi/classMembes.kt

@@ -9,7 +9,7 @@ KtFirKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: A.a
+  callableIdIfNonLocal: /A.a
   dispatchType: A
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -33,7 +33,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: A.x
+  callableIdIfNonLocal: /A.x
   dispatchType: A
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/classPrimaryConstructor.kt

@@ -7,6 +7,7 @@ KtFirConstructorSymbol:
   annotatedType: [] A
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
   dispatchType: null
   isPrimary: true

idea/idea-frontend-fir/testData/symbols/symbolByPsi/classSecondaryConstructors.kt

@@ -9,6 +9,7 @@ KtFirConstructorSymbol:
   annotatedType: [] A
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
   dispatchType: null
   isPrimary: true
@@ -22,6 +23,7 @@ KtFirValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   hasDefaultValue: false
   isVararg: false
   name: x
@@ -32,6 +34,7 @@ KtFirConstructorSymbol:
   annotatedType: [] A
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
   dispatchType: null
   isPrimary: false
@@ -45,6 +48,7 @@ KtFirValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   hasDefaultValue: false
   isVararg: false
   name: y
@@ -55,6 +59,7 @@ KtFirValueParameterSymbol:
   annotatedType: [] kotlin/String
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   hasDefaultValue: false
   isVararg: false
   name: z
@@ -65,6 +70,7 @@ KtFirConstructorSymbol:
   annotatedType: [] A
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: A
   dispatchType: null
   isPrimary: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/enum.kt

@@ -6,6 +6,7 @@ enum class X {
 /*
 KtFirEnumEntrySymbol:
   annotatedType: [] X
+  callableIdIfNonLocal: /X.Y
   containingEnumClassIdIfNonLocal: X
   name: Y
   origin: SOURCE
@@ -13,6 +14,7 @@ KtFirEnumEntrySymbol:
 
 KtFirEnumEntrySymbol:
   annotatedType: [] X
+  callableIdIfNonLocal: /X.Z
   containingEnumClassIdIfNonLocal: X
   name: Z
   origin: SOURCE

idea/idea-frontend-fir/testData/symbols/symbolByPsi/extensionFunction.kt

@@ -6,7 +6,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: foo
+  callableIdIfNonLocal: /foo
   dispatchType: null
   isExtension: true
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/function.kt

@@ -6,6 +6,7 @@ KtFirValueParameterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   hasDefaultValue: false
   isVararg: false
   name: x
@@ -16,7 +17,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: foo
+  callableIdIfNonLocal: /foo
   dispatchType: null
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/functionWithTypeParams.kt

@@ -13,6 +13,7 @@ KtFirValueParameterSymbol:
   annotatedType: [] X
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   hasDefaultValue: false
   isVararg: false
   name: x
@@ -23,7 +24,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: foo
+  callableIdIfNonLocal: /foo
   dispatchType: null
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/implicitReturn.kt

@@ -6,7 +6,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: foo
+  callableIdIfNonLocal: /foo
   dispatchType: null
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/localDeclarations.kt

@@ -9,6 +9,7 @@ fun yyy() {
 /*
 KtFirLocalVariableSymbol:
   annotatedType: [] kotlin/Int
+  callableIdIfNonLocal: null
   isVal: true
   name: q
   origin: SOURCE
@@ -58,7 +59,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: yyy
+  callableIdIfNonLocal: /yyy
   dispatchType: null
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberFunctions.kt

@@ -9,7 +9,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: A.x
+  callableIdIfNonLocal: /A.x
   dispatchType: A
   isExtension: false
   isExternal: false
@@ -30,7 +30,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: A.y
+  callableIdIfNonLocal: /A.y
   dispatchType: A
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/memberProperties.kt

@@ -9,7 +9,7 @@ KtFirKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: A.x
+  callableIdIfNonLocal: /A.x
   dispatchType: A
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -33,6 +33,7 @@ KtFirPropertyGetterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   dispatchType: null
   hasBody: true
   isDefault: false
@@ -47,7 +48,7 @@ KtFirKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: A.y
+  callableIdIfNonLocal: /A.y
   dispatchType: A
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelFunctions.kt

@@ -7,7 +7,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: x
+  callableIdIfNonLocal: /x
   dispatchType: null
   isExtension: false
   isExternal: false
@@ -28,7 +28,7 @@ KtFirFunctionSymbol:
   annotatedType: [] kotlin/Unit
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: y
+  callableIdIfNonLocal: /y
   dispatchType: null
   isExtension: false
   isExternal: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/topLevelProperties.kt

@@ -7,7 +7,7 @@ KtFirKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: x
+  callableIdIfNonLocal: /x
   dispatchType: null
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true
@@ -31,6 +31,7 @@ KtFirPropertyGetterSymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   dispatchType: null
   hasBody: true
   isDefault: false
@@ -45,7 +46,7 @@ KtFirKotlinPropertySymbol:
   annotatedType: [] kotlin/Int
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: y
+  callableIdIfNonLocal: /y
   dispatchType: null
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: false

idea/idea-frontend-fir/testData/symbols/symbolByPsi/typeAnnotations.kt

@@ -115,6 +115,7 @@ KtFirValueParameterSymbol:
   annotatedType: [Anno2()] I
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   hasDefaultValue: false
   isVararg: false
   name: arg
@@ -125,7 +126,7 @@ KtFirFunctionSymbol:
   annotatedType: [Anno3()] I
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: X.f
+  callableIdIfNonLocal: /X.f
   dispatchType: X
   isExtension: false
   isExternal: false
@@ -146,7 +147,7 @@ KtFirKotlinPropertySymbol:
   annotatedType: [Anno4()] I
   annotationClassIds: []
   annotations: []
-  callableIdIfNonLocal: X.x
+  callableIdIfNonLocal: /X.x
   dispatchType: X
   getter: KtFirPropertyGetterSymbol(<getter>)
   hasBackingField: true

idea/idea-frontend-fir/testData/symbols/symbolByReference/accessorField.kt

@@ -8,6 +8,7 @@ var x: Int = 0
 /*
 KtFirBackingFieldSymbol:
   annotatedType: [] kotlin/Int
+  callableIdIfNonLocal: null
   name: field
   origin: PROPERTY_BACKING_FIELD
   owningProperty: KtFirKotlinPropertySymbol(x)

idea/idea-frontend-fir/testData/symbols/symbolByReference/constructorViaTypeAlias.kt

@@ -11,6 +11,7 @@ KtFirConstructorSymbol:
   annotatedType: [] java/util/ArrayList<E>
   annotationClassIds: []
   annotations: []
+  callableIdIfNonLocal: null
   containingClassIdIfNonLocal: java/util/ArrayList
   dispatchType: java/util/ArrayList<E>
   isPrimary: false

idea/idea-frontend-fir/tests/org/jetbrains/kotlin/idea/frontend/api/components/AbstractOverriddenDeclarationProviderTest.kt

@@ -56,7 +56,7 @@ abstract class AbstractOverriddenDeclarationProviderTest : AbstractKtIdeaTest()
     }
 
     private fun getPath(symbol: KtCallableSymbol): String = when (symbol) {
-        is KtSyntheticJavaPropertySymbol -> symbol.callableIdIfNonLocal?.asString()!!
+        is KtSyntheticJavaPropertySymbol -> symbol.callableIdIfNonLocal?.toString()!!
         else -> {
             val ktDeclaration = symbol.psi as KtDeclaration
             ktDeclaration