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

[AA] Make KotlinReferenceProvidersService and KotlinReferenceProviderContributor a project services

Browse Source 
There is no need to have those services on application level
This commit is contained in:
Dmitriy Novozhilov
2022-07-28 11:13:50 +03:00
parent 0909cad886
commit 7ef81c27df
8 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/references/HLApiReferenceProviderService.kt
+4 -3
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.analysis.api.impl.base.references
import com.intellij.openapi.project.Project
import com.intellij.psi.ContributedReferenceHost
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiReference
@@ -21,13 +22,13 @@ import org.jetbrains.kotlin.idea.references.KotlinReferenceProviderContributor
import org.jetbrains.kotlin.psi.KotlinReferenceProvidersService
import org.jetbrains.kotlin.utils.SmartList
class HLApiReferenceProviderService : KotlinReferenceProvidersService() {
class HLApiReferenceProviderService(val project: Project) : KotlinReferenceProvidersService() {
private val originalProvidersBinding: MultiMap<Class<out PsiElement>, KotlinPsiReferenceProvider>
private val providersBindingCache: Map<Class<out PsiElement>, List<KotlinPsiReferenceProvider>>
init {
val registrar = KotlinPsiReferenceRegistrar()
KotlinReferenceProviderContributor.getInstance().registerReferenceProviders(registrar)
KotlinReferenceProviderContributor.getInstance(project).registerReferenceProviders(registrar)
originalProvidersBinding = registrar.providers
providersBindingCache = ConcurrentFactoryMap.createMap<Class<out PsiElement>, List<KotlinPsiReferenceProvider>> { klass ->
@@ -69,4 +70,4 @@ class HLApiReferenceProviderService : KotlinReferenceProvidersService() {
)
}
}
}
}
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/configurators/AnalysisApiBaseTestServiceRegistrar.kt
+4 -9
View File
@@ -28,8 +28,7 @@ import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.services.TestServices
object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() {
override fun registerProjectExtensionPoints(project: MockProject, testServices: TestServices) {
}
override fun registerProjectExtensionPoints(project: MockProject, testServices: TestServices) {}
@OptIn(KtAnalysisApiInternals::class)
override fun registerProjectServices(project: MockProject, testServices: TestServices) {
@@ -43,13 +42,9 @@ object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() {
registerService(KotlinAnnotationsResolverFactory::class.java, KotlinStaticAnnotationsResolverFactory(allKtFiles))
registerService(KotlinDeclarationProviderFactory::class.java, KotlinStaticDeclarationProviderFactory(allKtFiles))
registerService(KotlinPackageProviderFactory::class.java, KotlinStaticPackageProviderFactory(allKtFiles))
}
}
override fun registerApplicationServices(application: MockApplication, testServices: TestServices) {
application.apply {
registerService(KotlinReferenceProvidersService::class.java, HLApiReferenceProviderService::class.java)
}
}
}
override fun registerApplicationServices(application: MockApplication, testServices: TestServices) {}
}