From d65b999c2c4c84ea7a68f9a12c12d0e021379f50 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 28 Nov 2017 18:51:21 +0100 Subject: [PATCH] Minor, rename variable for clarity --- .../cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java | 5 ++--- .../cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java index 9291c343feb..a6bdfadf4a4 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java @@ -72,7 +72,6 @@ import org.jetbrains.kotlin.utils.StringsKt; import java.io.File; import java.io.IOException; import java.util.*; -import java.util.stream.Collectors; import static org.jetbrains.kotlin.cli.common.ExitCode.COMPILATION_ERROR; import static org.jetbrains.kotlin.cli.common.ExitCode.OK; @@ -167,8 +166,8 @@ public class K2JSCompiler extends CLICompiler { return COMPILATION_ERROR; } - ExitCode plugLoadResult = PluginCliParser.loadPluginsSafe(arguments, configuration); - if (plugLoadResult != ExitCode.OK) return plugLoadResult; + ExitCode pluginLoadResult = PluginCliParser.loadPluginsSafe(arguments, configuration); + if (pluginLoadResult != ExitCode.OK) return pluginLoadResult; configuration.put(JSConfigurationKeys.LIBRARIES, configureLibraries(arguments, paths, messageCollector)); 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 aaa07cbb67a..91fda3da3a9 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -73,8 +73,8 @@ class K2JVMCompiler : CLICompiler() { if (it != OK) return it } - val plugLoadResult = PluginCliParser.loadPluginsSafe(arguments, configuration) - if (plugLoadResult != ExitCode.OK) return plugLoadResult + val pluginLoadResult = PluginCliParser.loadPluginsSafe(arguments, configuration) + if (pluginLoadResult != ExitCode.OK) return pluginLoadResult if (!arguments.script && arguments.buildFile == null) { for (arg in arguments.freeArgs) { @@ -166,7 +166,7 @@ class K2JVMCompiler : CLICompiler() { val environment = createEnvironmentWithScriptingSupport(rootDisposable, configuration, arguments, messageCollector) ?: return COMPILATION_ERROR - val scriptDefinitionProvider = ScriptDefinitionProvider.getInstance(environment.project)!! + val scriptDefinitionProvider = ScriptDefinitionProvider.getInstance(environment.project) val scriptFile = File(sourcePath) if (scriptFile.isDirectory || !scriptDefinitionProvider.isScript(scriptFile.name)) { val extensionHint = @@ -358,7 +358,7 @@ class K2JVMCompiler : CLICompiler() { configuration.put(JVMConfigurationKeys.DISABLE_CALL_ASSERTIONS, arguments.noCallAssertions) configuration.put(JVMConfigurationKeys.DISABLE_RECEIVER_ASSERTIONS, arguments.noReceiverAssertions) configuration.put(JVMConfigurationKeys.DISABLE_PARAM_ASSERTIONS, arguments.noParamAssertions) - configuration.put(JVMConfigurationKeys.NO_EXCEPTION_ON_EXPLICIT_EQUALS_FOR_BOXED_NULL, arguments.noExceptionOnExplicitEqualsForBoxedNull); + configuration.put(JVMConfigurationKeys.NO_EXCEPTION_ON_EXPLICIT_EQUALS_FOR_BOXED_NULL, arguments.noExceptionOnExplicitEqualsForBoxedNull) configuration.put(JVMConfigurationKeys.DISABLE_OPTIMIZATION, arguments.noOptimize) val constructorCallNormalizationMode = JVMConstructorCallNormalizationMode.fromStringOrNull(arguments.constructorCallNormalizationMode)