From 10e19bccb174d52bd1cdce9c37908522ea705b63 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Tue, 9 Jul 2019 16:03:17 +0200
Subject: [PATCH] Abort script evaluation if environment is created with errors

also fixes appropriate test
---
 .../compiler/plugin/JvmCliScriptEvaluationExtension.kt          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JvmCliScriptEvaluationExtension.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JvmCliScriptEvaluationExtension.kt
index ed053f88129..f6feb7c6c36 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JvmCliScriptEvaluationExtension.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/JvmCliScriptEvaluationExtension.kt
@@ -50,6 +50,8 @@ class JvmCliScriptEvaluationExtension : ScriptEvaluationExtension {
         val environment =
             KotlinCoreEnvironment.createForProduction(projectEnvironment, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
 
+        if (messageCollector.hasErrors()) return COMPILATION_ERROR
+
         val scriptFile = File(sourcePath)
         if (scriptFile.isDirectory || !scriptDefinitionProvider.isScript(scriptFile)) {
             val extensionHint =