[AA] Add KotlinPackageProviderMerger

- In parallel to Kotlin declaration provider merging, we need a proper
  merging strategy for package providers as well, because resolve
  extensions may define additional package providers.
- Additionally, other non-scope-based package providers may be added in
  the future, and the merger preserves these out of the box.

^KT-61791
This commit is contained in:
Marco Pennekamp
2023-10-10 13:17:40 +02:00
committed by Space Team
parent c63dde4f7e
commit b9e3d848a6
12 changed files with 75 additions and 45 deletions
@@ -99,6 +99,7 @@ object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() {
KotlinPackageProviderFactory::class.java,
KotlinStaticPackageProviderFactory(project, allSourceKtFiles + ktFilesForBinaries)
)
registerService(KotlinPackageProviderMerger::class.java, KotlinStaticPackageProviderMerger(project))
registerService(KotlinResolutionScopeProvider::class.java, KotlinByModulesResolutionScopeProvider::class.java)
}
}