From b1b1eab35bbe78a075fb517ddc9032941d3009c8 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Sun, 25 Jun 2023 14:52:59 +0200
Subject: [PATCH] K2 Scripting: fix testdata for scripts diagnostics tests

---
 .../lightClassByPsi/scripts/FunsPropsAndFields.lib.java      | 3 +++
 .../lightClasses/lightClassByPsi/scripts/HelloWorld.lib.java | 3 +++
 .../lightClassByPsi/scripts/InnerClasses.lib.java            | 3 +++
 .../diagnostics/tests/annotations/DanglingInScript.fir.kts   | 5 -----
 .../diagnostics/tests/annotations/DanglingInScript.kts       | 1 +
 .../tests/redeclarations/ScriptAndClassConflict.fir.kts      | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/DanglingInScript.fir.kts

diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.lib.java
index ab3632e2d47..c815f083149 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/FunsPropsAndFields.lib.java
@@ -2,6 +2,9 @@ public final class FunsPropsAndFields /* FunsPropsAndFields*/ extends kotlin.scr
   @kotlin.jvm.JvmField()
   public final int testField;
 
+  @org.jetbrains.annotations.NotNull()
+  final java.lang.String[] args;
+
   private final int testPropVal;
 
   private int testPropVar;
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.lib.java
index f463cc286ed..e70d1363fd9 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/HelloWorld.lib.java
@@ -1,4 +1,7 @@
 public final class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
+  @org.jetbrains.annotations.NotNull()
+  final java.lang.String[] args;
+
   public  HelloWorld(@org.jetbrains.annotations.NotNull() java.lang.String[]);//  .ctor(java.lang.String[])
 
   public static final void main(@org.jetbrains.annotations.NotNull() java.lang.String[]);//  main(java.lang.String[])
diff --git a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.lib.java b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.lib.java
index 84b997a2454..97542ec662d 100644
--- a/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.lib.java
+++ b/compiler/testData/asJava/lightClasses/lightClassByPsi/scripts/InnerClasses.lib.java
@@ -21,6 +21,9 @@ public static final class Baz /* InnerClasses.Bar.Baz*/ {
 }
 
 public final class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
+  @org.jetbrains.annotations.NotNull()
+  final java.lang.String[] args;
+
   public  InnerClasses(@org.jetbrains.annotations.NotNull() java.lang.String[]);//  .ctor(java.lang.String[])
 
   public static final void main(@org.jetbrains.annotations.NotNull() java.lang.String[]);//  main(java.lang.String[])
diff --git a/compiler/testData/diagnostics/tests/annotations/DanglingInScript.fir.kts b/compiler/testData/diagnostics/tests/annotations/DanglingInScript.fir.kts
deleted file mode 100644
index cdf1e016d1d..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/DanglingInScript.fir.kts
+++ /dev/null
@@ -1,5 +0,0 @@
-// FILE: script.kts
-
-annotation class Ann
-
-@<!UNRESOLVED_REFERENCE!>Ann<!><!SYNTAX!><!>
diff --git a/compiler/testData/diagnostics/tests/annotations/DanglingInScript.kts b/compiler/testData/diagnostics/tests/annotations/DanglingInScript.kts
index e5ea165258e..d026bb10d1e 100644
--- a/compiler/testData/diagnostics/tests/annotations/DanglingInScript.kts
+++ b/compiler/testData/diagnostics/tests/annotations/DanglingInScript.kts
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // FILE: script.kts
 
 annotation class Ann
diff --git a/compiler/testData/diagnostics/tests/redeclarations/ScriptAndClassConflict.fir.kts b/compiler/testData/diagnostics/tests/redeclarations/ScriptAndClassConflict.fir.kts
index 71df7006920..dc12129b1ac 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/ScriptAndClassConflict.fir.kts
+++ b/compiler/testData/diagnostics/tests/redeclarations/ScriptAndClassConflict.fir.kts
@@ -2,7 +2,7 @@
 package test
 
 class A
-class F1
+class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>F1<!>
 
 // FILE: A.kts
 package test