[LL API] Adjust services required by LLFirBuiltinsSessionFactory
As 'initialiseVirtualFileFinderServices()' that is run during test initialization collects transitive dependencies, all of them must be ready. However, 'KtNotUnderContentRootModuleForTest' has a built-in dependency provided by 'LLFirBuiltinsSessionFactory'.
This commit is contained in:
+7
-6
@@ -103,9 +103,15 @@ object StandaloneProjectFactory {
|
||||
val javaModuleGraph = JavaModuleGraph(javaModuleFinder)
|
||||
|
||||
val allSourceFileRoots = sourceFiles.map { JavaRoot(it.virtualFile, JavaRoot.RootType.SOURCE) }
|
||||
val libraryRoots = getAllBinaryRoots(modules, environment)
|
||||
val jdkRoots = getDefaultJdkModuleRoots(javaModuleFinder, javaModuleGraph)
|
||||
|
||||
project.registerService(
|
||||
JavaModuleResolver::class.java,
|
||||
CliJavaModuleResolver(javaModuleGraph, emptyList(), javaModuleFinder.systemModules.toList(), project)
|
||||
)
|
||||
|
||||
val libraryRoots = getAllBinaryRoots(modules, environment)
|
||||
|
||||
val rootsWithSingleJavaFileRoots = buildList {
|
||||
addAll(libraryRoots)
|
||||
addAll(allSourceFileRoots)
|
||||
@@ -148,11 +154,6 @@ object StandaloneProjectFactory {
|
||||
true
|
||||
)
|
||||
|
||||
project.registerService(
|
||||
JavaModuleResolver::class.java,
|
||||
CliJavaModuleResolver(javaModuleGraph, emptyList(), javaModuleFinder.systemModules.toList(), project)
|
||||
)
|
||||
|
||||
val finderFactory = CliVirtualFileFinderFactory(rootsIndex, false)
|
||||
|
||||
project.registerService(MetadataFinderFactory::class.java, finderFactory)
|
||||
|
||||
Reference in New Issue
Block a user