K2: remove dependency fir-deserialization -> compiler.common.jvm
- Rename DeserializedClassConfigurator -> FirDeserializationExtension to abstract the existing behavior (about the Serializable supertype), as well as any future JVM-specific deserialization behavior. - Rename JvmDeserializedClassConfigurator -> FirJvmDeserializationExtension and move it to fir:java.
This commit is contained in:
committed by
Space Team
parent
6943d03883
commit
3e313bca78
+17
-12
@@ -14,21 +14,30 @@ import com.intellij.psi.stubs.StubTreeLoader
|
||||
import com.intellij.psi.util.PsiUtilCore
|
||||
import org.jetbrains.kotlin.KtFakeSourceElement
|
||||
import org.jetbrains.kotlin.KtRealPsiSourceElement
|
||||
import org.jetbrains.kotlin.descriptors.*
|
||||
import org.jetbrains.kotlin.descriptors.ClassKind
|
||||
import org.jetbrains.kotlin.descriptors.Modality
|
||||
import org.jetbrains.kotlin.descriptors.Visibilities
|
||||
import org.jetbrains.kotlin.descriptors.Visibility
|
||||
import org.jetbrains.kotlin.fir.*
|
||||
import org.jetbrains.kotlin.fir.builder.createDataClassCopyFunction
|
||||
import org.jetbrains.kotlin.fir.declarations.*
|
||||
import org.jetbrains.kotlin.fir.declarations.builder.*
|
||||
import org.jetbrains.kotlin.fir.declarations.builder.buildOuterClassTypeParameterRef
|
||||
import org.jetbrains.kotlin.fir.declarations.builder.buildRegularClass
|
||||
import org.jetbrains.kotlin.fir.declarations.comparators.FirMemberDeclarationComparator
|
||||
import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl
|
||||
import org.jetbrains.kotlin.fir.declarations.utils.*
|
||||
import org.jetbrains.kotlin.fir.deserialization.*
|
||||
import org.jetbrains.kotlin.fir.declarations.utils.addDeclaration
|
||||
import org.jetbrains.kotlin.fir.declarations.utils.isCompanion
|
||||
import org.jetbrains.kotlin.fir.declarations.utils.sourceElement
|
||||
import org.jetbrains.kotlin.fir.deserialization.addCloneForArrayIfNeeded
|
||||
import org.jetbrains.kotlin.fir.deserialization.deserializationExtension
|
||||
import org.jetbrains.kotlin.fir.resolve.transformers.setLazyPublishedVisibility
|
||||
import org.jetbrains.kotlin.fir.scopes.FirScopeProvider
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
|
||||
import org.jetbrains.kotlin.lexer.KtTokens
|
||||
import org.jetbrains.kotlin.name.*
|
||||
import org.jetbrains.kotlin.name.ClassId
|
||||
import org.jetbrains.kotlin.name.Name
|
||||
import org.jetbrains.kotlin.name.StandardClassIds
|
||||
import org.jetbrains.kotlin.psi.*
|
||||
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
|
||||
import org.jetbrains.kotlin.utils.exceptions.errorWithAttachment
|
||||
@@ -229,8 +238,8 @@ internal fun deserializeClassToSymbol(
|
||||
}
|
||||
|
||||
addCloneForArrayIfNeeded(classId, context.dispatchReceiver, session)
|
||||
session.deserializedClassConfigurator?.run {
|
||||
configure(classId)
|
||||
session.deserializationExtension?.run {
|
||||
configureDeserializedClass(classId)
|
||||
}
|
||||
|
||||
declarations.sortWith(object : Comparator<FirDeclaration> {
|
||||
@@ -257,14 +266,10 @@ internal fun deserializeClassToSymbol(
|
||||
|
||||
replaceDeprecationsProvider(getDeprecationsProvider(session))
|
||||
|
||||
session.deserializedClassConfigurator?.run {
|
||||
configure(classId)
|
||||
}
|
||||
|
||||
setLazyPublishedVisibility(
|
||||
hasPublishedApi = classOrObject.annotationEntries.any { context.annotationDeserializer.getAnnotationClassId(it) == StandardClassIds.Annotations.PublishedApi },
|
||||
parentProperty = null,
|
||||
session
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user