Google Git
Sign in
pigweed/third_party/github/JetBrains/kotlin/refs/heads/upstream/rr/serras/version-overloads-inline^!/.
commit
2cf8aa04db61479b4dab30a93321e53171b41ae9
[log]
author
Alejandro Serrano Mena <alejandro.serrano.mena@jetbrains.com>
Thu Jul 02 11:25:24 2026 +0200
committer
Alejandro Serrano Mena <alejandro.serrano.mena@jetbrains.com>
Thu Jul 02 11:25:24 2026 +0200
tree
d9e298d239c2c19a7b1a56a2764657deac9cedfa
parent
bf33b6fa23bbb07457d6dbc544ad2dcf4abf91d5 [diff]
Fix some tests + apply suggestions

diff --git a/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnostics.kt b/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnostics.kt
index 0e5759d..81a083f 100644
--- a/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnostics.kt
+++ b/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnostics.kt

@@ -4740,23 +4740,23 @@
         override val diagnosticClass get() = InvalidVersioningOnReceiverOrContextParameterPosition::class
     }
 
-    interface InvalidVersioningOnRequiredAfterOptional : KaFirDiagnostic<KtParameter> {
+    interface InvalidVersioningOnRequiredAfterOptional : KaFirDiagnostic<PsiElement> {
         override val diagnosticClass get() = InvalidVersioningOnRequiredAfterOptional::class
     }
 
-    interface InvalidVersioningOnNonOptional : KaFirDiagnostic<KtAnnotationEntry> {
+    interface InvalidVersioningOnNonOptional : KaFirDiagnostic<PsiElement> {
         override val diagnosticClass get() = InvalidVersioningOnNonOptional::class
     }
 
-    interface InvalidVersioningOnVararg : KaFirDiagnostic<KtAnnotationEntry> {
+    interface InvalidVersioningOnVararg : KaFirDiagnostic<PsiElement> {
         override val diagnosticClass get() = InvalidVersioningOnVararg::class
     }
 
-    interface InvalidVersioningOnValueClassParameter : KaFirDiagnostic<KtAnnotationEntry> {
+    interface InvalidVersioningOnValueClassParameter : KaFirDiagnostic<PsiElement> {
         override val diagnosticClass get() = InvalidVersioningOnValueClassParameter::class
     }
 
-    interface NonAscendingVersionAnnotation : KaFirDiagnostic<KtAnnotationEntry> {
+    interface NonAscendingVersionAnnotation : KaFirDiagnostic<PsiElement> {
         override val diagnosticClass get() = NonAscendingVersionAnnotation::class
         val lowestVersion: MavenComparableVersion?
         val highestVersion: MavenComparableVersion?

diff --git a/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnosticsImpl.kt b/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnosticsImpl.kt
index e71b0ec..7175230 100644
--- a/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnosticsImpl.kt
+++ b/analysis/analysis-api-fir/gen/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KaFirDiagnosticsImpl.kt

@@ -5692,22 +5692,22 @@
 internal class InvalidVersioningOnRequiredAfterOptionalImpl(
     firDiagnostic: KtPsiDiagnostic,
     token: KaLifetimeToken,
-) : KaAbstractFirDiagnostic<KtParameter>(firDiagnostic, token), KaFirDiagnostic.InvalidVersioningOnRequiredAfterOptional
+) : KaAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KaFirDiagnostic.InvalidVersioningOnRequiredAfterOptional
 
 internal class InvalidVersioningOnNonOptionalImpl(
     firDiagnostic: KtPsiDiagnostic,
     token: KaLifetimeToken,
-) : KaAbstractFirDiagnostic<KtAnnotationEntry>(firDiagnostic, token), KaFirDiagnostic.InvalidVersioningOnNonOptional
+) : KaAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KaFirDiagnostic.InvalidVersioningOnNonOptional
 
 internal class InvalidVersioningOnVarargImpl(
     firDiagnostic: KtPsiDiagnostic,
     token: KaLifetimeToken,
-) : KaAbstractFirDiagnostic<KtAnnotationEntry>(firDiagnostic, token), KaFirDiagnostic.InvalidVersioningOnVararg
+) : KaAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KaFirDiagnostic.InvalidVersioningOnVararg
 
 internal class InvalidVersioningOnValueClassParameterImpl(
     firDiagnostic: KtPsiDiagnostic,
     token: KaLifetimeToken,
-) : KaAbstractFirDiagnostic<KtAnnotationEntry>(firDiagnostic, token), KaFirDiagnostic.InvalidVersioningOnValueClassParameter
+) : KaAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KaFirDiagnostic.InvalidVersioningOnValueClassParameter
 
 internal class NonAscendingVersionAnnotationImpl(
     override val lowestVersion: MavenComparableVersion?,
@@ -5715,7 +5715,7 @@
     override val sourceOfHighestVersion: KaCallableSymbol,
     firDiagnostic: KtPsiDiagnostic,
     token: KaLifetimeToken,
-) : KaAbstractFirDiagnostic<KtAnnotationEntry>(firDiagnostic, token), KaFirDiagnostic.NonAscendingVersionAnnotation
+) : KaAbstractFirDiagnostic<PsiElement>(firDiagnostic, token), KaFirDiagnostic.NonAscendingVersionAnnotation
 
 internal class InvalidDefaultValueDependencyImpl(
     override val lowestVersion: MavenComparableVersion?,

diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt
index 6667dfd..854510d 100644
--- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt
+++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt

@@ -2407,13 +2407,13 @@
         val INVALID_VERSIONING_ON_INLINE by error<KtDeclaration>(PositioningStrategy.DECLARATION_NAME)
 
         val INVALID_VERSIONING_ON_RECEIVER_OR_CONTEXT_PARAMETER_POSITION by error<PsiElement>()
-        val INVALID_VERSIONING_ON_REQUIRED_AFTER_OPTIONAL by error<KtParameter>()
+        val INVALID_VERSIONING_ON_REQUIRED_AFTER_OPTIONAL by error<PsiElement>()
 
-        val INVALID_VERSIONING_ON_NON_OPTIONAL by error<KtAnnotationEntry>()
-        val INVALID_VERSIONING_ON_VARARG by error<KtAnnotationEntry>()
-        val INVALID_VERSIONING_ON_VALUE_CLASS_PARAMETER by error<KtAnnotationEntry>()
+        val INVALID_VERSIONING_ON_NON_OPTIONAL by error<PsiElement>()
+        val INVALID_VERSIONING_ON_VARARG by error<PsiElement>()
+        val INVALID_VERSIONING_ON_VALUE_CLASS_PARAMETER by error<PsiElement>()
 
-        val NON_ASCENDING_VERSION_ANNOTATION by error<KtAnnotationEntry> {
+        val NON_ASCENDING_VERSION_ANNOTATION by error<PsiElement> {
             parameter<MavenComparableVersion?>("lowestVersion")
             parameter<MavenComparableVersion?>("highestVersion")
             parameter<FirCallableSymbol<*>>("sourceOfHighestVersion")

diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
index 07e80d8..08a820e 100644
--- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
+++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt

@@ -1121,11 +1121,11 @@
     val INVALID_VERSIONING_ON_ANNOTATION_CLASS: KtDiagnosticFactory0 = KtDiagnosticFactory0("INVALID_VERSIONING_ON_ANNOTATION_CLASS", ERROR, SourceElementPositioningStrategies.DECLARATION_NAME, KtDeclaration::class, getRendererFactory())
     val INVALID_VERSIONING_ON_INLINE: KtDiagnosticFactory0 = KtDiagnosticFactory0("INVALID_VERSIONING_ON_INLINE", ERROR, SourceElementPositioningStrategies.DECLARATION_NAME, KtDeclaration::class, getRendererFactory())
     val INVALID_VERSIONING_ON_RECEIVER_OR_CONTEXT_PARAMETER_POSITION: KtDiagnosticFactory0 = KtDiagnosticFactory0("INVALID_VERSIONING_ON_RECEIVER_OR_CONTEXT_PARAMETER_POSITION", ERROR, SourceElementPositioningStrategies.DEFAULT, PsiElement::class, getRendererFactory())
-    val INVALID_VERSIONING_ON_REQUIRED_AFTER_OPTIONAL: KtDiagnosticFactory0 = KtDiagnosticFactory0("INVALID_VERSIONING_ON_REQUIRED_AFTER_OPTIONAL", ERROR, SourceElementPositioningStrategies.DEFAULT, KtParameter::class, getRendererFactory())
-    val INVALID_VERSIONING_ON_NON_OPTIONAL: KtDiagnosticFactory0 = KtDiagnosticFactory0("INVALID_VERSIONING_ON_NON_OPTIONAL", ERROR, SourceElementPositioningStrategies.DEFAULT, KtAnnotationEntry::class, getRendererFactory())
-    val INVALID_VERSIONING_ON_VARARG: KtDiagnosticFactory0 = KtDiagnosticFactory0("INVALID_VERSIONING_ON_VARARG", ERROR, SourceElementPositioningStrategies.DEFAULT, KtAnnotationEntry::class, getRendererFactory())
-    val INVALID_VERSIONING_ON_VALUE_CLASS_PARAMETER: KtDiagnosticFactory0 = KtDiagnosticFactory0("INVALID_VERSIONING_ON_VALUE_CLASS_PARAMETER", ERROR, SourceElementPositioningStrategies.DEFAULT, KtAnnotationEntry::class, getRendererFactory())
-    val NON_ASCENDING_VERSION_ANNOTATION: KtDiagnosticFactory3<MavenComparableVersion?, MavenComparableVersion?, FirCallableSymbol<*>> = KtDiagnosticFactory3("NON_ASCENDING_VERSION_ANNOTATION", ERROR, SourceElementPositioningStrategies.DEFAULT, KtAnnotationEntry::class, getRendererFactory())
+    val INVALID_VERSIONING_ON_REQUIRED_AFTER_OPTIONAL: KtDiagnosticFactory0 = KtDiagnosticFactory0("INVALID_VERSIONING_ON_REQUIRED_AFTER_OPTIONAL", ERROR, SourceElementPositioningStrategies.DEFAULT, PsiElement::class, getRendererFactory())
+    val INVALID_VERSIONING_ON_NON_OPTIONAL: KtDiagnosticFactory0 = KtDiagnosticFactory0("INVALID_VERSIONING_ON_NON_OPTIONAL", ERROR, SourceElementPositioningStrategies.DEFAULT, PsiElement::class, getRendererFactory())
+    val INVALID_VERSIONING_ON_VARARG: KtDiagnosticFactory0 = KtDiagnosticFactory0("INVALID_VERSIONING_ON_VARARG", ERROR, SourceElementPositioningStrategies.DEFAULT, PsiElement::class, getRendererFactory())
+    val INVALID_VERSIONING_ON_VALUE_CLASS_PARAMETER: KtDiagnosticFactory0 = KtDiagnosticFactory0("INVALID_VERSIONING_ON_VALUE_CLASS_PARAMETER", ERROR, SourceElementPositioningStrategies.DEFAULT, PsiElement::class, getRendererFactory())
+    val NON_ASCENDING_VERSION_ANNOTATION: KtDiagnosticFactory3<MavenComparableVersion?, MavenComparableVersion?, FirCallableSymbol<*>> = KtDiagnosticFactory3("NON_ASCENDING_VERSION_ANNOTATION", ERROR, SourceElementPositioningStrategies.DEFAULT, PsiElement::class, getRendererFactory())
     val INVALID_DEFAULT_VALUE_DEPENDENCY: KtDiagnosticFactory2<MavenComparableVersion?, MavenComparableVersion?> = KtDiagnosticFactory2("INVALID_DEFAULT_VALUE_DEPENDENCY", ERROR, SourceElementPositioningStrategies.DEFAULT, PsiElement::class, getRendererFactory())
     val VERSION_OVERLOADS_TOO_COMPLEX_EXPRESSION: KtDiagnosticFactory0 = KtDiagnosticFactory0("VERSION_OVERLOADS_TOO_COMPLEX_EXPRESSION", ERROR, SourceElementPositioningStrategies.DEFAULT, PsiElement::class, getRendererFactory())
 

diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirVersionOverloadsChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirVersionOverloadsChecker.kt
index d601844..6e6c090 100644
--- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirVersionOverloadsChecker.kt
+++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirVersionOverloadsChecker.kt

@@ -8,7 +8,6 @@
 import org.jetbrains.kotlin.config.MavenComparableVersion
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
-import org.jetbrains.kotlin.diagnostics.SourceElementPositioningStrategies
 import org.jetbrains.kotlin.diagnostics.reportOn
 import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind

diff --git a/compiler/testData/diagnostics/tests/versionOverload/optionalBeforeNonOptional.kt b/compiler/testData/diagnostics/tests/versionOverload/optionalBeforeNonOptional.kt
index 9532f0cb..56dde18 100644
--- a/compiler/testData/diagnostics/tests/versionOverload/optionalBeforeNonOptional.kt
+++ b/compiler/testData/diagnostics/tests/versionOverload/optionalBeforeNonOptional.kt

@@ -3,6 +3,6 @@
 
 @file:OptIn(ExperimentalVersionOverloading::class)
 
-fun foo(@IntroducedAt("1") b: Int = 1, <!INVALID_NON_OPTIONAL_PARAMETER_POSITION!>x: String<!>) {}
+fun foo(@IntroducedAt("1") b: Int = 1, <!INVALID_VERSIONING_ON_REQUIRED_AFTER_OPTIONAL!>x: String<!>) {}
 
-/* GENERATED_FIR_TAGS: annotationUseSiteTargetFile, classReference, functionDeclaration, integerLiteral, stringLiteral */
\ No newline at end of file
+/* GENERATED_FIR_TAGS: annotationUseSiteTargetFile, classReference, functionDeclaration, integerLiteral, stringLiteral */

diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.accessors.txt
deleted file mode 100644
index f9d0b0f..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.accessors.txt
+++ /dev/null

@@ -1,24 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=A.kt */
-
-private val ok: String
-    /* TARGET declaration */ private fun <get-ok>(): String
-internal inline fun internalInlineFun(ok1: String, ok2: String): String
-    ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tAKt()
-internal inline fun internalInlineFun(ok1: String): String
-    ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tAKt()
-internal inline fun internalInlineFun(): String
-    val ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tAKt()
-/* ACCESSOR declaration */ internal fun access$<get-ok>$tAKt(): String
-    /* TARGET use-site */ <get-ok>()
-
-
-/* FILE package=<root> fileName=B.kt */
-
-public fun box(): String
-    val ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tAKt()

diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.kt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.kt
deleted file mode 100644
index a39bbd8..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossFilePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.kt
+++ /dev/null

@@ -1,12 +0,0 @@
-// FILE: A.kt
-@file:OptIn(ExperimentalVersionOverloading::class)
-
-private val ok = "OK"
-
-internal inline fun internalInlineFun(
-    @IntroducedAt("1") ok1: String = ok,
-    @IntroducedAt("2") ok2: String = ok1
-) = ok2
-
-// FILE: B.kt
-fun box(): String = internalInlineFun()

diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.accessors.txt
deleted file mode 100644
index e1abb47..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.accessors.txt
+++ /dev/null

@@ -1,26 +0,0 @@
-/* MODULE name=<lib> */
-
-/* FILE package=<root> fileName=A.kt */
-
-private val ok: String
-    /* TARGET declaration */ private fun <get-ok>(): String
-internal inline fun internalInlineFun(ok1: String, ok2: String): String
-    ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tAKt()
-internal inline fun internalInlineFun(ok1: String): String
-    ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tAKt()
-internal inline fun internalInlineFun(): String
-    val ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tAKt()
-/* ACCESSOR declaration */ internal fun access$<get-ok>$tAKt(): String
-    /* TARGET use-site */ <get-ok>()
-
-
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=main.kt */
-
-public fun box(): String
-    val ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tAKt()

diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.kt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.kt
deleted file mode 100644
index c47c966..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/crossModulePrivateLeak/leakingPrivateValThroughIntroducedAtParameter.kt
+++ /dev/null

@@ -1,14 +0,0 @@
-// MODULE: lib
-// FILE: A.kt
-@file:OptIn(ExperimentalVersionOverloading::class)
-
-private val ok = "OK"
-
-internal inline fun internalInlineFun(
-    @IntroducedAt("1") ok1: String = ok,
-    @IntroducedAt("2") ok2: String = ok1
-) = ok2
-
-// MODULE: main()(lib)
-// FILE: main.kt
-fun box(): String = internalInlineFun()

diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/leakingPrivateValThroughIntroducedAtParameter.accessors.txt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/leakingPrivateValThroughIntroducedAtParameter.accessors.txt
deleted file mode 100644
index 3ff044b..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/leakingPrivateValThroughIntroducedAtParameter.accessors.txt
+++ /dev/null

@@ -1,20 +0,0 @@
-/* MODULE name=<main> */
-
-/* FILE package=<root> fileName=leakingPrivateValThroughIntroducedAtParameter.kt */
-
-private val ok: String
-    /* TARGET declaration */ private fun <get-ok>(): String
-internal inline fun internalInlineFun(ok1: String, ok2: String): String
-    ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tLeakingPrivateValThroughIntroducedAtParameterKt()
-public fun box(): String
-    val ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tLeakingPrivateValThroughIntroducedAtParameterKt()
-internal inline fun internalInlineFun(ok1: String): String
-    ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tLeakingPrivateValThroughIntroducedAtParameterKt()
-internal inline fun internalInlineFun(): String
-    val ok1: String
-        /* ACCESSOR use-site */ access$<get-ok>$tLeakingPrivateValThroughIntroducedAtParameterKt()
-/* ACCESSOR declaration */ internal fun access$<get-ok>$tLeakingPrivateValThroughIntroducedAtParameterKt(): String
-    /* TARGET use-site */ <get-ok>()

diff --git a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/leakingPrivateValThroughIntroducedAtParameter.kt b/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/leakingPrivateValThroughIntroducedAtParameter.kt
deleted file mode 100644
index c7698b1..0000000
--- a/compiler/testData/klib/syntheticAccessors/topLevelPrivate/singleFile/leakingPrivateValThroughIntroducedAtParameter.kt
+++ /dev/null

@@ -1,10 +0,0 @@
-@file:OptIn(ExperimentalVersionOverloading::class)
-
-private val ok = "OK"
-
-internal inline fun internalInlineFun(
-    @IntroducedAt("1") ok1: String = ok,
-    @IntroducedAt("2") ok2: String = ok1
-) = ok2
-
-fun box(): String = internalInlineFun()

diff --git a/js/js.translator/testData/typescript-export/js/annotations/annotations.kt b/js/js.translator/testData/typescript-export/js/annotations/annotations.kt
index 87943f0..5a3cfd7 100644
--- a/js/js.translator/testData/typescript-export/js/annotations/annotations.kt
+++ b/js/js.translator/testData/typescript-export/js/annotations/annotations.kt

@@ -50,7 +50,7 @@
 fun invalidParameterPosition(
     x: Int = 4,
     @IntroducedAt("1") y: Int = 2,
-    <!INVALID_NON_OPTIONAL_PARAMETER_POSITION!>z: Int<!>
+    <!INVALID_VERSIONING_ON_REQUIRED_AFTER_OPTIONAL!>z: Int<!>
 ) {}
 
 @JsExport
@@ -72,7 +72,7 @@
 data class ConstructorWithInvalidParameterPosition(
     val x: Int,
     @IntroducedAt("1") val y: Int = x,
-    <!INVALID_NON_OPTIONAL_PARAMETER_POSITION!>val z: Int<!>
+    <!INVALID_VERSIONING_ON_REQUIRED_AFTER_OPTIONAL!>val z: Int<!>
 )
 
 @JsExport