[LL] Use package provider to check for existing package
KT-59793
This commit is contained in:
committed by
teamcity
parent
7884b5fecf
commit
ef6375f627
+10
-6
@@ -128,16 +128,20 @@ public class StandaloneAnalysisAPISessionBuilder(
|
||||
registerService(KtModuleScopeProvider::class.java, KtModuleScopeProviderImpl())
|
||||
registerService(KotlinAnnotationsResolverFactory::class.java, KotlinStaticAnnotationsResolverFactory(ktFiles))
|
||||
registerService(KotlinResolutionScopeProvider::class.java, KotlinByModulesResolutionScopeProvider::class.java)
|
||||
val declarationProviderFactory = KotlinStaticDeclarationProviderFactory(
|
||||
this,
|
||||
ktFiles,
|
||||
kotlinCoreProjectEnvironment.environment.jarFileSystem as CoreJarFileSystem
|
||||
)
|
||||
registerService(
|
||||
KotlinDeclarationProviderFactory::class.java,
|
||||
KotlinStaticDeclarationProviderFactory(
|
||||
this,
|
||||
ktFiles,
|
||||
kotlinCoreProjectEnvironment.environment.jarFileSystem as CoreJarFileSystem
|
||||
)
|
||||
declarationProviderFactory
|
||||
)
|
||||
registerService(KotlinDeclarationProviderMerger::class.java, KotlinStaticDeclarationProviderMerger(this))
|
||||
registerService(KotlinPackageProviderFactory::class.java, KotlinStaticPackageProviderFactory(project, ktFiles))
|
||||
registerService(
|
||||
KotlinPackageProviderFactory::class.java,
|
||||
KotlinStaticPackageProviderFactory(project, ktFiles + declarationProviderFactory.getAdditionalCreatedKtFiles())
|
||||
)
|
||||
|
||||
registerService(
|
||||
FirSealedClassInheritorsProcessorFactory::class.java,
|
||||
|
||||
+3
-2
@@ -166,6 +166,7 @@ internal fun configureProjectEnvironment(
|
||||
ProjectStructureProvider::class.java,
|
||||
projectStructureProvider,
|
||||
)
|
||||
val declarationProviderFactory = KotlinStaticDeclarationProviderFactory(project, ktFiles)
|
||||
project.registerService(
|
||||
KotlinModuleDependentsProvider::class.java,
|
||||
KtStaticModuleDependentsProvider(projectStructureProvider.allKtModules),
|
||||
@@ -173,7 +174,7 @@ internal fun configureProjectEnvironment(
|
||||
|
||||
project.registerService(
|
||||
KotlinDeclarationProviderFactory::class.java,
|
||||
KotlinStaticDeclarationProviderFactory(project, ktFiles)
|
||||
declarationProviderFactory
|
||||
)
|
||||
project.registerService(
|
||||
KotlinDeclarationProviderMerger::class.java,
|
||||
@@ -181,7 +182,7 @@ internal fun configureProjectEnvironment(
|
||||
)
|
||||
project.registerService(
|
||||
KotlinPackageProviderFactory::class.java,
|
||||
KotlinStaticPackageProviderFactory(project, ktFiles)
|
||||
KotlinStaticPackageProviderFactory(project, ktFiles + declarationProviderFactory.getAdditionalCreatedKtFiles())
|
||||
)
|
||||
project.registerService(
|
||||
PackagePartProviderFactory::class.java,
|
||||
|
||||
Reference in New Issue
Block a user