diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt index c9a877b416b..9bc8887ffa4 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt @@ -120,6 +120,8 @@ private fun compileImpl( messageCollector ) + if (sourceDependencies.any { it.sourceDependencies is ResultWithDiagnostics.Failure }) return failure(messageCollector) + val dependenciesProvider = ScriptDependenciesProvider.getInstance(context.environment.project) val getScriptConfiguration = { ktFile: KtFile -> (dependenciesProvider?.getScriptConfiguration(ktFile)?.configuration ?: context.baseScriptCompilationConfiguration) diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/ScriptCompilerTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/ScriptCompilerTest.kt new file mode 100644 index 00000000000..d9d64d6afcb --- /dev/null +++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/ScriptCompilerTest.kt @@ -0,0 +1,38 @@ +/* + * Copyright 2010-2020 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. + */ + +package org.jetbrains.kotlin.scripting.compiler.test + +import junit.framework.TestCase +import org.jetbrains.kotlin.scripting.compiler.plugin.impl.ScriptJvmCompilerIsolated +import kotlin.script.experimental.api.* +import kotlin.script.experimental.host.toScriptSource +import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration + +class ScriptCompilerTest : TestCase() { + + fun testCompilationWithRefinementError() { + val res = compile("nonsense".toScriptSource()) { + refineConfiguration { + beforeCompiling { + ResultWithDiagnostics.Failure("err13".asErrorDiagnostics()) + } + } + } + + assertTrue(res is ResultWithDiagnostics.Failure) + assertTrue(res.reports.any { it.message == "err13" }) + assertTrue(res.reports.none { it.message.contains("nonsense") }) + } + + fun compile( + script: SourceCode, + cfgBody: ScriptCompilationConfiguration.Builder.() -> Unit + ): ResultWithDiagnostics { + val compilationConfiguration = ScriptCompilationConfiguration(cfgBody) + val compiler = ScriptJvmCompilerIsolated(defaultJvmScriptingHostConfiguration) + return compiler.compile(script, compilationConfiguration) + } +} \ No newline at end of file