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

Refactoring: fix usages of @TestOnly ExtensionsArea.registerExtensionPoint

Browse Source
This commit is contained in:
Nikolay Krasko
2023-04-27 20:12:20 +02:00
committed by Space Team
parent 6e18b75c73
commit 3caa1d1349
3 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt
+7 -13
View File
@@ -5,18 +5,15 @@
package org.jetbrains.kotlin.analysis.api.impl.base.test.configurators package org.jetbrains.kotlin.analysis.api.impl.base.test.configurators
import com.intellij.core.CoreApplicationEnvironment
import com.intellij.mock.MockApplication import com.intellij.mock.MockApplication
import com.intellij.mock.MockProject import com.intellij.mock.MockProject
import com.intellij.openapi.extensions.ExtensionPoint
import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals
import org.jetbrains.kotlin.analysis.api.impl.base.references.HLApiReferenceProviderService 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.KtDefaultLifetimeTokenProvider
import org.jetbrains.kotlin.analysis.api.lifetime.KtReadActionConfinementDefaultLifetimeTokenProvider 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.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.KtModuleScopeProvider
import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProviderImpl import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProviderImpl
import org.jetbrains.kotlin.analysis.providers.* import org.jetbrains.kotlin.analysis.providers.*
@@ -31,14 +28,11 @@ import org.jetbrains.kotlin.test.services.TestServices
object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() { object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() {
override fun registerProjectExtensionPoints(project: MockProject, testServices: TestServices) { override fun registerProjectExtensionPoints(project: MockProject, testServices: TestServices) {
@Suppress("UnstableApiUsage") @Suppress("UnstableApiUsage")
project.extensionArea.apply { CoreApplicationEnvironment.registerExtensionPoint(
registerExtensionPoint( project.extensionArea,
KtResolveExtensionProvider.EP_NAME.name, KtResolveExtensionProvider.EP_NAME.name,
KtResolveExtensionProvider::class.java.name, KtResolveExtensionProvider::class.java
ExtensionPoint.Kind.INTERFACE, )
false
)
}
} }
@OptIn(KtAnalysisApiInternals::class) @OptIn(KtAnalysisApiInternals::class)
compiler/util/src/org/jetbrains/kotlin/extensions/ApplicationExtensionDescriptor.kt
+5 -6
View File
@@ -5,20 +5,19 @@
package org.jetbrains.kotlin.extensions package org.jetbrains.kotlin.extensions
import com.intellij.core.CoreApplicationEnvironment
import com.intellij.openapi.Disposable import com.intellij.openapi.Disposable
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.extensions.ExtensionPoint
import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.extensions.ExtensionPointName
open class ApplicationExtensionDescriptor<T : Any>(name: String, private val extensionClass: Class<T>) { open class ApplicationExtensionDescriptor<T : Any>(name: String, private val extensionClass: Class<T>) {
val extensionPointName: ExtensionPointName<T> = ExtensionPointName.create(name) private val extensionPointName: ExtensionPointName<T> = ExtensionPointName.create(name)
fun registerExtensionPoint() { fun registerExtensionPoint() {
ApplicationManager.getApplication().extensionArea.registerExtensionPoint( CoreApplicationEnvironment.registerExtensionPoint(
ApplicationManager.getApplication().extensionArea,
extensionPointName.name, extensionPointName.name,
extensionClass.name, extensionClass
ExtensionPoint.Kind.INTERFACE,
false
) )
} }
compiler/util/src/org/jetbrains/kotlin/extensions/ProjectExtensionDescriptor.kt
+4 -5
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.extensions 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.extensions.ExtensionPointName
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
@@ -13,11 +13,10 @@ open class ProjectExtensionDescriptor<T : Any>(name: String, private val extensi
val extensionPointName: ExtensionPointName<T> = ExtensionPointName.create(name) val extensionPointName: ExtensionPointName<T> = ExtensionPointName.create(name)
fun registerExtensionPoint(project: Project) { fun registerExtensionPoint(project: Project) {
project.extensionArea.registerExtensionPoint( CoreApplicationEnvironment.registerExtensionPoint(
project.extensionArea,
extensionPointName.name, extensionPointName.name,
extensionClass.name, extensionClass
ExtensionPoint.Kind.INTERFACE,
false
) )
} }