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

[Analysis API] cleanup the code

Browse Source
This commit is contained in:
Ilya Kirillov
2022-06-24 06:37:42 +02:00
parent da43062a46
commit 567cda9767
6 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/descriptorBased/KtFe10DescNamedClassOrObjectSymbol.kt
+2
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased
import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals
import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.*
import org.jetbrains.kotlin.analysis.api.descriptors.symbols.pointers.KtFe10DescNamedClassOrObjectSymbolSymbol
@@ -53,6 +54,7 @@ internal class KtFe10DescNamedClassOrObjectSymbol(
}
}
@OptIn(KtAnalysisApiInternals::class)
override val classKind: KtClassKind
get() = withValidityAssertion {
if (DescriptorUtils.isAnonymousObject(descriptor)) {
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/symbols/psiBased/KtFe10PsiNamedClassOrObjectSymbol.kt
+4 -3
View File
@@ -5,9 +5,9 @@
package org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased
import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals
import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisFacade.AnalysisMode
import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.getSupertypesWithAny
import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktModality
import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.ktVisibility
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktMod
import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktSymbolKind
import org.jetbrains.kotlin.analysis.api.descriptors.symbols.psiBased.base.ktVisibility
import org.jetbrains.kotlin.analysis.api.descriptors.utils.cached
import org.jetbrains.kotlin.analysis.api.impl.base.symbols.invalidClassKindError
import org.jetbrains.kotlin.analysis.api.impl.base.symbols.invalidEnumEntryAsClassKind
import org.jetbrains.kotlin.analysis.api.symbols.KtClassKind
import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KtTypeParameterSymbol
@@ -67,10 +67,11 @@ internal class KtFe10PsiNamedClassOrObjectSymbol(
KtFe10PsiNamedClassOrObjectSymbol(companionObject, analysisContext)
}
@OptIn(KtAnalysisApiInternals::class)
override val classKind: KtClassKind
get() = withValidityAssertion {
when (psi) {
is KtEnumEntry -> invalidClassKindError(ClassKind.ENUM_ENTRY)
is KtEnumEntry -> invalidEnumEntryAsClassKind()
is KtObjectDeclaration -> when {
psi.isCompanion() -> KtClassKind.COMPANION_OBJECT
psi.isObjectLiteral() -> KtClassKind.ANONYMOUS_OBJECT