From 9d2cadc908011b549b638ae48c02d8b63b91849c Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 26 Jan 2022 12:46:51 +0100
Subject: [PATCH] [minor] scripting fixes in obsolete and test code...

relax acceptedAnnotations extraction rules for obsolete script template
handling code - the previous variant was failing on the typealias
comparison

also reduce warnings and possible exceptions on some test execution
paths
---
 .../resolve/KotlinScriptDefinitionFromAnnotatedTemplate.kt    | 2 +-
 .../kotlin/scripting/compiler/test/ScriptTemplateTest.kt      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/KotlinScriptDefinitionFromAnnotatedTemplate.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/KotlinScriptDefinitionFromAnnotatedTemplate.kt
index df6ca74012c..a35feb25626 100644
--- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/KotlinScriptDefinitionFromAnnotatedTemplate.kt
+++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/KotlinScriptDefinitionFromAnnotatedTemplate.kt
@@ -91,7 +91,7 @@ open class KotlinScriptDefinitionFromAnnotatedTemplate(
                 left.parameters.size == right.parameters.size &&
                 left.parameters.zip(right.parameters).all {
                     it.first.kind == KParameter.Kind.INSTANCE ||
-                    it.first.type == it.second.type
+                    it.first.name == it.second.name
                 }
 
         val resolveFunctions = getResolveFunctions()
diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/ScriptTemplateTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/ScriptTemplateTest.kt
index 3baeb006a5c..621dc4f1fdc 100644
--- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/ScriptTemplateTest.kt
+++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/ScriptTemplateTest.kt
@@ -363,7 +363,7 @@ class ScriptTemplateTest : TestCase() {
         val rootDisposable = Disposer.newDisposable()
         try {
             val additionalClasspath = System.getProperty("kotlin.test.script.classpath")?.split(File.pathSeparator)
-                ?.map { File(it) }.orEmpty().toTypedArray()
+                ?.mapNotNull { File(it).takeIf { file -> file.exists() } }.orEmpty().toTypedArray()
             val configuration = KotlinTestUtils.newConfiguration(
                 if (includeKotlinRuntime) ConfigurationKind.ALL else ConfigurationKind.JDK_ONLY,
                 TestJdkKind.FULL_JDK,
@@ -513,7 +513,7 @@ interface AcceptedAnnotationsCheck {
         val actualAnnotations = scriptContents.annotations
         Assert.assertTrue(
             "Loaded annotation: $actualAnnotations",
-            actualAnnotations.single().annotationClass.qualifiedName == TestAnno1::class.qualifiedName
+            actualAnnotations.singleOrNull()?.annotationClass?.qualifiedName == TestAnno1::class.qualifiedName
         )
 
         return ScriptDependencies(