From 7898e2447d75e1b4984ece96e2ce71f19852276b Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 8 Nov 2016 10:25:02 +0300 Subject: [PATCH] Minor, rename JVMConfigurationKeys.ADD_BUILT_INS_TO_DEPENDENCIES --- .../cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt | 2 +- .../src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java | 4 ++-- .../kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt | 4 ++-- .../kotlin/idea/debugger/AbstractPositionManagerTest.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index e69db8d92f4..49c3ee7a0b6 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -333,7 +333,7 @@ class K2JVMCompiler : CLICompiler() { configuration.put(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE, arguments.allowKotlinPackage) configuration.put(CLIConfigurationKeys.REPORT_PERF, arguments.reportPerf) configuration.put(JVMConfigurationKeys.USE_SINGLE_MODULE, arguments.singleModule) - configuration.put(JVMConfigurationKeys.ADD_BUILT_INS_TO_DEPENDENCIES, arguments.addCompilerBuiltIns) + configuration.put(JVMConfigurationKeys.ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES, arguments.addCompilerBuiltIns) arguments.declarationsOutputPath?.let { configuration.put(JVMConfigurationKeys.DECLARATIONS_JSON_PATH, it) } } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java b/compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java index c25b221d6fb..34f376cd1da 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java @@ -58,8 +58,8 @@ public class JVMConfigurationKeys { public static final CompilerConfigurationKey USE_SINGLE_MODULE = CompilerConfigurationKey.create("combine modules for source files and binary dependencies into a single module"); - public static final CompilerConfigurationKey ADD_BUILT_INS_TO_DEPENDENCIES = - CompilerConfigurationKey.create("add built-ins to dependencies"); + public static final CompilerConfigurationKey ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES = + CompilerConfigurationKey.create("add built-ins from the compiler jar to the dependencies of the module being resolved"); public static final CompilerConfigurationKey JVM_TARGET = CompilerConfigurationKey.create("JVM bytecode target version"); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt index 8ff7ae53c3e..631e5fe57c5 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt @@ -135,7 +135,7 @@ object TopDownAnalyzerFacadeForJVM { dependenciesContext.setDependencies(listOfNotNull( dependenciesContext.module, dependenciesContext.module.builtIns.builtInsModule.check { - configuration.getBoolean(JVMConfigurationKeys.ADD_BUILT_INS_TO_DEPENDENCIES) + configuration.getBoolean(JVMConfigurationKeys.ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES) } )) dependenciesContext.initializeModuleContents(CompositePackageFragmentProvider(listOf( @@ -182,7 +182,7 @@ object TopDownAnalyzerFacadeForJVM { // TODO: remove dependencyModule from friends module.setDependencies(ModuleDependenciesImpl( listOfNotNull(module, dependencyModule, module.builtIns.builtInsModule.check { - configuration.getBoolean(JVMConfigurationKeys.ADD_BUILT_INS_TO_DEPENDENCIES) + configuration.getBoolean(JVMConfigurationKeys.ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES) }), if (dependencyModule != null) setOf(dependencyModule) else emptySet() )) diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java index 8e001432135..8b8e390d30b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java @@ -144,7 +144,7 @@ public abstract class AbstractPositionManagerTest extends KotlinLightCodeInsight CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK); // TODO: delete this once JvmIDEVirtualFileFinder supports loading .kotlin_builtins files - configuration.put(JVMConfigurationKeys.ADD_BUILT_INS_TO_DEPENDENCIES, true); + configuration.put(JVMConfigurationKeys.ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES, true); GenerationState state = GenerationUtils.compileFiles( files,