From 1ea66e56c2c2320c63a9fc59a879324c5e478640 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Fri, 17 Aug 2018 10:37:00 +0200
Subject: [PATCH] Fix annotations calculation in the bridge resolver

---
 .../kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt
index a926defbc3c..cb1881afac6 100644
--- a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt
+++ b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJVMCompilerImpl.kt
@@ -253,7 +253,7 @@ internal class BridgeScriptDefinition(
 ) {
     override val acceptedAnnotations = run {
         val cl = this::class.java.classLoader
-        additionalCompilationConfiguration?.get(ScriptDefinition.refineConfigurationOnAnnotations)
+        getMergedFromChainOrNull(ScriptDefinition.refineConfigurationOnAnnotations, scriptDefinition, additionalCompilationConfiguration)
             ?.map { (cl.loadClass(it.typeName) as Class<out Annotation>).kotlin }
             ?: emptyList()
     }