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

[Analysis API] move KtResolveExtensionProvider EP registration to common code

Browse Source 
so it can be used from standalone mode
This commit is contained in:
Ilya Kirillov
2023-05-11 14:45:50 +02:00
committed by Space Team
parent b585d7c392
commit 9f2d750f98
2 changed files with 12 additions and 10 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
+1 -10
View File
@@ -5,14 +5,12 @@
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 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.resolve.extensions.KtResolveExtensionProvider
import org.jetbrains.kotlin.analysis.api.standalone.base.project.structure.StandaloneProjectFactory
import org.jetbrains.kotlin.analysis.decompiler.psi.BuiltInDefinitionFile
import org.jetbrains.kotlin.analysis.project.structure.KtModuleScopeProvider
@@ -27,14 +25,7 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.services.TestServices
object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() {
override fun registerProjectExtensionPoints(project: MockProject, testServices: TestServices) {
@Suppress("UnstableApiUsage")
CoreApplicationEnvironment.registerExtensionPoint(
project.extensionArea,
KtResolveExtensionProvider.EP_NAME.name,
KtResolveExtensionProvider::class.java
)
}
override fun registerProjectExtensionPoints(project: MockProject, testServices: TestServices) {}
@OptIn(KtAnalysisApiInternals::class)
override fun registerProjectServices(project: MockProject, testServices: TestServices) {
analysis/analysis-api-standalone/analysis-api-standalone-base/src/org/jetbrains/kotlin/analysis/api/standalone/base/project/structure/StandaloneProjectFactory.kt
+11
View File
@@ -26,6 +26,7 @@ import com.intellij.psi.search.ProjectScope
import com.intellij.util.io.URLUtil.JAR_PROTOCOL
import com.intellij.util.io.URLUtil.JAR_SEPARATOR
import org.jetbrains.kotlin.analysis.api.impl.base.java.source.JavaElementSourceWithSmartPointerFactory
import org.jetbrains.kotlin.analysis.api.resolve.extensions.KtResolveExtensionProvider
import org.jetbrains.kotlin.analysis.project.structure.*
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.cli.jvm.compiler.*
@@ -59,10 +60,20 @@ object StandaloneProjectFactory {
registerApplicationExtensionPoints(applicationEnvironment, applicationDisposable)
return KotlinCoreProjectEnvironment(projectDisposable, applicationEnvironment).apply {
registerProjectServices(project)
registerJavaPsiFacade(project)
}
}
private fun registerProjectServices(project: MockProject) {
@Suppress("UnstableApiUsage")
CoreApplicationEnvironment.registerExtensionPoint(
project.extensionArea,
KtResolveExtensionProvider.EP_NAME.name,
KtResolveExtensionProvider::class.java
)
}
private fun registerApplicationExtensionPoints(
applicationEnvironment: KotlinCoreApplicationEnvironment,
applicationDisposable: Disposable,