From d2dd89260d9e98c3b53f663cb61bf7fb16863d4b Mon Sep 17 00:00:00 2001
From: Nikita Bobko <nikita.bobko@jetbrains.com>
Date: Wed, 26 Feb 2025 12:08:52 +0100
Subject: [PATCH] [kotlin] Fix testData after fixes in kotlin repo

(cherry picked from commit 3ac9787122b4ed1f3654d9bb6e8ae62331c6692b)

GitOrigin-RevId: 6325d3b5357d637c9d262ea01dd09754cfe0cb17
---
 .../before/src/main/kotlin/src.kt                              | 2 +-
 .../after/src/main/kotlin/src.kt                               | 2 +-
 .../before/src/main/kotlin/src.kt                              | 2 +-
 .../after/src/test/kotlin/src.kt                               | 2 +-
 .../before/src/test/kotlin/src.kt                              | 2 +-
 .../after/src/main/kotlin/src.kt                               | 2 +-
 .../before/src/main/kotlin/src.kt                              | 2 +-
 .../after/src/jsMain/kotlin/p/some.js.kt                       | 2 +-
 .../before/src/jsMain/kotlin/p/some.js.kt                      | 2 +-
 .../branched/ifWhen/whenToIf/whenGuardsUnsupported.kt          | 3 ++-
 .../quickfix/replaceAndWithWhenGuard/alreadyUsingGuard.kt      | 2 +-
 .../testData/quickfix/replaceAndWithWhenGuard/multipleAnds.kt  | 2 +-
 .../quickfix/replaceAndWithWhenGuard/multipleAnds.kt.after     | 2 +-
 .../tests/testData/quickfix/replaceAndWithWhenGuard/simple.kt  | 2 +-
 .../testData/quickfix/replaceAndWithWhenGuard/simple.kt.after  | 2 +-
 15 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/plugins/kotlin/idea/tests/testData/gradle/fixes/doNotEnableMultiDollarInterpolationLowKgpVersion/before/src/main/kotlin/src.kt b/plugins/kotlin/idea/tests/testData/gradle/fixes/doNotEnableMultiDollarInterpolationLowKgpVersion/before/src/main/kotlin/src.kt
index e975892cf89a..7fc9cbdc07d5 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/fixes/doNotEnableMultiDollarInterpolationLowKgpVersion/before/src/main/kotlin/src.kt
+++ b/plugins/kotlin/idea/tests/testData/gradle/fixes/doNotEnableMultiDollarInterpolationLowKgpVersion/before/src/main/kotlin/src.kt
@@ -1,5 +1,5 @@
 // "Configure arguments for the feature: multi dollar interpolation" "false"
-// K2_ERROR: The feature "multi dollar interpolation" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xmulti-dollar-interpolation', but note that no stability guarantees are provided.
+// K2_ERROR: The feature "multi dollar interpolation" is only available since language version 2.2
 
 fun test() {
     <caret>$$"$Can't enable$"
diff --git a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvm/after/src/main/kotlin/src.kt b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvm/after/src/main/kotlin/src.kt
index 6787377157bd..103728a4535f 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvm/after/src/main/kotlin/src.kt
+++ b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvm/after/src/main/kotlin/src.kt
@@ -1,5 +1,5 @@
 // "Configure arguments for the feature: multi dollar interpolation" "true"
-// K2_ERROR: The feature "multi dollar interpolation" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xmulti-dollar-interpolation', but note that no stability guarantees are provided.
+// K2_ERROR: The feature "multi dollar interpolation" is only available since language version 2.2
 fun test() {
     $$"$Enable me$"
 }
diff --git a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvm/before/src/main/kotlin/src.kt b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvm/before/src/main/kotlin/src.kt
index 90a84b2fa464..69aeb3756170 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvm/before/src/main/kotlin/src.kt
+++ b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvm/before/src/main/kotlin/src.kt
@@ -1,5 +1,5 @@
 // "Configure arguments for the feature: multi dollar interpolation" "true"
-// K2_ERROR: The feature "multi dollar interpolation" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xmulti-dollar-interpolation', but note that no stability guarantees are provided.
+// K2_ERROR: The feature "multi dollar interpolation" is only available since language version 2.2
 fun test() {
     <caret>$$"$Enable me$"
 }
diff --git a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmTest/after/src/test/kotlin/src.kt b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmTest/after/src/test/kotlin/src.kt
index d9107d955eb9..8dd80b943e75 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmTest/after/src/test/kotlin/src.kt
+++ b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmTest/after/src/test/kotlin/src.kt
@@ -1,5 +1,5 @@
 // "Configure arguments for the feature: multi dollar interpolation" "true"
-// K2_ERROR: The feature "multi dollar interpolation" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xmulti-dollar-interpolation', but note that no stability guarantees are provided.
+// K2_ERROR: The feature "multi dollar interpolation" is only available since language version 2.2
 
 fun test() {
     $$"$Enable me$"
diff --git a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmTest/before/src/test/kotlin/src.kt b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmTest/before/src/test/kotlin/src.kt
index b3403436e536..d7316f608d7a 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmTest/before/src/test/kotlin/src.kt
+++ b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmTest/before/src/test/kotlin/src.kt
@@ -1,5 +1,5 @@
 // "Configure arguments for the feature: multi dollar interpolation" "true"
-// K2_ERROR: The feature "multi dollar interpolation" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xmulti-dollar-interpolation', but note that no stability guarantees are provided.
+// K2_ERROR: The feature "multi dollar interpolation" is only available since language version 2.2
 
 fun test() {
     <caret>$$"$Enable me$"
diff --git a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmWithOtherFlagsAddAll/after/src/main/kotlin/src.kt b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmWithOtherFlagsAddAll/after/src/main/kotlin/src.kt
index 6787377157bd..103728a4535f 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmWithOtherFlagsAddAll/after/src/main/kotlin/src.kt
+++ b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmWithOtherFlagsAddAll/after/src/main/kotlin/src.kt
@@ -1,5 +1,5 @@
 // "Configure arguments for the feature: multi dollar interpolation" "true"
-// K2_ERROR: The feature "multi dollar interpolation" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xmulti-dollar-interpolation', but note that no stability guarantees are provided.
+// K2_ERROR: The feature "multi dollar interpolation" is only available since language version 2.2
 fun test() {
     $$"$Enable me$"
 }
diff --git a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmWithOtherFlagsAddAll/before/src/main/kotlin/src.kt b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmWithOtherFlagsAddAll/before/src/main/kotlin/src.kt
index 90a84b2fa464..69aeb3756170 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmWithOtherFlagsAddAll/before/src/main/kotlin/src.kt
+++ b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationJvmWithOtherFlagsAddAll/before/src/main/kotlin/src.kt
@@ -1,5 +1,5 @@
 // "Configure arguments for the feature: multi dollar interpolation" "true"
-// K2_ERROR: The feature "multi dollar interpolation" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xmulti-dollar-interpolation', but note that no stability guarantees are provided.
+// K2_ERROR: The feature "multi dollar interpolation" is only available since language version 2.2
 fun test() {
     <caret>$$"$Enable me$"
 }
diff --git a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationKmp/after/src/jsMain/kotlin/p/some.js.kt b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationKmp/after/src/jsMain/kotlin/p/some.js.kt
index aed4abfd8f52..4971a9d4cbd4 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationKmp/after/src/jsMain/kotlin/p/some.js.kt
+++ b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationKmp/after/src/jsMain/kotlin/p/some.js.kt
@@ -1,5 +1,5 @@
 // "Configure arguments for the feature: multi dollar interpolation" "true"
-// K2_ERROR: The feature "multi dollar interpolation" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xmulti-dollar-interpolation', but note that no stability guarantees are provided.
+// K2_ERROR: The feature "multi dollar interpolation" is only available since language version 2.2
 package p
 
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationKmp/before/src/jsMain/kotlin/p/some.js.kt b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationKmp/before/src/jsMain/kotlin/p/some.js.kt
index 8e781e578cea..48a5c2008864 100644
--- a/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationKmp/before/src/jsMain/kotlin/p/some.js.kt
+++ b/plugins/kotlin/idea/tests/testData/gradle/fixes/enableMultiDollarInterpolationKmp/before/src/jsMain/kotlin/p/some.js.kt
@@ -1,5 +1,5 @@
 // "Configure arguments for the feature: multi dollar interpolation" "true"
-// K2_ERROR: The feature "multi dollar interpolation" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xmulti-dollar-interpolation', but note that no stability guarantees are provided.
+// K2_ERROR: The feature "multi dollar interpolation" is only available since language version 2.2
 package p
 
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenGuardsUnsupported.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenGuardsUnsupported.kt
index cb55fa7706cd..ea319a64cab5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenGuardsUnsupported.kt
+++ b/plugins/kotlin/idea/tests/testData/intentions/branched/ifWhen/whenToIf/whenGuardsUnsupported.kt
@@ -1,6 +1,7 @@
 // COMPILER_ARGUMENTS: -XXLanguage:-WhenGuards
 // IS_APPLICABLE: false
-// ERROR: The feature "when guards" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xwhen-guards', but note that no stability guarantees are provided.
+// ERROR: The feature "when guards" is only available since language version 2.2
+// K2_ERROR: The feature "when guards" is only available since language version 2.2
 
 private fun test(s: Any) {
     when (s) {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/alreadyUsingGuard.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/alreadyUsingGuard.kt
index 35bc6dd45f33..8ca60007805d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/alreadyUsingGuard.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/alreadyUsingGuard.kt
@@ -1,7 +1,7 @@
 // IGNORE_K1
 // "Replace '&&' with 'if'" "false"
 // WITH_STDLIB
-// K2_AFTER_ERROR: The feature "when guards" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xwhen-guards', but note that no stability guarantees are provided.
+// K2_AFTER_ERROR: The feature "when guards" is only available since language version 2.2
 
 fun test(a: Any) {
     when (a) {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/multipleAnds.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/multipleAnds.kt
index 690e35db956b..17a2c1d84a98 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/multipleAnds.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/multipleAnds.kt
@@ -1,7 +1,7 @@
 // IGNORE_K1
 // "Replace '&&' with 'if'" "true"
 // WITH_STDLIB
-// K2_AFTER_ERROR: The feature "when guards" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xwhen-guards', but note that no stability guarantees are provided.
+// K2_AFTER_ERROR: The feature "when guards" is only available since language version 2.2
 
 fun test(a: Any) {
     when (a) {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/multipleAnds.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/multipleAnds.kt.after
index 982e1be13dc3..19bd07e025a1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/multipleAnds.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/multipleAnds.kt.after
@@ -1,7 +1,7 @@
 // IGNORE_K1
 // "Replace '&&' with 'if'" "true"
 // WITH_STDLIB
-// K2_AFTER_ERROR: The feature "when guards" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xwhen-guards', but note that no stability guarantees are provided.
+// K2_AFTER_ERROR: The feature "when guards" is only available since language version 2.2
 
 fun test(a: Any) {
     when (a) {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/simple.kt b/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/simple.kt
index 62cf867f5c6e..867286101595 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/simple.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/simple.kt
@@ -1,7 +1,7 @@
 // IGNORE_K1
 // "Replace '&&' with 'if'" "true"
 // WITH_STDLIB
-// K2_AFTER_ERROR: The feature "when guards" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xwhen-guards', but note that no stability guarantees are provided.
+// K2_AFTER_ERROR: The feature "when guards" is only available since language version 2.2
 
 fun test(a: Any) {
     when (a) {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/simple.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/simple.kt.after
index d7ab5f612038..0bb575c067f4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/simple.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceAndWithWhenGuard/simple.kt.after
@@ -1,7 +1,7 @@
 // IGNORE_K1
 // "Replace '&&' with 'if'" "true"
 // WITH_STDLIB
-// K2_AFTER_ERROR: The feature "when guards" is experimental and should be enabled explicitly. This can be done by supplying the compiler argument '-Xwhen-guards', but note that no stability guarantees are provided.
+// K2_AFTER_ERROR: The feature "when guards" is only available since language version 2.2
 
 fun test(a: Any) {
     when (a) {