diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt index a3e4a17e0a6..e660e103b8d 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt @@ -326,7 +326,7 @@ object KotlinToJVMBytecodeCompiler { val moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.project, environment.getModuleName()) - return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationWithCustomContext( + return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( moduleContext, environment.getSourceFiles(), sharedTrace, diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java index 6cc59106259..2b44d7f1207 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java @@ -58,25 +58,11 @@ public enum TopDownAnalyzerFacadeForJVM { INSTANCE; - @NotNull - public static AnalysisResult analyzeFilesWithJavaIntegrationWithCustomContext( - @NotNull ModuleContext moduleContext, - @NotNull Collection files, - @NotNull BindingTrace trace, - @NotNull CompilerConfiguration configuration, - @NotNull PackagePartProvider packagePartProvider - ) { - return analyzeFilesWithJavaIntegration( - moduleContext, files, trace, TopDownAnalysisMode.TopLevelDeclarations, configuration, packagePartProvider - ); - } - @NotNull public static AnalysisResult analyzeFilesWithJavaIntegration( @NotNull ModuleContext moduleContext, @NotNull Collection files, @NotNull BindingTrace trace, - @NotNull TopDownAnalysisMode topDownAnalysisMode, @NotNull CompilerConfiguration configuration, @NotNull PackagePartProvider packagePartProvider ) { @@ -135,7 +121,7 @@ public enum TopDownAnalyzerFacadeForJVM { if (provider != null) additionalProviders.add(provider); } - container.getLazyTopDownAnalyzerForTopLevel().analyzeFiles(topDownAnalysisMode, allFiles, additionalProviders); + container.getLazyTopDownAnalyzerForTopLevel().analyzeFiles(TopDownAnalysisMode.TopLevelDeclarations, allFiles, additionalProviders); BindingContext bindingContext = trace.getBindingContext(); ModuleDescriptor module = moduleContext.getModule(); diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java index cc70808ebba..7065b42ce48 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -38,7 +38,6 @@ import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.TopDownAnalysisMode; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor; @@ -161,9 +160,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { ); TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( - moduleContext, environment.getSourceFiles(), trace, - TopDownAnalysisMode.TopLevelDeclarations, configuration, - new JvmPackagePartProvider(environment) + moduleContext, environment.getSourceFiles(), trace, configuration, new JvmPackagePartProvider(environment) ); PackageViewDescriptor packageView = moduleContext.getModule().getPackage(TEST_PACKAGE_FQNAME); diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java index 43e6335e060..810d5ec01a0 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java @@ -84,7 +84,7 @@ public class JvmResolveUtil { @NotNull CompilerConfiguration configuration, @NotNull PackagePartProvider packagePartProvider ) { - return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationWithCustomContext( + return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, TEST_MODULE_NAME), files, new CliLightClassGenerationSupport.CliBindingTrace(), configuration, packagePartProvider ); diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java index 3a0a214124d..820e68b339a 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java @@ -28,7 +28,6 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.BindingTrace; -import org.jetbrains.kotlin.resolve.TopDownAnalysisMode; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import java.util.Collections; @@ -59,8 +58,7 @@ public class LazyResolveTestUtil { ModuleContext moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, JvmResolveUtil.TEST_MODULE_NAME); TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( - moduleContext, sourceFiles, trace, TopDownAnalysisMode.TopLevelDeclarations, environment.getConfiguration(), - new JvmPackagePartProvider(environment) + moduleContext, sourceFiles, trace, environment.getConfiguration(), new JvmPackagePartProvider(environment) ); return moduleContext.getModule(); diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java index 32e863f4400..ecc9d15eed6 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java @@ -28,7 +28,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider; -import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.context.ContextKt; import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.context.ModuleContext; @@ -44,10 +43,7 @@ import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.KtElement; import org.jetbrains.kotlin.psi.KtExpression; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.resolve.AnalyzingUtils; -import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.kotlin.resolve.BindingTrace; -import org.jetbrains.kotlin.resolve.TargetPlatformKt; +import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; @@ -244,7 +240,7 @@ public abstract class AbstractDiagnosticsTest extends BaseDiagnosticsTest { ) { // New JavaDescriptorResolver is created for each module, which is good because it emulates different Java libraries for each module, // albeit with same class names - TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationWithCustomContext( + TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( moduleContext, files, moduleTrace, diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt index 02001641822..25d91c34d62 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -49,7 +49,7 @@ class DecompiledTextConsistencyTest : TextConsistencyBaseTest() { (resolver?.let { buildDecompiledTextForClassFile(packageFile, it) } ?: buildDecompiledTextForClassFile(packageFile)).text override fun getModuleDescriptor(): ModuleDescriptor = - TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationWithCustomContext( + TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, JvmResolveUtil.TEST_MODULE_NAME), listOf(), BindingTraceContext(), CompilerConfiguration.EMPTY, IDEPackagePartProvider(GlobalSearchScope.allScope(project))