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

[K2 AA] fix symbolKind for nested local classes

Browse Source 
^KT-54311
This commit is contained in:
Dmitrii Gridin
2022-10-10 19:44:33 +02:00
committed by Space Team
parent 027899a22a
commit f7568cef5c
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt
+4 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@@ -14,17 +14,16 @@ import org.jetbrains.kotlin.analysis.api.fir.findPsi
import org.jetbrains.kotlin.analysis.api.fir.symbols.pointers.KtFirClassOrObjectInLibrarySymbolPointer
import org.jetbrains.kotlin.analysis.api.fir.utils.cached
import org.jetbrains.kotlin.analysis.api.impl.base.symbols.toKtClassKind
import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
import org.jetbrains.kotlin.analysis.api.symbols.KtClassKind
import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol
import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolKind
import org.jetbrains.kotlin.analysis.api.symbols.pointers.CanNotCreateSymbolPointerForLocalLibraryDeclarationException
import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtPsiBasedSymbolPointer
import org.jetbrains.kotlin.analysis.api.symbols.pointers.KtSymbolPointer
import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
import org.jetbrains.kotlin.analysis.api.types.KtType
import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirResolveSession
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.Visibility
@@ -103,8 +102,8 @@ internal class KtFirNamedClassOrObjectSymbol(
override val symbolKind: KtSymbolKind
get() = withValidityAssertion {
when {
firSymbol.isLocal -> KtSymbolKind.LOCAL
firSymbol.classId.isNestedClass -> KtSymbolKind.CLASS_MEMBER
firSymbol.isLocal -> KtSymbolKind.LOCAL
else -> KtSymbolKind.TOP_LEVEL
}
}
analysis/analysis-api/testData/symbols/symbolByPsi/outerAndInnerClasses.txt
Vendored
+3 -3
View File
@@ -143,7 +143,7 @@ KtNamedClassOrObjectSymbol:
superTypes: [
kotlin/Any
]
symbolKind: LOCAL
symbolKind: CLASS_MEMBER
typeParameters: [
KtTypeParameterSymbol(T5)
]
@@ -181,7 +181,7 @@ KtNamedClassOrObjectSymbol:
superTypes: [
kotlin/Any
]
symbolKind: LOCAL
symbolKind: CLASS_MEMBER
typeParameters: [
KtTypeParameterSymbol(T6)
]
@@ -206,7 +206,7 @@ KtNamedClassOrObjectSymbol:
superTypes: [
kotlin/Any
]
symbolKind: LOCAL
symbolKind: CLASS_MEMBER
typeParameters: [
KtTypeParameterSymbol(T4)
]