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 d77c7180318..fdc26f61bf4 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 @@ -34,9 +34,6 @@ import com.intellij.openapi.extensions.ExtensionsArea import com.intellij.openapi.fileTypes.PlainTextFileType import com.intellij.openapi.project.Project import com.intellij.openapi.util.Disposer -import com.intellij.openapi.util.JDOMUtil -import com.intellij.openapi.util.NotNullLazyValue -import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.io.FileUtilRt import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.vfs.* @@ -57,7 +54,6 @@ import org.jetbrains.kotlin.asJava.LightClassGenerationSupport import org.jetbrains.kotlin.asJava.classes.FacadeCache import org.jetbrains.kotlin.asJava.finder.JavaElementFinder import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension -import org.jetbrains.kotlin.backend.common.extensions.PureIrGenerationExtension import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.CliModuleVisibilityManagerImpl import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY @@ -108,10 +104,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFact import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService import org.jetbrains.kotlin.utils.PathUtil import java.io.File -import java.lang.reflect.Field -import java.lang.reflect.Modifier import java.util.zip.ZipFile -import javax.xml.stream.XMLInputFactory class KotlinCoreEnvironment private constructor( val projectEnvironment: JavaCoreProjectEnvironment, @@ -557,7 +550,8 @@ class KotlinCoreEnvironment private constructor( CollectAdditionalSourcesExtension.registerExtensionPoint(project) ExtraImportsProviderExtension.registerExtensionPoint(project) IrGenerationExtension.registerExtensionPoint(project) - PureIrGenerationExtension.registerExtensionPoint(project) + @Suppress("DEPRECATION_ERROR") + org.jetbrains.kotlin.backend.common.extensions.PureIrGenerationExtension.registerExtensionPoint(project) ScriptEvaluationExtension.registerExtensionPoint(project) ShellExtension.registerExtensionPoint(project) TypeResolutionInterceptor.registerExtensionPoint(project) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/extensions/IrGenerationExtension.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/extensions/IrGenerationExtension.kt index 39e37dd5726..5c8714f7928 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/extensions/IrGenerationExtension.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/extensions/IrGenerationExtension.kt @@ -11,10 +11,8 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor import org.jetbrains.kotlin.ir.builders.IrGeneratorContext -import org.jetbrains.kotlin.ir.declarations.IrDeclaration import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.ir.descriptors.IrBuiltIns -import org.jetbrains.kotlin.ir.symbols.IrSymbol import org.jetbrains.kotlin.ir.util.IrExtensionGenerator import org.jetbrains.kotlin.ir.util.SymbolTable import org.jetbrains.kotlin.ir.util.TypeTranslator @@ -41,9 +39,13 @@ interface IrGenerationExtension : IrExtensionGenerator { } // Extension point for plugins which run before any lowerings, but after the Ir has been constructed. +@Deprecated("This is a temporary class which will be replaced with another extension mechanism soon.", level = DeprecationLevel.ERROR) interface PureIrGenerationExtension { + @Suppress("DEPRECATION_ERROR") companion object : - ProjectExtensionDescriptor("org.jetbrains.kotlin.pureIrGenerationExtension", PureIrGenerationExtension::class.java) + ProjectExtensionDescriptor( + "org.jetbrains.kotlin.pureIrGenerationExtension", PureIrGenerationExtension::class.java + ) fun generate( moduleFragment: IrModuleFragment, diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt index ec1b6ab6f63..c41b02780b3 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmBackendFacade.kt @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.backend.jvm import org.jetbrains.kotlin.backend.common.CodegenUtil import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext -import org.jetbrains.kotlin.backend.common.extensions.PureIrGenerationExtension import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig import org.jetbrains.kotlin.backend.jvm.codegen.ClassCodegen import org.jetbrains.kotlin.backend.jvm.lower.MultifileFacadeFileEntry @@ -106,7 +105,8 @@ object JvmBackendFacade { context.typeMapper.mapType(context.referenceClass(descriptor).defaultType) } - for (extension in PureIrGenerationExtension.getInstances(state.project)) { + @Suppress("DEPRECATION_ERROR") + for (extension in org.jetbrains.kotlin.backend.common.extensions.PureIrGenerationExtension.getInstances(state.project)) { extension.generate(irModuleFragment, context) } diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableIrGeneratorExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableIrGeneratorExtension.kt index 5f8adfd8f32..a58bab9f029 100644 --- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableIrGeneratorExtension.kt +++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableIrGeneratorExtension.kt @@ -8,10 +8,10 @@ package org.jetbrains.kotlin.android.parcel import org.jetbrains.kotlin.android.parcel.ir.AndroidSymbols import org.jetbrains.kotlin.android.parcel.ir.ParcelableIrTransformer import org.jetbrains.kotlin.backend.common.CommonBackendContext -import org.jetbrains.kotlin.backend.common.extensions.PureIrGenerationExtension import org.jetbrains.kotlin.ir.declarations.IrModuleFragment -class ParcelableIrGeneratorExtension : PureIrGenerationExtension { +@Suppress("DEPRECATION_ERROR") +class ParcelableIrGeneratorExtension : org.jetbrains.kotlin.backend.common.extensions.PureIrGenerationExtension { override fun generate(moduleFragment: IrModuleFragment, context: CommonBackendContext) { ParcelableIrTransformer(context, AndroidSymbols(context, moduleFragment)).transform(moduleFragment) } diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidComponentRegistrar.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidComponentRegistrar.kt index 23e50e263f1..198d9a1d742 100644 --- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidComponentRegistrar.kt +++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidComponentRegistrar.kt @@ -30,7 +30,6 @@ import org.jetbrains.kotlin.android.synthetic.res.AndroidVariant import org.jetbrains.kotlin.android.synthetic.res.CliAndroidLayoutXmlFileManager import org.jetbrains.kotlin.android.synthetic.res.CliAndroidPackageFragmentProviderExtension import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension -import org.jetbrains.kotlin.backend.common.extensions.PureIrGenerationExtension import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension import org.jetbrains.kotlin.compiler.plugin.* @@ -41,8 +40,8 @@ import org.jetbrains.kotlin.container.useInstance import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor import org.jetbrains.kotlin.platform.TargetPlatform -import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension import org.jetbrains.kotlin.platform.jvm.isJvm +import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension import org.jetbrains.kotlin.utils.decodePluginOptions @@ -105,7 +104,10 @@ class AndroidComponentRegistrar : ComponentRegistrar { companion object { fun registerParcelExtensions(project: Project) { ExpressionCodegenExtension.registerExtension(project, ParcelableCodegenExtension()) - PureIrGenerationExtension.registerExtension(project, ParcelableIrGeneratorExtension()) + @Suppress("DEPRECATION_ERROR") + org.jetbrains.kotlin.backend.common.extensions.PureIrGenerationExtension.registerExtension( + project, ParcelableIrGeneratorExtension() + ) SyntheticResolveExtension.registerExtension(project, ParcelableResolveExtension()) ClassBuilderInterceptorExtension.registerExtension(project, ParcelableClinitClassBuilderInterceptorExtension()) }