Minor: rename files to source files in configurators for standalone mode
KT-59793
This commit is contained in:
committed by
teamcity
parent
14eef4c7fe
commit
c0c234e1d2
+4
-4
@@ -68,14 +68,14 @@ object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() {
|
|||||||
|
|
||||||
override fun registerProjectModelServices(project: MockProject, testServices: TestServices) {
|
override fun registerProjectModelServices(project: MockProject, testServices: TestServices) {
|
||||||
val moduleStructure = testServices.ktModuleProvider.getModuleStructure()
|
val moduleStructure = testServices.ktModuleProvider.getModuleStructure()
|
||||||
val allKtFiles = moduleStructure.mainModules.flatMap { it.files.filterIsInstance<KtFile>() }
|
val allSourceKtFiles = moduleStructure.mainModules.flatMap { it.files.filterIsInstance<KtFile>() }
|
||||||
val roots = StandaloneProjectFactory.getVirtualFilesForLibraryRoots(
|
val roots = StandaloneProjectFactory.getVirtualFilesForLibraryRoots(
|
||||||
moduleStructure.binaryModules.flatMap { binary -> binary.getBinaryRoots() },
|
moduleStructure.binaryModules.flatMap { binary -> binary.getBinaryRoots() },
|
||||||
testServices.environmentManager.getProjectEnvironment()
|
testServices.environmentManager.getProjectEnvironment()
|
||||||
).distinct()
|
).distinct()
|
||||||
project.apply {
|
project.apply {
|
||||||
registerService(KtModuleScopeProvider::class.java, KtModuleScopeProviderImpl())
|
registerService(KtModuleScopeProvider::class.java, KtModuleScopeProviderImpl())
|
||||||
registerService(KotlinAnnotationsResolverFactory::class.java, KotlinStaticAnnotationsResolverFactory(allKtFiles))
|
registerService(KotlinAnnotationsResolverFactory::class.java, KotlinStaticAnnotationsResolverFactory(allSourceKtFiles))
|
||||||
|
|
||||||
val filter = BuiltInDefinitionFile.FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES
|
val filter = BuiltInDefinitionFile.FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES
|
||||||
val ktFilesForBinaries: List<KtFile>
|
val ktFilesForBinaries: List<KtFile>
|
||||||
@@ -83,7 +83,7 @@ object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() {
|
|||||||
BuiltInDefinitionFile.FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES = false
|
BuiltInDefinitionFile.FILTER_OUT_CLASSES_EXISTING_AS_JVM_CLASS_FILES = false
|
||||||
val declarationProviderFactory = KotlinStaticDeclarationProviderFactory(
|
val declarationProviderFactory = KotlinStaticDeclarationProviderFactory(
|
||||||
project,
|
project,
|
||||||
allKtFiles,
|
allSourceKtFiles,
|
||||||
additionalRoots = roots,
|
additionalRoots = roots,
|
||||||
skipBuiltins = testServices.moduleStructure.allDirectives.contains(NO_RUNTIME),
|
skipBuiltins = testServices.moduleStructure.allDirectives.contains(NO_RUNTIME),
|
||||||
)
|
)
|
||||||
@@ -97,7 +97,7 @@ object AnalysisApiBaseTestServiceRegistrar: AnalysisApiTestServiceRegistrar() {
|
|||||||
registerService(KotlinDeclarationProviderMerger::class.java, KotlinStaticDeclarationProviderMerger(project))
|
registerService(KotlinDeclarationProviderMerger::class.java, KotlinStaticDeclarationProviderMerger(project))
|
||||||
registerService(
|
registerService(
|
||||||
KotlinPackageProviderFactory::class.java,
|
KotlinPackageProviderFactory::class.java,
|
||||||
KotlinStaticPackageProviderFactory(project, allKtFiles + ktFilesForBinaries)
|
KotlinStaticPackageProviderFactory(project, allSourceKtFiles + ktFilesForBinaries)
|
||||||
)
|
)
|
||||||
registerService(KotlinResolutionScopeProvider::class.java, KotlinByModulesResolutionScopeProvider::class.java)
|
registerService(KotlinResolutionScopeProvider::class.java, KotlinByModulesResolutionScopeProvider::class.java)
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-6
@@ -111,7 +111,7 @@ public class StandaloneAnalysisAPISessionBuilder(
|
|||||||
|
|
||||||
@OptIn(KtAnalysisApiInternals::class)
|
@OptIn(KtAnalysisApiInternals::class)
|
||||||
private fun registerProjectServices(
|
private fun registerProjectServices(
|
||||||
ktFiles: List<KtFile>,
|
sourceKtFiles: List<KtFile>,
|
||||||
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
|
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
|
||||||
) {
|
) {
|
||||||
val project = kotlinCoreProjectEnvironment.project
|
val project = kotlinCoreProjectEnvironment.project
|
||||||
@@ -126,11 +126,11 @@ public class StandaloneAnalysisAPISessionBuilder(
|
|||||||
registerService(KotlinGlobalModificationService::class.java, KotlinStaticGlobalModificationService::class.java)
|
registerService(KotlinGlobalModificationService::class.java, KotlinStaticGlobalModificationService::class.java)
|
||||||
|
|
||||||
registerService(KtModuleScopeProvider::class.java, KtModuleScopeProviderImpl())
|
registerService(KtModuleScopeProvider::class.java, KtModuleScopeProviderImpl())
|
||||||
registerService(KotlinAnnotationsResolverFactory::class.java, KotlinStaticAnnotationsResolverFactory(ktFiles))
|
registerService(KotlinAnnotationsResolverFactory::class.java, KotlinStaticAnnotationsResolverFactory(sourceKtFiles))
|
||||||
registerService(KotlinResolutionScopeProvider::class.java, KotlinByModulesResolutionScopeProvider::class.java)
|
registerService(KotlinResolutionScopeProvider::class.java, KotlinByModulesResolutionScopeProvider::class.java)
|
||||||
val declarationProviderFactory = KotlinStaticDeclarationProviderFactory(
|
val declarationProviderFactory = KotlinStaticDeclarationProviderFactory(
|
||||||
this,
|
this,
|
||||||
ktFiles,
|
sourceKtFiles,
|
||||||
kotlinCoreProjectEnvironment.environment.jarFileSystem as CoreJarFileSystem
|
kotlinCoreProjectEnvironment.environment.jarFileSystem as CoreJarFileSystem
|
||||||
)
|
)
|
||||||
registerService(
|
registerService(
|
||||||
@@ -140,7 +140,7 @@ public class StandaloneAnalysisAPISessionBuilder(
|
|||||||
registerService(KotlinDeclarationProviderMerger::class.java, KotlinStaticDeclarationProviderMerger(this))
|
registerService(KotlinDeclarationProviderMerger::class.java, KotlinStaticDeclarationProviderMerger(this))
|
||||||
registerService(
|
registerService(
|
||||||
KotlinPackageProviderFactory::class.java,
|
KotlinPackageProviderFactory::class.java,
|
||||||
KotlinStaticPackageProviderFactory(project, ktFiles + declarationProviderFactory.getAdditionalCreatedKtFiles())
|
KotlinStaticPackageProviderFactory(project, sourceKtFiles + declarationProviderFactory.getAdditionalCreatedKtFiles())
|
||||||
)
|
)
|
||||||
|
|
||||||
registerService(
|
registerService(
|
||||||
@@ -195,7 +195,7 @@ public class StandaloneAnalysisAPISessionBuilder(
|
|||||||
projectStructureProvider,
|
projectStructureProvider,
|
||||||
)
|
)
|
||||||
val project = kotlinCoreProjectEnvironment.project
|
val project = kotlinCoreProjectEnvironment.project
|
||||||
val ktFiles = projectStructureProvider.allSourceFiles.filterIsInstance<KtFile>()
|
val sourceKtFiles = projectStructureProvider.allSourceFiles.filterIsInstance<KtFile>()
|
||||||
val libraryRoots = StandaloneProjectFactory.getAllBinaryRoots(
|
val libraryRoots = StandaloneProjectFactory.getAllBinaryRoots(
|
||||||
projectStructureProvider.allKtModules,
|
projectStructureProvider.allKtModules,
|
||||||
kotlinCoreProjectEnvironment,
|
kotlinCoreProjectEnvironment,
|
||||||
@@ -206,7 +206,7 @@ public class StandaloneAnalysisAPISessionBuilder(
|
|||||||
libraryRoots,
|
libraryRoots,
|
||||||
)
|
)
|
||||||
registerProjectServices(
|
registerProjectServices(
|
||||||
ktFiles,
|
sourceKtFiles,
|
||||||
createPackagePartProvider,
|
createPackagePartProvider,
|
||||||
)
|
)
|
||||||
if (withPsiDeclarationFromBinaryModuleProvider) {
|
if (withPsiDeclarationFromBinaryModuleProvider) {
|
||||||
|
|||||||
+7
-7
@@ -100,14 +100,14 @@ public fun configureProjectEnvironment(
|
|||||||
compilerConfig: CompilerConfiguration,
|
compilerConfig: CompilerConfiguration,
|
||||||
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
|
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
|
||||||
) {
|
) {
|
||||||
val ktFiles = getPsiFilesFromPaths<KtFile>(project, getSourceFilePaths(compilerConfig))
|
val sourceKtFiles = getPsiFilesFromPaths<KtFile>(project, getSourceFilePaths(compilerConfig))
|
||||||
configureProjectEnvironment(project, compilerConfig, ktFiles, packagePartProvider)
|
configureProjectEnvironment(project, compilerConfig, sourceKtFiles, packagePartProvider)
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun configureProjectEnvironment(
|
internal fun configureProjectEnvironment(
|
||||||
project: MockProject,
|
project: MockProject,
|
||||||
compilerConfig: CompilerConfiguration,
|
compilerConfig: CompilerConfiguration,
|
||||||
ktFiles: List<KtFile>,
|
sourceKtFiles: List<KtFile>,
|
||||||
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
|
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
|
||||||
) {
|
) {
|
||||||
reRegisterJavaElementFinder(project)
|
reRegisterJavaElementFinder(project)
|
||||||
@@ -135,7 +135,7 @@ internal fun configureProjectEnvironment(
|
|||||||
|
|
||||||
project.registerService(
|
project.registerService(
|
||||||
KotlinAnnotationsResolverFactory::class.java,
|
KotlinAnnotationsResolverFactory::class.java,
|
||||||
KotlinStaticAnnotationsResolverFactory(ktFiles)
|
KotlinStaticAnnotationsResolverFactory(sourceKtFiles)
|
||||||
)
|
)
|
||||||
|
|
||||||
project.registerService(
|
project.registerService(
|
||||||
@@ -161,12 +161,12 @@ internal fun configureProjectEnvironment(
|
|||||||
KtModuleScopeProviderImpl()
|
KtModuleScopeProviderImpl()
|
||||||
)
|
)
|
||||||
|
|
||||||
val projectStructureProvider = buildKtModuleProviderByCompilerConfiguration(compilerConfig, project, ktFiles)
|
val projectStructureProvider = buildKtModuleProviderByCompilerConfiguration(compilerConfig, project, sourceKtFiles)
|
||||||
project.registerService(
|
project.registerService(
|
||||||
ProjectStructureProvider::class.java,
|
ProjectStructureProvider::class.java,
|
||||||
projectStructureProvider,
|
projectStructureProvider,
|
||||||
)
|
)
|
||||||
val declarationProviderFactory = KotlinStaticDeclarationProviderFactory(project, ktFiles)
|
val declarationProviderFactory = KotlinStaticDeclarationProviderFactory(project, sourceKtFiles)
|
||||||
project.registerService(
|
project.registerService(
|
||||||
KotlinModuleDependentsProvider::class.java,
|
KotlinModuleDependentsProvider::class.java,
|
||||||
KtStaticModuleDependentsProvider(projectStructureProvider.allKtModules),
|
KtStaticModuleDependentsProvider(projectStructureProvider.allKtModules),
|
||||||
@@ -182,7 +182,7 @@ internal fun configureProjectEnvironment(
|
|||||||
)
|
)
|
||||||
project.registerService(
|
project.registerService(
|
||||||
KotlinPackageProviderFactory::class.java,
|
KotlinPackageProviderFactory::class.java,
|
||||||
KotlinStaticPackageProviderFactory(project, ktFiles + declarationProviderFactory.getAdditionalCreatedKtFiles())
|
KotlinStaticPackageProviderFactory(project, sourceKtFiles + declarationProviderFactory.getAdditionalCreatedKtFiles())
|
||||||
)
|
)
|
||||||
project.registerService(
|
project.registerService(
|
||||||
PackagePartProviderFactory::class.java,
|
PackagePartProviderFactory::class.java,
|
||||||
|
|||||||
Reference in New Issue
Block a user