diff --git a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptCompilation.kt b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptCompilation.kt index e8900ea1130..b3733cdc061 100644 --- a/libraries/scripting/common/src/kotlin/script/experimental/api/scriptCompilation.kt +++ b/libraries/scripting/common/src/kotlin/script/experimental/api/scriptCompilation.kt @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -44,6 +44,10 @@ open class ScriptCompilationConfiguration(baseConfigurations: Iterable asLegacyOrNull(): T? = if (this is FromLegacy) legacyDefinition as? T else null + override fun toString(): String { + return "ScriptDefinition($name)" + } + @Suppress("OverridingDeprecatedMember", "DEPRECATION") open class FromLegacy( override val hostConfiguration: ScriptingHostConfiguration, diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt index 9e128cd68c3..ef149c8b59e 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt @@ -152,6 +152,10 @@ abstract class ScriptCompilationConfigurationWrapper(val script: SourceCode) { super.equals(other) && other is FromCompilationConfiguration && configuration == other.configuration override fun hashCode(): Int = super.hashCode() + 23 * (configuration?.hashCode() ?: 1) + + override fun toString(): String { + return "FromCompilationConfiguration($configuration)" + } } @Suppress("OverridingDeprecatedMember", "DEPRECATION") @@ -200,6 +204,10 @@ abstract class ScriptCompilationConfigurationWrapper(val script: SourceCode) { super.equals(other) && other is FromLegacy && legacyDependencies == other.legacyDependencies override fun hashCode(): Int = super.hashCode() + 31 * (legacyDependencies?.hashCode() ?: 1) + + override fun toString(): String { + return "FromLegacy($legacyDependencies)" + } } }