From 81759e8c5530c355e68e0ae441885905eee15e46 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Thu, 12 Dec 2019 19:16:53 +0300 Subject: [PATCH] [FIR] Use proper sourceScope for modularized tests --- .../kotlin/fir/FirResolveModularizedTotalKotlinTest.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt index e7af9da0927..e5e036090cd 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt @@ -8,12 +8,14 @@ package org.jetbrains.kotlin.fir import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.util.Disposer import com.intellij.psi.PsiElementFinder +import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.ProjectScope import org.jetbrains.kotlin.asJava.finder.JavaElementFinder import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys.CONTENT_ROOTS import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.TopDownAnalyzerFacadeForJVM import org.jetbrains.kotlin.fir.builder.RawFirBuilder import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.dump.MultiModuleHtmlFirDump @@ -48,7 +50,9 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() { val project = environment.project val ktFiles = environment.getSourceFiles() - val scope = ProjectScope.getContentScope(project) + + val scope = GlobalSearchScope.filesScope(project, ktFiles.map { it.virtualFile }) + .uniteWith(TopDownAnalyzerFacadeForJVM.AllJavaSourcesInProjectScope(project)) val librariesScope = ProjectScope.getLibrariesScope(project) val session = createSession(environment, scope, librariesScope, moduleData.qualifiedName) val builder = RawFirBuilder(session, stubMode = false)