FIR IDE: simplify containing declaration provider

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

@@ -47,7 +47,7 @@ object DebugSymbolRenderer {
         is KtSymbol -> {
             val symbolTag = when (value) {
                 is KtClassLikeSymbol -> renderValue(value.classIdIfNonLocal ?: "<local>/${value.name}")
-                is KtFunctionSymbol -> renderValue(value.fqNameIfNonLocal ?: "<local>/${value.name}")
+                is KtFunctionSymbol -> renderValue(value.callableIdIfNonLocal ?: "<local>/${value.name}")
                 is KtConstructorSymbol -> "<constructor>"
                 is KtNamedSymbol -> renderValue(value.name)
                 else -> TODO(value::class.toString())

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

@@ -22,9 +22,6 @@ abstract class KtTypeAliasSymbol : KtClassLikeSymbol() {
     abstract override val classIdIfNonLocal: ClassId
 
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.TOP_LEVEL
-    final override val containingNonLocalClassIdIfMember: ClassId? get() = null
-
-    abstract override val containingPackageFqNameIfTopLevel: FqName
 
     abstract override fun createPointer(): KtSymbolPointer<KtTypeAliasSymbol>
 }

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

@@ -19,8 +19,6 @@ sealed class KtFunctionLikeSymbol : KtCallableSymbol(), KtTypedSymbol, KtSymbolW
 
 abstract class KtAnonymousFunctionSymbol : KtFunctionLikeSymbol() {
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.LOCAL
-    final override val containingNonLocalClassIdIfMember: ClassId? get() = null
-    final override val containingPackageFqNameIfTopLevel: FqName? get() = null
 
     abstract override fun createPointer(): KtSymbolPointer<KtAnonymousFunctionSymbol>
 }
@@ -30,7 +28,7 @@ abstract class KtFunctionSymbol : KtFunctionLikeSymbol(),
     KtPossibleExtensionSymbol,
     KtSymbolWithTypeParameters,
     KtSymbolWithModality<KtCommonSymbolModality> {
-    abstract val fqNameIfNonLocal: FqName?
+    abstract val callableIdIfNonLocal: FqName?
 
     abstract val isSuspend: Boolean
     abstract val isOperator: Boolean
@@ -42,11 +40,11 @@ abstract class KtFunctionSymbol : KtFunctionLikeSymbol(),
 
 abstract class KtConstructorSymbol : KtFunctionLikeSymbol() {
     abstract val isPrimary: Boolean
+    abstract val containingClassIdIfNonLocal: ClassId?
+
+    final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER
 
     abstract override val valueParameters: List<KtConstructorParameterSymbol>
 
-    final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER
-    final override val containingPackageFqNameIfTopLevel: FqName? get() = null
-
     abstract override fun createPointer(): KtSymbolPointer<KtConstructorSymbol>
 }

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

@@ -17,14 +17,12 @@ abstract class KtVariableLikeSymbol : KtCallableSymbol(), KtTypedSymbol, KtNamed
 
 abstract class KtEnumEntrySymbol : KtVariableLikeSymbol(), KtSymbolWithKind {
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER
-    final override val containingPackageFqNameIfTopLevel: FqName? get() = null
+    abstract val containingEnumClassIdIfNonLocal: ClassId?
 
     abstract override fun createPointer(): KtSymbolPointer<KtEnumEntrySymbol>
 }
 
 abstract class KtParameterSymbol : KtVariableLikeSymbol() {
-    final override val containingPackageFqNameIfTopLevel: FqName? get() = null
-
     abstract val hasDefaultValue: Boolean
 
     abstract override fun createPointer(): KtSymbolPointer<KtParameterSymbol>
@@ -37,7 +35,8 @@ abstract class KtVariableSymbol : KtVariableLikeSymbol() {
 
 abstract class KtJavaFieldSymbol : KtVariableSymbol(), KtSymbolWithModality<KtCommonSymbolModality>, KtSymbolWithKind {
     final override val symbolKind: KtSymbolKind get() = KtSymbolKind.MEMBER
-    final override val containingPackageFqNameIfTopLevel: FqName? get() = null
+
+    abstract val callableIdIfNonLocal: FqName?
 
     abstract override fun createPointer(): KtSymbolPointer<KtJavaFieldSymbol>
 }
@@ -48,13 +47,12 @@ abstract class KtPropertySymbol : KtVariableSymbol(),
     KtSymbolWithModality<KtCommonSymbolModality>,
     KtSymbolWithKind {
 
+    abstract val callableIdIfNonLocal: FqName?
+
     abstract override fun createPointer(): KtSymbolPointer<KtPropertySymbol>
 }
 
 abstract class KtLocalVariableSymbol : KtVariableSymbol(), KtSymbolWithKind {
-    final override val containingPackageFqNameIfTopLevel: FqName? get() = null
-    final override val containingNonLocalClassIdIfMember: ClassId? get() = null
-
     abstract override fun createPointer(): KtSymbolPointer<KtLocalVariableSymbol>
 }
 
@@ -62,7 +60,6 @@ abstract class KtFunctionParameterSymbol : KtParameterSymbol(), KtSymbolWithKind
     abstract val isVararg: Boolean
 
     override val symbolKind: KtSymbolKind get() = KtSymbolKind.NON_PROPERTY_PARAMETER
-    override val containingNonLocalClassIdIfMember: ClassId? get() = null
 
     abstract override fun createPointer(): KtSymbolPointer<KtFunctionParameterSymbol>
 }

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

@@ -9,25 +9,12 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.KtSymbol
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 
-/**
- * [KtSymbol] which can possibly be class member, top level or local declaration
- * Contracts:
- *   [containingNonLocalClassIdIfMember] != null iff [symbolKind] == [KtSymbolKind.MEMBER]
- *   [containingPackageFqNameIfTopLevel] != null iff [symbolKind] == [KtSymbolKind.TOP_LEVEL]
- */
+
 interface KtSymbolWithKind : KtSymbol {
     val symbolKind: KtSymbolKind
-    val containingNonLocalClassIdIfMember: ClassId?
-    val containingPackageFqNameIfTopLevel: FqName?
 }
 
 enum class KtSymbolKind {
     TOP_LEVEL, MEMBER, LOCAL, NON_PROPERTY_PARAMETER
 }
 
-val KtSymbol.containingClassIdIfMember: ClassId?
-    get() = (this as? KtSymbolWithKind)?.containingClassIdIfMember
-
-val KtSymbol.containingPackageFqNameIfTopLevel: FqName?
-    get() = (this as? KtSymbolWithKind)?.containingPackageFqNameIfTopLevel
-

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

@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSession
 import org.jetbrains.kotlin.idea.frontend.api.symbols.*
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolKind
 import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithKind
+import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.psi.KtDeclaration
 
 internal class KtFirSymbolContainingDeclarationProvider(
@@ -43,8 +44,26 @@ internal class KtFirSymbolContainingDeclarationProvider(
     private fun getContainingDeclarationForLibrarySymbol(symbol: KtSymbolWithKind): KtSymbolWithKind = with(analysisSession) {
         require(symbol.origin == KtSymbolOrigin.LIBRARY)
         check(symbol.symbolKind == KtSymbolKind.MEMBER)
-        val containingClassId =
-            symbol.containingNonLocalClassIdIfMember ?: error("containingClassId should not be null for member declaration")
+
+        val containingClassId = when (symbol) {
+            is KtClassLikeSymbol -> {
+                val classId = symbol.classIdIfNonLocal ?: error("classId should not be null for non-local declaration")
+                classId.outerClassId
+            }
+            is KtFunctionSymbol -> {
+                val fqName = symbol.callableIdIfNonLocal ?: error("fqName should not be null for non-local declaration")
+                fqName.parent().let { ClassId.topLevel(it) }
+            }
+            is KtEnumEntrySymbol -> {
+                val classId = symbol.containingEnumClassIdIfNonLocal ?: error("fqName should not be null for non-local declaration")
+                classId.outerClassId
+            }
+            is KtPropertySymbol -> {
+                val fqName = symbol.callableIdIfNonLocal ?: error("fqName should not be null for non-local declaration")
+                fqName.parent().let { ClassId.topLevel(it) }
+            }
+            else -> error("We should not have a ${symbol::class} from a library")
+        } ?: error("outerClassId should not be null for member declaration")
         val containingClass = containingClassId.getCorrespondingToplevelClassOrObjectSymbol()
         return containingClass ?: error("Class with id $containingClassId should exists")
     }

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

@@ -65,16 +65,6 @@ internal class KtFirClassOrObjectSymbol(
             }
         }
 
-    override val containingNonLocalClassIdIfMember: ClassId?
-        get() = firRef.withFir { fir ->
-            fir.classId.outerClassId?.takeUnless { it.isLocal }
-        }
-
-    override val containingPackageFqNameIfTopLevel: FqName?
-        get() = firRef.withFir { fir ->
-            fir.classId.packageFqName.takeIf { fir.classId.outerClassId == null }
-        }
-
     override fun createPointer(): KtSymbolPointer<KtClassOrObjectSymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         if (symbolKind == KtSymbolKind.LOCAL) {

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

@@ -42,19 +42,17 @@ internal class KtFirConstructorSymbol(
         }
     }
 
-    override val isPrimary: Boolean get() = firRef.withFir { it.isPrimary }
+    override val containingClassIdIfNonLocal: ClassId?
+        get() = firRef.withFir { fir -> fir.symbol.callableId.classId /* TODO check if local */ }
 
-    override val containingNonLocalClassIdIfMember: ClassId?
-        get() = firRef.withFir { fir ->
-            fir.symbol.callableId.classId?.takeUnless { it.isLocal }
-        }
+    override val isPrimary: Boolean get() = firRef.withFir { it.isPrimary }
 
     override fun createPointer(): KtSymbolPointer<KtConstructorSymbol> = withValidityAssertion {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         if (symbolKind == KtSymbolKind.LOCAL) {
             throw CanNotCreateSymbolPointerForLocalLibraryDeclarationException("constructor")
         }
-        val ownerClassId = containingNonLocalClassIdIfMember
+        val ownerClassId = containingClassIdIfNonLocal
             ?: error("ClassId should present for member declaration")
         return KtFirConstructorSymbolPointer(ownerClassId, isPrimary, firRef.withFir { it.createSignature() })
     }

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

@@ -40,11 +40,6 @@ internal class KtFirConstructorValueParameterSymbol(
             }
         }
 
-    override val containingNonLocalClassIdIfMember: ClassId?
-        get() = firRef.withFir { fir ->
-            fir.symbol.callableId.classId.takeIf { fir.isVal || fir.isVar }
-        }
-
     override val constructorParameterKind: KtConstructorParameterSymbolKind
         get() = firRef.withFir { fir ->
             when {

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

@@ -34,11 +34,11 @@ internal class KtFirEnumEntrySymbol(
     override val name: Name get() = firRef.withFir { it.name }
     override val type: KtType by firRef.withFirAndCache(FirResolvePhase.IMPLICIT_TYPES_BODY_RESOLVE) { fir -> builder.buildKtType(fir.returnTypeRef) }
 
-    override val containingNonLocalClassIdIfMember: ClassId?
+    override val containingEnumClassIdIfNonLocal: ClassId?
         get() = firRef.withFir { it.symbol.callableId.classId?.takeUnless { it.isLocal } }
 
     override fun createPointer(): KtSymbolPointer<KtEnumEntrySymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
-        return KtFirEnumEntrySymbolPointer(containingNonLocalClassIdIfMember!!, firRef.withFir { it.createSignature() })
+        return KtFirEnumEntrySymbolPointer(containingEnumClassIdIfNonLocal!!, firRef.withFir { it.createSignature() })
     }
 }

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

@@ -51,7 +51,7 @@ internal class KtFirFunctionSymbol(
     override val receiverType: KtType? by firRef.withFirAndCache(FirResolvePhase.TYPES) { fir -> fir.receiverTypeRef?.let(builder::buildKtType) }
     override val isOperator: Boolean get() = firRef.withFir { it.isOperator }
     override val isExtension: Boolean get() = firRef.withFir { it.receiverTypeRef != null }
-    override val fqNameIfNonLocal: FqName?
+    override val callableIdIfNonLocal: FqName?
         get() = firRef.withFir { fir ->
             fir.symbol.callableId.takeUnless { fir.isLocal }?.asFqNameForDebugInfo()
         }
@@ -65,16 +65,6 @@ internal class KtFirFunctionSymbol(
         }
     override val modality: KtCommonSymbolModality get() = firRef.withFir { it.modality.getSymbolModality() }
 
-    override val containingNonLocalClassIdIfMember: ClassId?
-        get() = firRef.withFir { fir ->
-            fir.symbol.callableId.classId?.takeUnless { it.isLocal }
-        }
-
-    override val containingPackageFqNameIfTopLevel: FqName?
-        get() = firRef.withFir { fir ->
-            fir.symbol.callableId.takeIf { !fir.isLocal && it.className == null }?.packageName
-        }
-
     override fun createPointer(): KtSymbolPointer<KtFunctionSymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }
         return when (symbolKind) {
@@ -85,7 +75,7 @@ internal class KtFirFunctionSymbol(
             )
             KtSymbolKind.NON_PROPERTY_PARAMETER -> error("KtFunction could not be a parameter")
             KtSymbolKind.LOCAL -> throw CanNotCreateSymbolPointerForLocalLibraryDeclarationException(
-                fqNameIfNonLocal?.asString() ?: name.asString()
+                callableIdIfNonLocal?.asString() ?: name.asString()
             )
         }
     }

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

@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.KtJavaFieldSymbol
 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.name.FqName
 import org.jetbrains.kotlin.name.Name
 
 internal class KtFirJavaFieldSymbol(
@@ -38,10 +39,9 @@ internal class KtFirJavaFieldSymbol(
     override val isVal: Boolean get() = firRef.withFir { it.isVal }
     override val name: Name get() = firRef.withFir { it.name }
 
-    override val containingNonLocalClassIdIfMember: ClassId?
+    override val callableIdIfNonLocal: FqName?
         get() = firRef.withFir { fir ->
-            val classId = fir.symbol.callableId.classId
-            classId?.takeUnless { it.isLocal }
+            fir.symbol.callableId.asFqNameForDebugInfo() // todo check if local
         }
 
     override val modality: KtCommonSymbolModality get() = firRef.withFir { it.modality.getSymbolModality() }

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

@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.fir.declarations.FirProperty
 import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
+import org.jetbrains.kotlin.fir.declarations.isLocal
 import org.jetbrains.kotlin.fir.declarations.modality
 import org.jetbrains.kotlin.idea.fir.findPsi
 import org.jetbrains.kotlin.idea.fir.low.level.api.FirModuleResolveState
@@ -54,14 +55,9 @@ internal class KtFirPropertySymbol(
         }
     override val modality: KtCommonSymbolModality get() = firRef.withFir { it.modality.getSymbolModality() }
 
-    override val containingNonLocalClassIdIfMember: ClassId?
+    override val callableIdIfNonLocal: FqName?
         get() = firRef.withFir { fir ->
-            fir.symbol.callableId.classId
-        }
-
-    override val containingPackageFqNameIfTopLevel: FqName?
-        get() = firRef.withFir { fir ->
-            fir.symbol.callableId.packageName.takeIf { fir.symbol.callableId.className == null }
+            fir.symbol.callableId.takeUnless { fir.isLocal }?.asFqNameForDebugInfo()
         }
 
     override fun createPointer(): KtSymbolPointer<KtPropertySymbol> {

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

@@ -27,7 +27,6 @@ internal class KtFirTypeAliasSymbol(
     override val psi: PsiElement? by firRef.withFirAndCache { it.findPsi(fir.session) }
     override val name: Name get() = firRef.withFir { it.name }
     override val classIdIfNonLocal: ClassId get() = firRef.withFir { it.symbol.classId }
-    override val containingPackageFqNameIfTopLevel: FqName get() = firRef.withFir { it.symbol.classId.packageFqName }
 
     override fun createPointer(): KtSymbolPointer<KtTypeAliasSymbol> {
         KtPsiBasedSymbolPointer.createForSymbolFromSource(this)?.let { return it }

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

@@ -2,7 +2,7 @@ class: kotlin/Int
 
 // SYMBOLS:
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.and
+  callableIdIfNonLocal: kotlin.Int.and
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -16,7 +16,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -30,7 +30,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -44,7 +44,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -58,7 +58,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -72,7 +72,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -86,7 +86,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.compareTo
+  callableIdIfNonLocal: kotlin.Int.compareTo
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -100,7 +100,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.dec
+  callableIdIfNonLocal: kotlin.Int.dec
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -114,7 +114,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.div
+  callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -128,7 +128,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.div
+  callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -142,7 +142,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.div
+  callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -156,7 +156,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.div
+  callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -170,7 +170,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.div
+  callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -184,7 +184,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.div
+  callableIdIfNonLocal: kotlin.Int.div
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -198,7 +198,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.inc
+  callableIdIfNonLocal: kotlin.Int.inc
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -212,7 +212,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.inv
+  callableIdIfNonLocal: kotlin.Int.inv
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -226,7 +226,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -240,7 +240,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -254,7 +254,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -268,7 +268,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -282,7 +282,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -296,7 +296,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.minus
+  callableIdIfNonLocal: kotlin.Int.minus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -310,7 +310,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.or
+  callableIdIfNonLocal: kotlin.Int.or
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -324,7 +324,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -338,7 +338,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -352,7 +352,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -366,7 +366,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -380,7 +380,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -394,7 +394,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.plus
+  callableIdIfNonLocal: kotlin.Int.plus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -408,7 +408,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.rangeTo
+  callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -422,7 +422,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.rangeTo
+  callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -436,7 +436,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.rangeTo
+  callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -450,7 +450,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.rangeTo
+  callableIdIfNonLocal: kotlin.Int.rangeTo
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -464,7 +464,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -478,7 +478,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -492,7 +492,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -506,7 +506,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -520,7 +520,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -534,7 +534,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.rem
+  callableIdIfNonLocal: kotlin.Int.rem
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -548,7 +548,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.shl
+  callableIdIfNonLocal: kotlin.Int.shl
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -562,7 +562,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.shr
+  callableIdIfNonLocal: kotlin.Int.shr
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -576,7 +576,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.times
+  callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -590,7 +590,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.times
+  callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -604,7 +604,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.times
+  callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -618,7 +618,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.times
+  callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -632,7 +632,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.times
+  callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -646,7 +646,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.times
+  callableIdIfNonLocal: kotlin.Int.times
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -660,7 +660,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.toByte
+  callableIdIfNonLocal: kotlin.Int.toByte
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -674,7 +674,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.toChar
+  callableIdIfNonLocal: kotlin.Int.toChar
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -688,7 +688,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.toDouble
+  callableIdIfNonLocal: kotlin.Int.toDouble
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -702,7 +702,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.toFloat
+  callableIdIfNonLocal: kotlin.Int.toFloat
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -716,7 +716,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.toInt
+  callableIdIfNonLocal: kotlin.Int.toInt
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -730,7 +730,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.toLong
+  callableIdIfNonLocal: kotlin.Int.toLong
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -744,7 +744,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.toShort
+  callableIdIfNonLocal: kotlin.Int.toShort
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -758,7 +758,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.unaryMinus
+  callableIdIfNonLocal: kotlin.Int.unaryMinus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -772,7 +772,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.unaryPlus
+  callableIdIfNonLocal: kotlin.Int.unaryPlus
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -786,7 +786,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.ushr
+  callableIdIfNonLocal: kotlin.Int.ushr
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -800,7 +800,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(bitCount)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Int.xor
+  callableIdIfNonLocal: kotlin.Int.xor
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -814,7 +814,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Any.equals
+  callableIdIfNonLocal: kotlin.Any.equals
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -828,7 +828,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Any.hashCode
+  callableIdIfNonLocal: kotlin.Any.hashCode
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -842,7 +842,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Any.toString
+  callableIdIfNonLocal: kotlin.Any.toString
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -856,7 +856,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirClassOrObjectSymbol:
-  classId: kotlin/Int.Companion
+  classIdIfNonLocal: kotlin/Int.Companion
   classKind: COMPANION_OBJECT
   modality: FINAL
   name: Companion

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

@@ -2,7 +2,7 @@ class: kotlin/collections/MutableList
 
 // SYMBOLS:
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.add
+  callableIdIfNonLocal: kotlin.collections.MutableList.add
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -16,7 +16,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.add
+  callableIdIfNonLocal: kotlin.collections.MutableList.add
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -30,7 +30,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(element)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.addAll
+  callableIdIfNonLocal: kotlin.collections.MutableList.addAll
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -44,7 +44,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(elements)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.addAll
+  callableIdIfNonLocal: kotlin.collections.MutableList.addAll
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -58,7 +58,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.clear
+  callableIdIfNonLocal: kotlin.collections.MutableList.clear
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -72,7 +72,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.listIterator
+  callableIdIfNonLocal: kotlin.collections.MutableList.listIterator
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -86,7 +86,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.listIterator
+  callableIdIfNonLocal: kotlin.collections.MutableList.listIterator
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -100,7 +100,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.remove
+  callableIdIfNonLocal: kotlin.collections.MutableList.remove
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -114,7 +114,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.removeAll
+  callableIdIfNonLocal: kotlin.collections.MutableList.removeAll
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -128,7 +128,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.removeAt
+  callableIdIfNonLocal: kotlin.collections.MutableList.removeAt
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -142,7 +142,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.retainAll
+  callableIdIfNonLocal: kotlin.collections.MutableList.retainAll
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -156,7 +156,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.set
+  callableIdIfNonLocal: kotlin.collections.MutableList.set
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -170,7 +170,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(element)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.subList
+  callableIdIfNonLocal: kotlin.collections.MutableList.subList
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -184,7 +184,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(fromIndex), KtFirFunctionValueParameterSymbol(toIndex)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.contains
+  callableIdIfNonLocal: kotlin.collections.MutableList.contains
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -198,7 +198,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.containsAll
+  callableIdIfNonLocal: kotlin.collections.MutableList.containsAll
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -212,7 +212,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(elements)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.get
+  callableIdIfNonLocal: kotlin.collections.MutableList.get
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -226,7 +226,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.indexOf
+  callableIdIfNonLocal: kotlin.collections.MutableList.indexOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -240,7 +240,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.List.isEmpty
+  callableIdIfNonLocal: kotlin.collections.List.isEmpty
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -254,7 +254,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.iterator
+  callableIdIfNonLocal: kotlin.collections.MutableList.iterator
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -268,7 +268,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.MutableList.lastIndexOf
+  callableIdIfNonLocal: kotlin.collections.MutableList.lastIndexOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -282,7 +282,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
 
 KtFirPropertySymbol:
-  fqName: kotlin.collections.List.size
+  callableIdIfNonLocal: kotlin.collections.List.size
   isExtension: false
   isVal: true
   modality: ABSTRACT
@@ -293,7 +293,7 @@ KtFirPropertySymbol:
   type: kotlin/Int
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Any.equals
+  callableIdIfNonLocal: kotlin.Any.equals
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -307,7 +307,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(other)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Any.hashCode
+  callableIdIfNonLocal: kotlin.Any.hashCode
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -321,7 +321,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.Any.toString
+  callableIdIfNonLocal: kotlin.Any.toString
   isExtension: false
   isOperator: false
   isSuspend: false

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

@@ -2,6 +2,7 @@ class: java/lang/String
 
 // SYMBOLS:
 KtFirJavaFieldSymbol:
+  callableIdIfNonLocal: java.lang.String.value
   isVal: true
   modality: FINAL
   name: value
@@ -10,6 +11,7 @@ KtFirJavaFieldSymbol:
   type: ft<kotlin/CharArray, kotlin/CharArray?>!
 
 KtFirJavaFieldSymbol:
+  callableIdIfNonLocal: java.lang.String.hash
   isVal: false
   modality: OPEN
   name: hash
@@ -18,7 +20,7 @@ KtFirJavaFieldSymbol:
   type: kotlin/Int
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.hash32
+  callableIdIfNonLocal: java.lang.String.hash32
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -32,6 +34,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirJavaFieldSymbol:
+  callableIdIfNonLocal: java.lang.String.hash32
   isVal: false
   modality: OPEN
   name: hash32
@@ -40,7 +43,7 @@ KtFirJavaFieldSymbol:
   type: kotlin/Int
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.length
+  callableIdIfNonLocal: java.lang.String.length
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -54,7 +57,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirPropertySymbol:
-  fqName: kotlin.CharSequence.length
+  callableIdIfNonLocal: kotlin.CharSequence.length
   isExtension: false
   isVal: true
   modality: ABSTRACT
@@ -65,7 +68,7 @@ KtFirPropertySymbol:
   type: kotlin/Int
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.isEmpty
+  callableIdIfNonLocal: java.lang.String.isEmpty
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -79,7 +82,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.charAt
+  callableIdIfNonLocal: java.lang.String.charAt
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -93,7 +96,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.codePointAt
+  callableIdIfNonLocal: java.lang.String.codePointAt
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -107,7 +110,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.codePointBefore
+  callableIdIfNonLocal: java.lang.String.codePointBefore
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -121,7 +124,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.codePointCount
+  callableIdIfNonLocal: java.lang.String.codePointCount
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -135,7 +138,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex), KtFirFunctionValueParameterSymbol(endIndex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.offsetByCodePoints
+  callableIdIfNonLocal: java.lang.String.offsetByCodePoints
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -149,7 +152,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(index), KtFirFunctionValueParameterSymbol(codePointOffset)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.getChars
+  callableIdIfNonLocal: java.lang.String.getChars
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -163,7 +166,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(dst), KtFirFunctionValueParameterSymbol(dstBegin)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.getChars
+  callableIdIfNonLocal: java.lang.String.getChars
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -177,7 +180,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(srcBegin), KtFirFunctionValueParameterSymbol(srcEnd), KtFirFunctionValueParameterSymbol(dst), KtFirFunctionValueParameterSymbol(dstBegin)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.getBytes
+  callableIdIfNonLocal: java.lang.String.getBytes
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -191,7 +194,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(srcBegin), KtFirFunctionValueParameterSymbol(srcEnd), KtFirFunctionValueParameterSymbol(dst), KtFirFunctionValueParameterSymbol(dstBegin)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.getBytes
+  callableIdIfNonLocal: java.lang.String.getBytes
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -205,7 +208,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(charsetName)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.getBytes
+  callableIdIfNonLocal: java.lang.String.getBytes
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -219,7 +222,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(charset)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.getBytes
+  callableIdIfNonLocal: java.lang.String.getBytes
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -233,7 +236,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.equals
+  callableIdIfNonLocal: java.lang.String.equals
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -247,7 +250,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(anObject)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.contentEquals
+  callableIdIfNonLocal: java.lang.String.contentEquals
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -261,7 +264,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(sb)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.contentEquals
+  callableIdIfNonLocal: java.lang.String.contentEquals
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -275,7 +278,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(cs)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.equalsIgnoreCase
+  callableIdIfNonLocal: java.lang.String.equalsIgnoreCase
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -289,7 +292,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(anotherString)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.compareTo
+  callableIdIfNonLocal: java.lang.String.compareTo
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -303,7 +306,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(anotherString)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.compareToIgnoreCase
+  callableIdIfNonLocal: java.lang.String.compareToIgnoreCase
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -317,7 +320,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(str)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.regionMatches
+  callableIdIfNonLocal: java.lang.String.regionMatches
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -331,7 +334,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(toffset), KtFirFunctionValueParameterSymbol(other), KtFirFunctionValueParameterSymbol(ooffset), KtFirFunctionValueParameterSymbol(len)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.regionMatches
+  callableIdIfNonLocal: java.lang.String.regionMatches
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -345,7 +348,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(ignoreCase), KtFirFunctionValueParameterSymbol(toffset), KtFirFunctionValueParameterSymbol(other), KtFirFunctionValueParameterSymbol(ooffset), KtFirFunctionValueParameterSymbol(len)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.startsWith
+  callableIdIfNonLocal: java.lang.String.startsWith
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -359,7 +362,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(prefix), KtFirFunctionValueParameterSymbol(toffset)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.startsWith
+  callableIdIfNonLocal: java.lang.String.startsWith
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -373,7 +376,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(prefix)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.endsWith
+  callableIdIfNonLocal: java.lang.String.endsWith
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -387,7 +390,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(suffix)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.hashCode
+  callableIdIfNonLocal: java.lang.String.hashCode
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -401,7 +404,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.indexOf
+  callableIdIfNonLocal: java.lang.String.indexOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -415,7 +418,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(ch)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.indexOf
+  callableIdIfNonLocal: java.lang.String.indexOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -429,7 +432,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.indexOf
+  callableIdIfNonLocal: java.lang.String.indexOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -443,7 +446,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(str)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.indexOf
+  callableIdIfNonLocal: java.lang.String.indexOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -457,7 +460,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(str), KtFirFunctionValueParameterSymbol(fromIndex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.indexOfSupplementary
+  callableIdIfNonLocal: java.lang.String.indexOfSupplementary
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -471,7 +474,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.lastIndexOf
+  callableIdIfNonLocal: java.lang.String.lastIndexOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -485,7 +488,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(ch)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.lastIndexOf
+  callableIdIfNonLocal: java.lang.String.lastIndexOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -499,7 +502,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.lastIndexOf
+  callableIdIfNonLocal: java.lang.String.lastIndexOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -513,7 +516,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(str)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.lastIndexOf
+  callableIdIfNonLocal: java.lang.String.lastIndexOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -527,7 +530,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(str), KtFirFunctionValueParameterSymbol(fromIndex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.lastIndexOfSupplementary
+  callableIdIfNonLocal: java.lang.String.lastIndexOfSupplementary
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -541,7 +544,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(ch), KtFirFunctionValueParameterSymbol(fromIndex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.substring
+  callableIdIfNonLocal: java.lang.String.substring
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -555,7 +558,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.substring
+  callableIdIfNonLocal: java.lang.String.substring
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -569,7 +572,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex), KtFirFunctionValueParameterSymbol(endIndex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.subSequence
+  callableIdIfNonLocal: java.lang.String.subSequence
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -583,7 +586,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(beginIndex), KtFirFunctionValueParameterSymbol(endIndex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.concat
+  callableIdIfNonLocal: java.lang.String.concat
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -597,7 +600,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(str)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.replace
+  callableIdIfNonLocal: java.lang.String.replace
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -611,7 +614,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(oldChar), KtFirFunctionValueParameterSymbol(newChar)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.replace
+  callableIdIfNonLocal: java.lang.String.replace
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -625,7 +628,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(target), KtFirFunctionValueParameterSymbol(replacement)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.matches
+  callableIdIfNonLocal: java.lang.String.matches
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -639,7 +642,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(regex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.contains
+  callableIdIfNonLocal: java.lang.String.contains
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -653,7 +656,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(s)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.replaceFirst
+  callableIdIfNonLocal: java.lang.String.replaceFirst
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -667,7 +670,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(regex), KtFirFunctionValueParameterSymbol(replacement)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.replaceAll
+  callableIdIfNonLocal: java.lang.String.replaceAll
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -681,7 +684,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(regex), KtFirFunctionValueParameterSymbol(replacement)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.split
+  callableIdIfNonLocal: java.lang.String.split
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -695,7 +698,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(regex), KtFirFunctionValueParameterSymbol(limit)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.split
+  callableIdIfNonLocal: java.lang.String.split
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -709,7 +712,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(regex)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.toLowerCase
+  callableIdIfNonLocal: java.lang.String.toLowerCase
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -723,7 +726,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(locale)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.toLowerCase
+  callableIdIfNonLocal: java.lang.String.toLowerCase
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -737,7 +740,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.toUpperCase
+  callableIdIfNonLocal: java.lang.String.toUpperCase
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -751,7 +754,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(locale)]
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.toUpperCase
+  callableIdIfNonLocal: java.lang.String.toUpperCase
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -765,7 +768,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.trim
+  callableIdIfNonLocal: java.lang.String.trim
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -779,7 +782,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.toString
+  callableIdIfNonLocal: java.lang.String.toString
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -793,7 +796,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.toCharArray
+  callableIdIfNonLocal: java.lang.String.toCharArray
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -807,7 +810,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: java.lang.String.intern
+  callableIdIfNonLocal: java.lang.String.intern
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -821,7 +824,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.CharSequence.get
+  callableIdIfNonLocal: kotlin.CharSequence.get
   isExtension: false
   isOperator: true
   isSuspend: false
@@ -835,7 +838,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(index)]
 
 KtFirClassOrObjectSymbol:
-  classId: java/lang/String.CaseInsensitiveComparator
+  classIdIfNonLocal: java/lang/String.CaseInsensitiveComparator
   classKind: CLASS
   modality: OPEN
   name: CaseInsensitiveComparator

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/class.txt

@@ -4,7 +4,7 @@ class: kotlin/Lazy
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
-  classId: kotlin/Lazy
+  classIdIfNonLocal: kotlin/Lazy
   classKind: INTERFACE
   modality: ABSTRACT
   name: Lazy

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/classFromJdk.txt

@@ -4,7 +4,7 @@ class: java.lang.String
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
-  classId: java.lang.String
+  classIdIfNonLocal: java.lang.String
   classKind: CLASS
   modality: FINAL
   name: String

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/enumEntry.txt

@@ -4,7 +4,7 @@ callable: kotlin/LazyThreadSafetyMode.SYNCHRONIZED
 
 // SYMBOLS:
 KtFirEnumEntrySymbol:
-  enumClassId: kotlin/LazyThreadSafetyMode
+  containingEnumClassIdIfNonLocal: kotlin/LazyThreadSafetyMode
   name: SYNCHRONIZED
   origin: LIBRARY
   symbolKind: MEMBER

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunction.txt

@@ -2,7 +2,7 @@ callable: kotlin/collections/List.get
 
 // SYMBOLS:
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.List.get
+  callableIdIfNonLocal: kotlin.collections.List.get
   isExtension: false
   isOperator: true
   isSuspend: false

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/memberFunctionWithOverloads.txt

@@ -2,7 +2,7 @@ callable: kotlin/collections/List.listIterator
 
 // SYMBOLS:
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.List.listIterator
+  callableIdIfNonLocal: kotlin.collections.List.listIterator
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -16,7 +16,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.List.listIterator
+  callableIdIfNonLocal: kotlin.collections.List.listIterator
   isExtension: false
   isOperator: false
   isSuspend: false

idea/idea-frontend-fir/testData/resoreSymbolFromLibrary/nestedClass.txt

@@ -2,7 +2,7 @@ class: kotlin/collections/MutableMap.MutableEntry
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
-  classId: kotlin/collections/MutableMap.MutableEntry
+  classIdIfNonLocal: kotlin/collections/MutableMap.MutableEntry
   classKind: INTERFACE
   modality: ABSTRACT
   name: MutableEntry

idea/idea-frontend-fir/testData/symbolPointer/class.kt

@@ -3,7 +3,7 @@ class A {
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
-  classId: A
+  classIdIfNonLocal: A
   classKind: CLASS
   modality: FINAL
   name: A

idea/idea-frontend-fir/testData/symbolPointer/classPrimaryConstructor.kt

@@ -3,16 +3,15 @@ class A() {
 
 // SYMBOLS:
 KtFirConstructorSymbol:
+  containingClassIdIfNonLocal: A
   isPrimary: true
   origin: SOURCE
-  owner: KtFirClassOrObjectSymbol(A)
-  ownerClassId: A
   symbolKind: MEMBER
   type: A
   valueParameters: []
 
 KtFirClassOrObjectSymbol:
-  classId: A
+  classIdIfNonLocal: A
   classKind: CLASS
   modality: FINAL
   name: A

idea/idea-frontend-fir/testData/symbolPointer/classSecondaryConstructors.kt

@@ -5,10 +5,9 @@ class A() {
 
 // SYMBOLS:
 KtFirConstructorSymbol:
+  containingClassIdIfNonLocal: A
   isPrimary: true
   origin: SOURCE
-  owner: KtFirClassOrObjectSymbol(A)
-  ownerClassId: A
   symbolKind: MEMBER
   type: A
   valueParameters: []
@@ -17,14 +16,13 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: x
   origin: SOURCE
-  symbolKind: LOCAL
+  symbolKind: NON_PROPERTY_PARAMETER
   type: kotlin/Int
 
 KtFirConstructorSymbol:
+  containingClassIdIfNonLocal: A
   isPrimary: false
   origin: SOURCE
-  owner: KtFirClassOrObjectSymbol(A)
-  ownerClassId: A
   symbolKind: MEMBER
   type: A
   valueParameters: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirFunctionValueParameterSymbol cannot be cast to org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirConstructorValueParameterSymbol
@@ -33,27 +31,26 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: y
   origin: SOURCE
-  symbolKind: LOCAL
+  symbolKind: NON_PROPERTY_PARAMETER
   type: kotlin/Int
 
 KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: z
   origin: SOURCE
-  symbolKind: LOCAL
+  symbolKind: NON_PROPERTY_PARAMETER
   type: kotlin/String
 
 KtFirConstructorSymbol:
+  containingClassIdIfNonLocal: A
   isPrimary: false
   origin: SOURCE
-  owner: KtFirClassOrObjectSymbol(A)
-  ownerClassId: A
   symbolKind: MEMBER
   type: A
   valueParameters: Could not render due to java.lang.ClassCastException: org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirFunctionValueParameterSymbol cannot be cast to org.jetbrains.kotlin.idea.frontend.api.fir.symbols.KtFirConstructorValueParameterSymbol
 
 KtFirClassOrObjectSymbol:
-  classId: A
+  classIdIfNonLocal: A
   classKind: CLASS
   modality: FINAL
   name: A

idea/idea-frontend-fir/testData/symbolPointer/enum.kt

@@ -4,21 +4,21 @@ enum class X {
 
 // SYMBOLS:
 KtFirEnumEntrySymbol:
-  enumClassId: X
+  containingEnumClassIdIfNonLocal: X
   name: Y
   origin: SOURCE
   symbolKind: MEMBER
   type: X
 
 KtFirEnumEntrySymbol:
-  enumClassId: X
+  containingEnumClassIdIfNonLocal: X
   name: Z
   origin: SOURCE
   symbolKind: MEMBER
   type: X
 
 KtFirClassOrObjectSymbol:
-  classId: X
+  classIdIfNonLocal: X
   classKind: ENUM_CLASS
   modality: FINAL
   name: X

idea/idea-frontend-fir/testData/symbolPointer/memberFunctions.kt

@@ -5,7 +5,7 @@ class A {
 
 // SYMBOLS:
 KtFirFunctionSymbol:
-  fqName: A.x
+  callableIdIfNonLocal: A.x
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -19,7 +19,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: A.y
+  callableIdIfNonLocal: A.y
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -33,7 +33,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirClassOrObjectSymbol:
-  classId: A
+  classIdIfNonLocal: A
   classKind: CLASS
   modality: FINAL
   name: A

idea/idea-frontend-fir/testData/symbolPointer/memberProperties.kt

@@ -5,7 +5,7 @@ class A {
 
 // SYMBOLS:
 KtFirPropertySymbol:
-  fqName: A.x
+  callableIdIfNonLocal: A.x
   isExtension: false
   isVal: true
   modality: FINAL
@@ -16,7 +16,7 @@ KtFirPropertySymbol:
   type: kotlin/Int
 
 KtFirPropertySymbol:
-  fqName: A.y
+  callableIdIfNonLocal: A.y
   isExtension: true
   isVal: true
   modality: FINAL
@@ -27,7 +27,7 @@ KtFirPropertySymbol:
   type: A
 
 KtFirClassOrObjectSymbol:
-  classId: A
+  classIdIfNonLocal: A
   classKind: CLASS
   modality: FINAL
   name: A

idea/idea-frontend-fir/testData/symbolPointer/topLevelFunctions.kt

@@ -3,7 +3,7 @@ fun y() {}
 
 // SYMBOLS:
 KtFirFunctionSymbol:
-  fqName: x
+  callableIdIfNonLocal: x
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -17,7 +17,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: y
+  callableIdIfNonLocal: y
   isExtension: false
   isOperator: false
   isSuspend: false

idea/idea-frontend-fir/testData/symbolPointer/topLevelProperties.kt

@@ -3,7 +3,7 @@ val Int.y = this
 
 // SYMBOLS:
 KtFirPropertySymbol:
-  fqName: x
+  callableIdIfNonLocal: x
   isExtension: false
   isVal: true
   modality: FINAL
@@ -14,7 +14,7 @@ KtFirPropertySymbol:
   type: kotlin/Int
 
 KtFirPropertySymbol:
-  fqName: y
+  callableIdIfNonLocal: y
   isExtension: true
   isVal: true
   modality: FINAL

idea/idea-frontend-fir/testData/symbolsByFqName/fileWalkDirectionEnum.txt

@@ -2,7 +2,7 @@ callable: kotlin/collections/listOf
 
 // SYMBOLS:
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.listOf
+  callableIdIfNonLocal: kotlin.collections.listOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -16,7 +16,7 @@ KtFirFunctionSymbol:
   valueParameters: [KtFirFunctionValueParameterSymbol(element)]
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.listOf
+  callableIdIfNonLocal: kotlin.collections.listOf
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -30,7 +30,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirFunctionSymbol:
-  fqName: kotlin.collections.listOf
+  callableIdIfNonLocal: kotlin.collections.listOf
   isExtension: false
   isOperator: false
   isSuspend: false

idea/idea-frontend-fir/testData/symbolsByFqName/iterator.txt

@@ -2,7 +2,7 @@ class: kotlin/collections/Iterator
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
-  classId: kotlin/collections/Iterator
+  classIdIfNonLocal: kotlin/collections/Iterator
   classKind: INTERFACE
   modality: ABSTRACT
   name: Iterator

idea/idea-frontend-fir/testData/symbolsByFqName/listOf.txt

@@ -2,7 +2,7 @@ class: kotlin/io/FileWalkDirection
 
 // SYMBOLS:
 KtFirClassOrObjectSymbol:
-  classId: kotlin/io/FileWalkDirection
+  classIdIfNonLocal: kotlin/io/FileWalkDirection
   classKind: ENUM_CLASS
   modality: FINAL
   name: FileWalkDirection

idea/idea-frontend-fir/testData/symbolsByPsi/class.kt

@@ -4,7 +4,7 @@ class A {
 // SYMBOLS:
 /*
 KtFirClassOrObjectSymbol:
-  classId: A
+  classIdIfNonLocal: A
   classKind: CLASS
   modality: FINAL
   name: A

idea/idea-frontend-fir/testData/symbolsByPsi/classMembes.kt

@@ -6,7 +6,7 @@ class A {
 // SYMBOLS:
 /*
 KtFirPropertySymbol:
-  fqName: A.a
+  callableIdIfNonLocal: A.a
   isExtension: false
   isVal: true
   modality: FINAL
@@ -17,7 +17,7 @@ KtFirPropertySymbol:
   type: kotlin/Int
 
 KtFirFunctionSymbol:
-  fqName: A.x
+  callableIdIfNonLocal: A.x
   isExtension: false
   isOperator: false
   isSuspend: false
@@ -31,7 +31,7 @@ KtFirFunctionSymbol:
   valueParameters: []
 
 KtFirClassOrObjectSymbol:
-  classId: A
+  classIdIfNonLocal: A
   classKind: CLASS
   modality: FINAL
   name: A

idea/idea-frontend-fir/testData/symbolsByPsi/classWithTypeParams.kt

@@ -12,7 +12,7 @@ KtFirTypeParameterSymbol:
   origin: SOURCE
 
 KtFirClassOrObjectSymbol:
-  classId: A
+  classIdIfNonLocal: A
   classKind: CLASS
   modality: FINAL
   name: A

idea/idea-frontend-fir/testData/symbolsByPsi/extensionFunction.kt

@@ -3,7 +3,7 @@ fun String.foo(): Int = 10
 // SYMBOLS:
 /*
 KtFirFunctionSymbol:
-  fqName: foo
+  callableIdIfNonLocal: foo
   isExtension: true
   isOperator: false
   isSuspend: false

idea/idea-frontend-fir/testData/symbolsByPsi/function.kt

@@ -6,11 +6,11 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: x
   origin: SOURCE
-  symbolKind: LOCAL
+  symbolKind: NON_PROPERTY_PARAMETER
   type: kotlin/Int
 
 KtFirFunctionSymbol:
-  fqName: foo
+  callableIdIfNonLocal: foo
   isExtension: false
   isOperator: false
   isSuspend: false

idea/idea-frontend-fir/testData/symbolsByPsi/functionWithTypeParams.kt

@@ -10,11 +10,11 @@ KtFirFunctionValueParameterSymbol:
   isVararg: false
   name: x
   origin: SOURCE
-  symbolKind: LOCAL
+  symbolKind: NON_PROPERTY_PARAMETER
   type: X
 
 KtFirFunctionSymbol:
-  fqName: foo
+  callableIdIfNonLocal: foo
   isExtension: false
   isOperator: false
   isSuspend: false

idea/idea-frontend-fir/testData/symbolsByPsi/implicitReturn.kt

@@ -3,7 +3,7 @@ fun foo(): Int = 10
 // SYMBOLS:
 /*
 KtFirFunctionSymbol:
-  fqName: foo
+  callableIdIfNonLocal: foo
   isExtension: false
   isOperator: false
   isSuspend: false

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

@@ -90,7 +90,7 @@ private fun CallInfo.stringRepresentation(): String {
     fun KtType.render() = asStringForDebugging().replace('/', '.')
     fun Any.stringValue(): String? = when (this) {
         is KtFunctionLikeSymbol -> buildString {
-            append(if (this@stringValue is KtFunctionSymbol) fqNameIfNonLocal ?: name else "<constructor>")
+            append(if (this@stringValue is KtFunctionSymbol) callableIdIfNonLocal ?: name else "<constructor>")
             append("(")
             (this@stringValue as? KtFunctionSymbol)?.receiverType?.let { receiver ->
                 append("<receiver>: ${receiver.render()}")