From 3caa1d13492fef61a47132c17475dcde02a47624 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 27 Apr 2023 20:12:20 +0200 Subject: [PATCH] Refactoring: fix usages of @TestOnly ExtensionsArea.registerExtensionPoint --- .../AnalysisApiBaseTestServiceRegistrar.kt | 20 +++++++------------ .../ApplicationExtensionDescriptor.kt | 11 +++++----- .../extensions/ProjectExtensionDescriptor.kt | 9 ++++----- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt index 2804bba9393..bbc4fb64f26 100644 --- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt +++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt @@ -5,18 +5,15 @@ package org.jetbrains.kotlin.analysis.api.impl.base.test.configurators +import com.intellij.core.CoreApplicationEnvironment import com.intellij.mock.MockApplication import com.intellij.mock.MockProject -import com.intellij.openapi.extensions.ExtensionPoint import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals import org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService import org.jetbrains.kotlin.analysis.api.lifetime.KtDefaultLifetimeTokenProvider import org.jetbrains.kotlin.analysis.api.lifetime.KtReadActionConfinementDefaultLifetimeTokenProvider -import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.StandaloneProjectFactory -import org.jetbrains.kotlin.analysis.decompiler.stub.file.ClsKotlinBinaryClassCache -import org.jetbrains.kotlin.analysis.decompiler.stub.file.FileAttributeService -import org.jetbrains.kotlin.analysis.decompiler.stub.files.DummyFileAttributeService import org.jetbrains.kotlin.analysis.api.resolve.extensions.KtResolveExtensionProvider +import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.StandaloneProjectFactory import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProvider import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProviderImpl import org.jetbrains.kotlin.analysis.providers.* @@ -31,14 +28,11 @@ import org.jetbrains.kotlin.test.services.TestServices object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() { override fun registerProjectExtensionPoints(project: MockProject, testServices: TestServices) { @Suppress("UnstableApiUsage") - project.extensionArea.apply { - registerExtensionPoint( - KtResolveExtensionProvider.EP_NAME.name, - KtResolveExtensionProvider::class.java.name, - ExtensionPoint.Kind.INTERFACE, - false - ) - } + CoreApplicationEnvironment.registerExtensionPoint( + project.extensionArea, + KtResolveExtensionProvider.EP_NAME.name, + KtResolveExtensionProvider::class.java + ) } @OptIn(KtAnalysisApiInternals::class) diff --git a/compiler/util/src/org/jetbrains/kotlin/extensions/ApplicationExtensionDescriptor.kt b/compiler/util/src/org/jetbrains/kotlin/extensions/ApplicationExtensionDescriptor.kt index 0a015d7afff..cfc70400e04 100644 --- a/compiler/util/src/org/jetbrains/kotlin/extensions/ApplicationExtensionDescriptor.kt +++ b/compiler/util/src/org/jetbrains/kotlin/extensions/ApplicationExtensionDescriptor.kt @@ -5,20 +5,19 @@ package org.jetbrains.kotlin.extensions +import com.intellij.core.CoreApplicationEnvironment import com.intellij.openapi.Disposable import com.intellij.openapi.application.ApplicationManager -import com.intellij.openapi.extensions.ExtensionPoint import com.intellij.openapi.extensions.ExtensionPointName open class ApplicationExtensionDescriptor(name: String, private val extensionClass: Class) { - val extensionPointName: ExtensionPointName = ExtensionPointName.create(name) + private val extensionPointName: ExtensionPointName = ExtensionPointName.create(name) fun registerExtensionPoint() { - ApplicationManager.getApplication().extensionArea.registerExtensionPoint( + CoreApplicationEnvironment.registerExtensionPoint( + ApplicationManager.getApplication().extensionArea, extensionPointName.name, - extensionClass.name, - ExtensionPoint.Kind.INTERFACE, - false + extensionClass ) } diff --git a/compiler/util/src/org/jetbrains/kotlin/extensions/ProjectExtensionDescriptor.kt b/compiler/util/src/org/jetbrains/kotlin/extensions/ProjectExtensionDescriptor.kt index aed9e197018..be32ade1dfc 100644 --- a/compiler/util/src/org/jetbrains/kotlin/extensions/ProjectExtensionDescriptor.kt +++ b/compiler/util/src/org/jetbrains/kotlin/extensions/ProjectExtensionDescriptor.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.extensions -import com.intellij.openapi.extensions.ExtensionPoint +import com.intellij.core.CoreApplicationEnvironment import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.project.Project @@ -13,11 +13,10 @@ open class ProjectExtensionDescriptor(name: String, private val extensi val extensionPointName: ExtensionPointName = ExtensionPointName.create(name) fun registerExtensionPoint(project: Project) { - project.extensionArea.registerExtensionPoint( + CoreApplicationEnvironment.registerExtensionPoint( + project.extensionArea, extensionPointName.name, - extensionClass.name, - ExtensionPoint.Kind.INTERFACE, - false + extensionClass ) }