[FIR IDE] Fix callableIdIfNonLocal in AAPI/FE10

Before, implementations of 'callableIdIfNonLocal' in Fe10KtSymbols
returned CallableIds even for local declarations. This commit fixes this
behavior.

This commit fixes KtFe10SymbolByPsiTestGenerated.testLocalDeclarations().

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10CallResolver.kt

@@ -13,7 +13,8 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.KtF
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.KtFe10DescPropertyGetterSymbol
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.KtFe10DescPropertySetterSymbol
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.KtFe10DescValueParameterSymbol
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.callableId
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.calculateCallableId
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.callableIdIfNotLocal
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.diagnostics.KtNonBoundToPsiErrorDiagnostic
 import org.jetbrains.kotlin.analysis.api.impl.base.components.AbstractKtCallResolver
@@ -141,7 +142,7 @@ internal class KtFe10CallResolver(
             val variableSymbol = variableDescriptor.toKtCallableSymbol(analysisContext) as? KtVariableLikeSymbol ?: return null
 
             val substitutor = KtSubstitutor.Empty(token)
-            return if (resolvedCall.functionCall.resultingDescriptor.callableId in kotlinFunctionInvokeCallableIds) {
+            return if (resolvedCall.functionCall.resultingDescriptor.callableIdIfNotLocal in kotlinFunctionInvokeCallableIds) {
                 KtFunctionalTypeVariableCall(variableSymbol, argumentMapping, getTarget(callableSymbol), substitutor, token)
             } else {
                 KtVariableWithInvokeFunctionCall(variableSymbol, argumentMapping, getTarget(callableSymbol), substitutor, token)

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescConstructorSymbol.kt

@@ -55,8 +55,8 @@ internal class KtFe10DescConstructorSymbol(
             return pointerByPsi
         }
 
-        val callableId = descriptor.callableId
+        val callableId = descriptor.callableIdIfNotLocal
-        if (callableId != null && !callableId.isLocal) {
+        if (callableId != null) {
             val signature = descriptor.getSymbolPointerSignature(analysisContext)
             return KtFe10DescFunctionLikeSymbolPointer(callableId, signature)
         }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescFunctionSymbol.kt

@@ -64,7 +64,7 @@ internal class KtFe10DescFunctionSymbol(
         get() = withValidityAssertion { descriptor.ktHasStableParameterNames }
 
     override val callableIdIfNonLocal: CallableId?
-        get() = withValidityAssertion { descriptor.callableId }
+        get() = withValidityAssertion { descriptor.callableIdIfNotLocal }
 
     override val annotatedType: KtTypeAndAnnotations
         get() = withValidityAssertion { descriptor.returnTypeOrNothing.toKtTypeAndAnnotations(analysisContext) }
@@ -87,8 +87,8 @@ internal class KtFe10DescFunctionSymbol(
             return pointerByPsi
         }
 
-        val callableId = descriptor.callableId
+        val callableId = descriptor.callableIdIfNotLocal
-        if (callableId != null && !callableId.isLocal) {
+        if (callableId != null) {
             val signature = descriptor.getSymbolPointerSignature(analysisContext)
             return KtFe10DescFunctionLikeSymbolPointer(callableId, signature)
         }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescJavaFieldSymbol.kt

@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased
 
 import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.KtFe10DescMemberSymbol
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.callableId
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.callableIdIfNotLocal
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
 import org.jetbrains.kotlin.analysis.api.symbols.KtJavaFieldSymbol
@@ -34,7 +34,7 @@ internal class KtFe10DescJavaFieldSymbol(
         get() = withValidityAssertion { !descriptor.isVar }
 
     override val callableIdIfNonLocal: CallableId?
-        get() = withValidityAssertion { descriptor.callableId }
+        get() = withValidityAssertion { descriptor.callableIdIfNotLocal }
 
     override val annotatedType: KtTypeAndAnnotations
         get() = withValidityAssertion { descriptor.returnType.toKtTypeAndAnnotations(analysisContext) }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescKotlinPropertySymbol.kt

@@ -64,7 +64,7 @@ internal class KtFe10DescKotlinPropertySymbol(
         get() = withValidityAssertion { descriptor.setter != null }
 
     override val callableIdIfNonLocal: CallableId?
-        get() = withValidityAssertion { descriptor.callableId }
+        get() = withValidityAssertion { descriptor.callableIdIfNotLocal }
 
     override val initializer: KtConstantValue?
         get() = withValidityAssertion { descriptor.compileTimeInitializer?.toKtConstantValue() }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertyGetterSymbol.kt

@@ -47,7 +47,7 @@ internal class KtFe10DescPropertyGetterSymbol(
         get() = withValidityAssertion {
             val propertyDescriptor = descriptor.correspondingProperty
             return if (propertyDescriptor is SyntheticPropertyDescriptor) {
-                propertyDescriptor.getMethod.callableId
+                propertyDescriptor.getMethod.callableIdIfNotLocal
             } else {
                 null
             }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescPropertySetterSymbol.kt

@@ -50,7 +50,7 @@ internal class KtFe10DescPropertySetterSymbol(
         get() = withValidityAssertion {
             val propertyDescriptor = descriptor.correspondingProperty
             return if (propertyDescriptor is SyntheticPropertyDescriptor) {
-                propertyDescriptor.getMethod.callableId
+                propertyDescriptor.getMethod.callableIdIfNotLocal
             } else {
                 null
             }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSamConstructorSymbol.kt

@@ -36,7 +36,7 @@ internal class KtFe10DescSamConstructorSymbol(
         get() = withValidityAssertion { descriptor.ktHasStableParameterNames }
 
     override val callableIdIfNonLocal: CallableId?
-        get() = withValidityAssertion { descriptor.callableId }
+        get() = withValidityAssertion { descriptor.callableIdIfNotLocal }
 
     override val annotatedType: KtTypeAndAnnotations
         get() = withValidityAssertion { descriptor.returnTypeOrNothing.toKtTypeAndAnnotations(analysisContext) }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbol.kt

@@ -78,7 +78,7 @@ internal class KtFe10DescSyntheticJavaPropertySymbol(
         get() = withValidityAssertion { descriptor.compileTimeInitializer?.toKtConstantValue() }
 
     override val callableIdIfNonLocal: CallableId?
-        get() = withValidityAssertion { descriptor.callableId }
+        get() = withValidityAssertion { descriptor.callableIdIfNotLocal }
 
     override val annotatedType: KtTypeAndAnnotations
         get() = withValidityAssertion { descriptor.type.toKtTypeAndAnnotations(analysisContext) }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescSyntheticJavaPropertySymbolForOverride.kt

@@ -78,7 +78,7 @@ internal class KtFe10DescSyntheticJavaPropertySymbolForOverride(
         get() = withValidityAssertion { descriptor.compileTimeInitializer?.toKtConstantValue() }
 
     override val callableIdIfNonLocal: CallableId?
-        get() = withValidityAssertion { descriptor.callableId }
+        get() = withValidityAssertion { descriptor.callableIdIfNotLocal }
 
     override val annotatedType: KtTypeAndAnnotations
         get() = withValidityAssertion { descriptor.type.toKtTypeAndAnnotations(analysisContext) }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/base/Kt1DescUtils.kt

@@ -235,31 +235,39 @@ internal fun ConstantValue<*>.toKtConstantValue(): KtConstantValue {
     }
 }
 
-internal val CallableMemberDescriptor.callableId: CallableId?
+internal val CallableMemberDescriptor.callableIdIfNotLocal: CallableId?
-    get() {
+    get() = calculateCallableId(allowLocal = false)
-        var current: DeclarationDescriptor = containingDeclaration
 
-        val localName = mutableListOf<String>()
+internal fun CallableMemberDescriptor.calculateCallableId(allowLocal: Boolean): CallableId? {
-        val className = mutableListOf<String>()
+    var current: DeclarationDescriptor = containingDeclaration
 
-        while (true) {
+    val localName = mutableListOf<String>()
-            when (current) {
+    val className = mutableListOf<String>()
-                is PackageFragmentDescriptor -> {
+
-                    return CallableId(
+    while (true) {
-                        packageName = current.fqName,
+        when (current) {
-                        className = if (className.isNotEmpty()) FqName.fromSegments(className.asReversed()) else null,
+            is PackageFragmentDescriptor -> {
-                        callableName = name,
+                return CallableId(
-                        pathToLocal = if (localName.isNotEmpty()) FqName.fromSegments(localName.asReversed()) else null
+                    packageName = current.fqName,
-                    )
+                    className = if (className.isNotEmpty()) FqName.fromSegments(className.asReversed()) else null,
-                }
+                    callableName = name,
-                is ClassDescriptor -> className += current.name.asString()
+                    pathToLocal = if (localName.isNotEmpty()) FqName.fromSegments(localName.asReversed()) else null
-                is PropertyAccessorDescriptor -> {} // Filter out property accessors
+                )
-                is CallableDescriptor -> localName += current.name.asString()
             }
+            is ClassDescriptor -> className += current.name.asString()
+            is PropertyAccessorDescriptor -> {} // Filter out property accessors
+            is CallableDescriptor -> {
+                if (!allowLocal) {
+                    return null
+                }
 
-            current = current.containingDeclaration ?: return null
+                localName += current.name.asString()
+            }
         }
+
+        current = current.containingDeclaration ?: return null
     }
+}
 
 internal fun getSymbolDescriptor(symbol: KtSymbol): DeclarationDescriptor? {
     return when (symbol) {

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiEnumEntrySymbol.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10NeverRestoringSymbolPointer
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.KtFe10PsiSymbol
-import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.callableId
+import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.callableIdIfNonLocal
 import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.createErrorTypeAndAnnotations
 import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached
 import org.jetbrains.kotlin.analysis.api.symbols.KtEnumEntrySymbol
@@ -44,7 +44,7 @@ internal class KtFe10PsiEnumEntrySymbol(
         }
 
     override val callableIdIfNonLocal: CallableId?
-        get() = withValidityAssertion { psi.callableId }
+        get() = withValidityAssertion { psi.callableIdIfNonLocal }
 
     override val annotatedType: KtTypeAndAnnotations
         get() = withValidityAssertion {

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiFunctionSymbol.kt

@@ -73,7 +73,7 @@ internal class KtFe10PsiFunctionSymbol(
         get() = withValidityAssertion { true }
 
     override val callableIdIfNonLocal: CallableId?
-        get() = withValidityAssertion { psi.callableId }
+        get() = withValidityAssertion { psi.callableIdIfNonLocal }
 
     override val annotatedType: KtTypeAndAnnotations
         get() = withValidityAssertion { descriptor?.returnType?.toKtTypeAndAnnotations(analysisContext) ?: createErrorTypeAndAnnotations() }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiKotlinPropertySymbol.kt

@@ -96,7 +96,7 @@ internal class KtFe10PsiKotlinPropertySymbol(
         get() = withValidityAssertion { !psi.isVar }
 
     override val callableIdIfNonLocal: CallableId?
-        get() = withValidityAssertion { psi.callableId }
+        get() = withValidityAssertion { psi.callableIdIfNonLocal }
 
     override val annotatedType: KtTypeAndAnnotations
         get() = withValidityAssertion { descriptor?.type?.toKtTypeAndAnnotations(analysisContext) ?: createErrorTypeAndAnnotations() }

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiPropertyGetterSymbol.kt

@@ -64,7 +64,7 @@ internal class KtFe10PsiPropertyGetterSymbol(
         get() = withValidityAssertion { true }
 
     override val callableIdIfNonLocal: CallableId?
-        get() = withValidityAssertion { psi.property.callableId }
+        get() = withValidityAssertion { psi.property.callableIdIfNonLocal }
 
     override val annotatedType: KtTypeAndAnnotations
         get() = withValidityAssertion {

analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/base/KtFe10PsiSymbolUtils.kt

@@ -68,34 +68,45 @@ internal val KtElement.ktSymbolKind: KtSymbolKind
         else -> KtSymbolKind.LOCAL
     }
 
-internal val KtDeclaration.callableId: CallableId?
+internal val KtDeclaration.callableIdIfNonLocal: CallableId?
-    get() {
+    get() = calculateCallableId(allowLocal = false)
-        val selfName = this.name ?: return null
-        val containingFile = this.containingKtFile
 
-        var current = this.getElementParentDeclaration()
+internal fun KtDeclaration.calculateCallableId(allowLocal: Boolean): CallableId? {
+    val selfName = this.name ?: return null
+    val containingFile = this.containingKtFile
 
-        val localName = mutableListOf<String>()
+    var current = this.getElementParentDeclaration()
-        val className = mutableListOf<String>()
 
-        while (current != null) {
+    val localName = mutableListOf<String>()
-            when (current) {
+    val className = mutableListOf<String>()
-                is KtClassOrObject -> className += current.name ?: return null
+
-                is KtPropertyAccessor -> {} // Filter out property accessors
+    while (current != null) {
-                is KtCallableDeclaration -> localName += current.name ?: return null
+        when (current) {
+            is KtClassOrObject -> {
+                className += current.name ?: return null
+            }
+            is KtPropertyAccessor -> {
+                // Filter out property accessors
+            }
+            is KtCallableDeclaration -> {
+                if (!allowLocal) {
+                    return null
+                }
+                localName += current.name ?: return null
             }
-
-            current = current.getElementParentDeclaration()
         }
 
-        return CallableId(
+        current = current.getElementParentDeclaration()
-            packageName = containingFile.packageFqName,
-            className = if (className.isNotEmpty()) FqName.fromSegments(className.asReversed()) else null,
-            callableName = Name.identifier(selfName),
-            pathToLocal = if (localName.isNotEmpty()) FqName.fromSegments(localName.asReversed()) else null
-        )
     }
 
+    return CallableId(
+        packageName = containingFile.packageFqName,
+        className = if (className.isNotEmpty()) FqName.fromSegments(className.asReversed()) else null,
+        callableName = Name.identifier(selfName),
+        pathToLocal = if (localName.isNotEmpty()) FqName.fromSegments(localName.asReversed()) else null
+    )
+}
+
 internal fun PsiElement.getResolutionScope(bindingContext: BindingContext): LexicalScope? {
     for (parent in parentsWithSelf) {
         if (parent is KtElement) {