From c5e2f55ea73e4b22cffeb685a55e4695c4be6f0f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 23 May 2016 14:19:50 +0300 Subject: [PATCH] Get rid of getModuleName(), pass configuration to createContextWithSealedModule Add KotlinTestUtils.newConfiguration() which creates a configuration and sets the module name to the default test one ("test-module") --- .../compiler/KotlinToJVMBytecodeCompiler.kt | 3 +-- .../kotlin/cli/jvm/config/ModuleName.kt | 22 ------------------- .../cli/jvm/repl/CliReplAnalyzerEngine.kt | 5 ++--- .../jvm/TopDownAnalyzerFacadeForJVM.java | 8 ++++--- .../kotlin/codegen/GenerationUtils.java | 3 ++- .../jvm/compiler/AbstractLoadJavaTest.java | 8 ++----- .../AbstractDescriptorRendererTest.kt | 4 +--- .../kotlin/resolve/lazy/JvmResolveUtil.java | 3 +-- .../kotlin/test/KotlinTestUtils.java | 18 +++++++-------- .../kotlin/asJava/KotlinAsJavaTestBase.java | 3 ++- .../jetbrains/kotlin/psi/KtPsiUtilTest.java | 5 +++-- .../kotlin/psi/KtSimpleNameExpressionTest.kt | 6 +++-- .../kotlin/resolve/MutableDiagnosticsTest.kt | 6 +++-- .../AbstractLocalClassProtoTest.kt | 10 +++------ .../DecompiledTextConsistencyTest.kt | 15 ++++++------- 15 files changed, 46 insertions(+), 73 deletions(-) delete mode 100644 compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/ModuleName.kt 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 bf2b832090f..ca4885326db 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 @@ -28,7 +28,6 @@ import org.jetbrains.kotlin.cli.common.output.outputUtils.writeAll import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoot import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot -import org.jetbrains.kotlin.cli.jvm.config.getModuleName import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots import org.jetbrains.kotlin.codegen.* import org.jetbrains.kotlin.codegen.state.GenerationState @@ -291,7 +290,7 @@ object KotlinToJVMBytecodeCompiler { override fun analyze(): AnalysisResult { val sharedTrace = CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace() val moduleContext = - TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.project, environment.getModuleName()) + TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.project, environment.configuration) return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( moduleContext, diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/ModuleName.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/ModuleName.kt deleted file mode 100644 index 360a1dfc5bf..00000000000 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/ModuleName.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.cli.jvm.config - -import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.config.JVMConfigurationKeys - -fun KotlinCoreEnvironment.getModuleName(): String = configuration.get(JVMConfigurationKeys.MODULE_NAME)!! diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/CliReplAnalyzerEngine.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/CliReplAnalyzerEngine.kt index d916cd0d33b..c3b62ba355a 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/CliReplAnalyzerEngine.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/CliReplAnalyzerEngine.kt @@ -20,7 +20,6 @@ import com.intellij.psi.search.ProjectScope import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.cli.jvm.config.getModuleName import org.jetbrains.kotlin.cli.jvm.repl.di.createContainerForReplWithJava import org.jetbrains.kotlin.descriptors.ScriptDescriptor import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider @@ -38,7 +37,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.* import org.jetbrains.kotlin.resolve.repl.ReplState import org.jetbrains.kotlin.script.ScriptPriorities -class CliReplAnalyzerEngine(private val environment: KotlinCoreEnvironment) { +class CliReplAnalyzerEngine(environment: KotlinCoreEnvironment) { private val topDownAnalysisContext: TopDownAnalysisContext private val topDownAnalyzer: LazyTopDownAnalyzerForTopLevel private val resolveSession: ResolveSession @@ -48,7 +47,7 @@ class CliReplAnalyzerEngine(private val environment: KotlinCoreEnvironment) { val trace: BindingTraceContext = CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace() init { - val moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.project, environment.getModuleName()) + val moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.project, environment.configuration) this.module = moduleContext.module scriptDeclarationFactory = ScriptMutableDeclarationProviderFactory() 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 2b44d7f1207..4fa9f12fecb 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 @@ -138,12 +138,14 @@ public enum TopDownAnalyzerFacadeForJVM { } @NotNull - public static MutableModuleContext createContextWithSealedModule(@NotNull Project project, @NotNull String moduleName) { + public static MutableModuleContext createContextWithSealedModule( + @NotNull Project project, @NotNull CompilerConfiguration configuration + ) { ProjectContext projectContext = ContextKt.ProjectContext(project); JvmBuiltIns builtIns = new JvmBuiltIns(projectContext.getStorageManager()); MutableModuleContext context = ContextKt.ContextForNewModule( - projectContext, Name.special("<" + moduleName + ">"), JvmPlatform.INSTANCE, - builtIns + projectContext, Name.special("<" + configuration.getNotNull(JVMConfigurationKeys.MODULE_NAME) + ">"), + JvmPlatform.INSTANCE, builtIns ); builtIns.setOwnerModuleDescriptor(context.getModule()); context.setDependencies(context.getModule(), context.getBuiltIns().getBuiltInsModule()); diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/GenerationUtils.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/GenerationUtils.java index d66679d1f05..e73f693f7bf 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/GenerationUtils.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/GenerationUtils.java @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.descriptors.PackagePartProvider; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.util.Collections; @@ -54,7 +55,7 @@ public class GenerationUtils { PackagePartProvider packagePartProvider = environment == null ? PackagePartProvider.Companion.getEMPTY() : new JvmPackagePartProvider(environment); CompilerConfiguration configuration = - environment == null ? CompilerConfiguration.EMPTY : environment.getConfiguration(); + environment == null ? KotlinTestUtils.newConfiguration() : environment.getConfiguration(); AnalysisResult analysisResult = JvmResolveUtil.analyzeAndCheckForErrors(CollectionsKt.first(files).getProject(), files, configuration, packagePartProvider); 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 e1beeabf3b1..88a6661e0db 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -25,7 +25,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; -import org.jetbrains.kotlin.cli.jvm.config.ModuleNameKt; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.config.JVMConfigurationKeys; @@ -152,8 +151,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { } }); - CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( - ConfigurationKind.JDK_ONLY, getJdkKind()); + CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, getJdkKind()); ContentRootsKt.addKotlinSourceRoot(configuration, sourcesDir.getAbsolutePath()); JvmContentRootsKt.addJavaSourceRoot(configuration, new File("compiler/testData/loadJava/include")); JvmContentRootsKt.addJavaSourceRoot(configuration, tmpdir); @@ -162,9 +160,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); BindingTrace trace = new CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(); - ModuleContext moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule( - environment.getProject(), ModuleNameKt.getModuleName(environment) - ); + ModuleContext moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.getProject(), configuration); TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( moduleContext, environment.getSourceFiles(), trace, configuration, new JvmPackagePartProvider(environment) diff --git a/compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt index a033b494a5d..d38132c3c2f 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt @@ -20,7 +20,6 @@ import com.intellij.openapi.editor.impl.DocumentImpl import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.cli.jvm.config.getModuleName import org.jetbrains.kotlin.container.ComponentProvider import org.jetbrains.kotlin.container.get import org.jetbrains.kotlin.descriptors.ClassDescriptor @@ -54,8 +53,7 @@ abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment() { val fileText = FileUtil.loadFile(File(path), true) val psiFile = KtPsiFactory(project).createFile(fileText) - val context = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, environment.getModuleName()) - + val context = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, environment.configuration) val container = createContainerForLazyResolve( context, 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 4a3d3c32c4f..e6150a88576 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.descriptors.PackagePartProvider; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.kotlin.test.KotlinTestUtils; import java.util.Collection; import java.util.Collections; @@ -89,7 +88,7 @@ public class JvmResolveUtil { @NotNull PackagePartProvider packagePartProvider ) { return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( - TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, KotlinTestUtils.TEST_MODULE_NAME), + TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, configuration), files, new CliLightClassGenerationSupport.CliBindingTrace(), configuration, packagePartProvider ); } diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java index ddd11365026..fe2528228d2 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -53,10 +53,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.kotlin.config.CommonConfigurationKeys; -import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.config.ContentRoot; -import org.jetbrains.kotlin.config.KotlinSourceRoot; +import org.jetbrains.kotlin.config.*; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Errors; @@ -95,8 +92,6 @@ import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.jetbrains.kotlin.config.JVMConfigurationKeys.MODULE_NAME; - public class KotlinTestUtils { public static String TEST_MODULE_NAME = "test-module"; @@ -423,6 +418,13 @@ public class KotlinTestUtils { return FileUtil.toSystemIndependentName(file.getPath()); } + @NotNull + public static CompilerConfiguration newConfiguration() { + CompilerConfiguration configuration = new CompilerConfiguration(); + configuration.put(JVMConfigurationKeys.MODULE_NAME, TEST_MODULE_NAME); + return configuration; + } + @NotNull public static CompilerConfiguration compilerConfigurationForTests( @NotNull ConfigurationKind configurationKind, @@ -439,7 +441,7 @@ public class KotlinTestUtils { @NotNull List classpath, @NotNull List javaSource ) { - CompilerConfiguration configuration = new CompilerConfiguration(); + CompilerConfiguration configuration = newConfiguration(); JvmContentRootsKt.addJavaSourceRoots(configuration, javaSource); if (jdkKind == TestJdkKind.MOCK_JDK) { JvmContentRootsKt.addJvmClasspathRoot(configuration, findMockJdkRtJar()); @@ -467,8 +469,6 @@ public class KotlinTestUtils { JvmContentRootsKt.addJvmClasspathRoots(configuration, classpath); - configuration.put(MODULE_NAME, TEST_MODULE_NAME); - return configuration; } diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java index 8b82ce7846e..2bbb98cb160 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.config.ContentRootsKt; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; import java.io.File; @@ -31,7 +32,7 @@ public abstract class KotlinAsJavaTestBase extends KotlinTestWithEnvironment { @Override protected KotlinCoreEnvironment createEnvironment() { - CompilerConfiguration configuration = new CompilerConfiguration(); + CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(); for (File root : getKotlinSourceRoots()) { ContentRootsKt.addKotlinSourceRoot(configuration, root.getPath()); diff --git a/compiler/tests/org/jetbrains/kotlin/psi/KtPsiUtilTest.java b/compiler/tests/org/jetbrains/kotlin/psi/KtPsiUtilTest.java index 0ef256edef5..a14f8f15f26 100644 --- a/compiler/tests/org/jetbrains/kotlin/psi/KtPsiUtilTest.java +++ b/compiler/tests/org/jetbrains/kotlin/psi/KtPsiUtilTest.java @@ -21,7 +21,6 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; -import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.ImportPath; @@ -110,7 +109,9 @@ public class KtPsiUtilTest extends KotlinTestWithEnvironment { @Override protected KotlinCoreEnvironment createEnvironment() { - return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), new CompilerConfiguration(), EnvironmentConfigFiles.JVM_CONFIG_FILES); + return KotlinCoreEnvironment.createForTests( + getTestRootDisposable(), KotlinTestUtils.newConfiguration(), EnvironmentConfigFiles.JVM_CONFIG_FILES + ); } private ImportPath getImportPathFromParsed(String text) { diff --git a/compiler/tests/org/jetbrains/kotlin/psi/KtSimpleNameExpressionTest.kt b/compiler/tests/org/jetbrains/kotlin/psi/KtSimpleNameExpressionTest.kt index d000187a2ff..2a30687e814 100644 --- a/compiler/tests/org/jetbrains/kotlin/psi/KtSimpleNameExpressionTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/psi/KtSimpleNameExpressionTest.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.psi import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestWithEnvironment import org.junit.Assert @@ -38,6 +38,8 @@ class KtSimpleNameExpressionTest : KotlinTestWithEnvironment() { } override fun createEnvironment(): KotlinCoreEnvironment { - return KotlinCoreEnvironment.createForTests(testRootDisposable!!, CompilerConfiguration(), EnvironmentConfigFiles.JVM_CONFIG_FILES) + return KotlinCoreEnvironment.createForTests( + testRootDisposable, KotlinTestUtils.newConfiguration(), EnvironmentConfigFiles.JVM_CONFIG_FILES + ) } } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt index 7569bde2ce7..77c44a487ef 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/MutableDiagnosticsTest.kt @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.resolve import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.diagnostics.Severity @@ -26,12 +25,15 @@ import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.doNotAnalyze import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestWithEnvironment import org.junit.Assert class MutableDiagnosticsTest : KotlinTestWithEnvironment() { override fun createEnvironment(): KotlinCoreEnvironment? { - return KotlinCoreEnvironment.createForTests(testRootDisposable!!, CompilerConfiguration(), EnvironmentConfigFiles.JVM_CONFIG_FILES) + return KotlinCoreEnvironment.createForTests( + testRootDisposable, KotlinTestUtils.newConfiguration(), EnvironmentConfigFiles.JVM_CONFIG_FILES + ) } private val BindingTrace.diagnostics: Diagnostics diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt index 17b352fe898..d65e13d74d6 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt @@ -20,7 +20,6 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.cli.jvm.config.getModuleName import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.descriptors.PackagePartProvider import org.jetbrains.kotlin.frontend.java.di.createContainerForTopDownAnalyzerForJvm @@ -53,12 +52,9 @@ abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() { val clazz = classLoader.loadClass(classFile.toRelativeString(tmpdir).substringBeforeLast(".class").replace('/', '.').replace('\\', '.')) assertHasAnnotationData(clazz) - val environment = KotlinCoreEnvironment.createForTests( - testRootDisposable, - KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir), - EnvironmentConfigFiles.JVM_CONFIG_FILES - ) - val moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.project, environment.getModuleName()) + val configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, tmpdir) + val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) + val moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.project, configuration) val providerFactory = FileBasedDeclarationProviderFactory(moduleContext.storageManager, emptyList()) val container = createContainerForTopDownAnalyzerForJvm( 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 80c055b03e8..10a446d5691 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil @@ -31,7 +30,6 @@ import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM -import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor import org.jetbrains.kotlin.test.KotlinTestUtils @@ -49,12 +47,13 @@ class DecompiledTextConsistencyTest : TextConsistencyBaseTest() { override fun getDecompiledText(packageFile: VirtualFile, resolver: ResolverForDecompiler?): String = (resolver?.let { buildDecompiledTextForClassFile(packageFile, it) } ?: buildDecompiledTextForClassFile(packageFile)).text - override fun getModuleDescriptor(): ModuleDescriptor = - TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( - TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, KotlinTestUtils.TEST_MODULE_NAME), - listOf(), BindingTraceContext(), CompilerConfiguration.EMPTY, - IDEPackagePartProvider(GlobalSearchScope.allScope(project)) - ).moduleDescriptor + override fun getModuleDescriptor(): ModuleDescriptor { + val configuration = KotlinTestUtils.newConfiguration() + return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( + TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, configuration), listOf(), BindingTraceContext(), + configuration, IDEPackagePartProvider(GlobalSearchScope.allScope(project)) + ).moduleDescriptor + } override fun getProjectDescriptor() = object : KotlinWithJdkAndRuntimeLightProjectDescriptor() {