From 6052962f5033a92d7bd277cc205425e9fcd3ddc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C5=BEe=20Sodja?= Date: Wed, 7 Sep 2022 16:53:59 +0200 Subject: [PATCH] Register AssignResolutionAltererExtension in KotlinCoreEnvironment --- .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt | 4 ++++ .../kotlin/extensions/internal/NonStableExtensionPoints.kt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 24962f14aaa..7ffa0f3abc2 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -69,6 +69,7 @@ import org.jetbrains.kotlin.compiler.plugin.registerInProject import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.extensions.* import org.jetbrains.kotlin.extensions.internal.CandidateInterceptor +import org.jetbrains.kotlin.extensions.internal.InternalNonStableExtensionPoints import org.jetbrains.kotlin.extensions.internal.TypeResolutionInterceptor import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter import org.jetbrains.kotlin.idea.KotlinFileType @@ -81,6 +82,7 @@ import org.jetbrains.kotlin.parsing.KotlinParserDefinition import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer import org.jetbrains.kotlin.resolve.ModuleAnnotationsResolver +import org.jetbrains.kotlin.resolve.extensions.AssignResolutionAltererExtension import org.jetbrains.kotlin.resolve.extensions.ExtraImportsProviderExtension import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade @@ -613,6 +615,7 @@ class KotlinCoreEnvironment private constructor( } @JvmStatic + @OptIn(InternalNonStableExtensionPoints::class) @Suppress("MemberVisibilityCanPrivate") // made public for CLI Android Lint fun registerPluginExtensionPoints(project: MockProject) { ExpressionCodegenExtension.registerExtensionPoint(project) @@ -638,6 +641,7 @@ class KotlinCoreEnvironment private constructor( DescriptorSerializerPlugin.registerExtensionPoint(project) FirExtensionRegistrarAdapter.registerExtensionPoint(project) TypeAttributeTranslatorExtension.registerExtensionPoint(project) + AssignResolutionAltererExtension.registerExtensionPoint(project) } internal fun registerExtensionsFromPlugins(project: MockProject, configuration: CompilerConfiguration) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/NonStableExtensionPoints.kt b/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/NonStableExtensionPoints.kt index f0f6047cf27..8672210bdf2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/NonStableExtensionPoints.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/extensions/internal/NonStableExtensionPoints.kt @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext */ @RequiresOptIn(level = RequiresOptIn.Level.ERROR) @Retention(AnnotationRetention.BINARY) -internal annotation class InternalNonStableExtensionPoints +annotation class InternalNonStableExtensionPoints @InternalNonStableExtensionPoints interface TypeResolutionInterceptorExtension {