azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modularized tests. Fix java source scope for light tree mode

Browse Source 
We should use appropriate java source scope for java files,
not kotlin files

^KT-56075
This commit is contained in:
Simon Ogorodnik
2023-02-03 17:35:14 +01:00
committed by Space Team
parent 233469d249
commit 36c3d62ba1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
+1 -1
View File
@@ -132,7 +132,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractFrontendModularizedTest() {
val (sourceFiles: Collection<KtSourceFile>, scope) = val (sourceFiles: Collection<KtSourceFile>, scope) =
if (USE_LIGHT_TREE) { if (USE_LIGHT_TREE) {
val (platformSources, _) = collectSources(environment.configuration, projectEnvironment, environment.messageCollector) val (platformSources, _) = collectSources(environment.configuration, projectEnvironment, environment.messageCollector)
platformSources to projectEnvironment.getSearchScopeBySourceFiles(platformSources) platformSources to projectEnvironment.getSearchScopeForProjectJavaSources()
} else { } else {
val ktFiles = environment.getSourceFiles() val ktFiles = environment.getSourceFiles()
ktFiles.map { KtPsiSourceFile(it) } to ktFiles.map { KtPsiSourceFile(it) } to
compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/fir/FirTestSessionFactoryHelper.kt
+3 -3
View File
@@ -27,8 +27,8 @@ object FirTestSessionFactoryHelper {
@ObsoleteTestInfrastructure @ObsoleteTestInfrastructure
fun createSessionForTests( fun createSessionForTests(
projectEnvironment: AbstractProjectEnvironment, projectEnvironment: AbstractProjectEnvironment,
sourceScope: AbstractProjectFileSearchScope, javaSourceScope: AbstractProjectFileSearchScope,
librariesScope: AbstractProjectFileSearchScope = !sourceScope, librariesScope: AbstractProjectFileSearchScope = !javaSourceScope,
moduleName: String = "TestModule", moduleName: String = "TestModule",
friendsPaths: List<Path> = emptyList(), friendsPaths: List<Path> = emptyList(),
languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT
@@ -39,7 +39,7 @@ object FirTestSessionFactoryHelper {
externalSessionProvider = null, externalSessionProvider = null,
projectEnvironment, projectEnvironment,
languageVersionSettings, languageVersionSettings,
sourceScope, javaSourceScope,
librariesScope, librariesScope,
lookupTracker = null, lookupTracker = null,
enumWhenTracker = null, enumWhenTracker = null,