Modularized tests. Fix java source scope for light tree mode
We should use appropriate java source scope for java files, not kotlin files ^KT-56075
This commit is contained in:
committed by
Space Team
parent
233469d249
commit
36c3d62ba1
+1
-1
@@ -132,7 +132,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractFrontendModularizedTest() {
|
||||
val (sourceFiles: Collection<KtSourceFile>, scope) =
|
||||
if (USE_LIGHT_TREE) {
|
||||
val (platformSources, _) = collectSources(environment.configuration, projectEnvironment, environment.messageCollector)
|
||||
platformSources to projectEnvironment.getSearchScopeBySourceFiles(platformSources)
|
||||
platformSources to projectEnvironment.getSearchScopeForProjectJavaSources()
|
||||
} else {
|
||||
val ktFiles = environment.getSourceFiles()
|
||||
ktFiles.map { KtPsiSourceFile(it) } to
|
||||
|
||||
+3
-3
@@ -27,8 +27,8 @@ object FirTestSessionFactoryHelper {
|
||||
@ObsoleteTestInfrastructure
|
||||
fun createSessionForTests(
|
||||
projectEnvironment: AbstractProjectEnvironment,
|
||||
sourceScope: AbstractProjectFileSearchScope,
|
||||
librariesScope: AbstractProjectFileSearchScope = !sourceScope,
|
||||
javaSourceScope: AbstractProjectFileSearchScope,
|
||||
librariesScope: AbstractProjectFileSearchScope = !javaSourceScope,
|
||||
moduleName: String = "TestModule",
|
||||
friendsPaths: List<Path> = emptyList(),
|
||||
languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT
|
||||
@@ -39,7 +39,7 @@ object FirTestSessionFactoryHelper {
|
||||
externalSessionProvider = null,
|
||||
projectEnvironment,
|
||||
languageVersionSettings,
|
||||
sourceScope,
|
||||
javaSourceScope,
|
||||
librariesScope,
|
||||
lookupTracker = null,
|
||||
enumWhenTracker = null,
|
||||
|
||||
Reference in New Issue
Block a user