fixup! KT-36932 Update API and builtins dumps rollback workaround
diff --git a/generators/builtins/generateBuiltIns.kt b/generators/builtins/generateBuiltIns.kt index eadf534..324f4d8 100644 --- a/generators/builtins/generateBuiltIns.kt +++ b/generators/builtins/generateBuiltIns.kt
@@ -35,8 +35,6 @@ protected open fun getMultifileClassName(): String? = null - protected open fun getFileAnnotations(): List<String> = emptyList() - fun generate() { out.println(File("license/COPYRIGHT_HEADER.txt").readText()) out.println() @@ -48,9 +46,6 @@ out.println("@file:kotlin.jvm.JvmName(\"$name\")") out.println("@file:kotlin.jvm.JvmMultifileClass") } - getFileAnnotations().forEach { annotation -> - out.println("@file:$annotation") - } out.print("package ${getPackage()}") out.println() out.println()
diff --git a/generators/builtins/progressions.kt b/generators/builtins/progressions.kt index f787777..b955e84 100644 --- a/generators/builtins/progressions.kt +++ b/generators/builtins/progressions.kt
@@ -27,10 +27,6 @@ class GenerateProgressions(out: PrintWriter) : BuiltInsSourceGenerator(out) { override fun getPackage() = "kotlin.ranges" - override fun getFileAnnotations(): List<String> = - // TODO: make source retention annotations ignored by LoadBuiltinsTest and move closer to usage - listOf("""Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") // preserve parameter name of 'contains' override""") - private fun generateDiscreteBody(kind: ProgressionKind) { val t = kind.capitalized val progression = "${t}Progression" @@ -133,7 +129,7 @@ get() = $sizeBody @SinceKotlin("1.9") - override fun contains(value: $t): Boolean = when { + override fun contains(@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") /* for the backward compatibility with old names */ value: $t): Boolean = when { @Suppress("USELESS_CAST") (value as Any? !is $t) -> false // TODO: Eliminate this check after KT-30016 gets fixed. step > $zero && value >= first && value <= last || step < $zero && value <= first && value >= last -> value$elementToIncrement.mod(step) == first$elementToIncrement.mod(step)
diff --git a/libraries/stdlib/src/kotlin/ranges/Progressions.kt b/libraries/stdlib/src/kotlin/ranges/Progressions.kt index 9994fa8..e4096cb 100644 --- a/libraries/stdlib/src/kotlin/ranges/Progressions.kt +++ b/libraries/stdlib/src/kotlin/ranges/Progressions.kt
@@ -5,7 +5,6 @@ // Auto-generated file. DO NOT EDIT! -@file:Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") // preserve parameter name of 'contains' override package kotlin.ranges import kotlin.internal.getProgressionLastElement @@ -65,7 +64,7 @@ get() = if (isEmpty()) 0 else (last - first) / step + 1 @SinceKotlin("1.9") - override fun contains(value: Char): Boolean = when { + override fun contains(@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") /* for the backward compatibility with old names */ value: Char): Boolean = when { @Suppress("USELESS_CAST") (value as Any? !is Char) -> false // TODO: Eliminate this check after KT-30016 gets fixed. step > 0 && value >= first && value <= last || step < 0 && value <= first && value >= last -> value.code.mod(step) == first.code.mod(step) @@ -150,7 +149,7 @@ } @SinceKotlin("1.9") - override fun contains(value: Int): Boolean = when { + override fun contains(@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") /* for the backward compatibility with old names */ value: Int): Boolean = when { @Suppress("USELESS_CAST") (value as Any? !is Int) -> false // TODO: Eliminate this check after KT-30016 gets fixed. step > 0 && value >= first && value <= last || step < 0 && value <= first && value >= last -> value.mod(step) == first.mod(step) @@ -235,7 +234,7 @@ } @SinceKotlin("1.9") - override fun contains(value: Long): Boolean = when { + override fun contains(@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE") /* for the backward compatibility with old names */ value: Long): Boolean = when { @Suppress("USELESS_CAST") (value as Any? !is Long) -> false // TODO: Eliminate this check after KT-30016 gets fixed. step > 0L && value >= first && value <= last || step < 0L && value <= first && value >= last -> value.mod(step) == first.mod(step)