From e450a6494a4f43ac5f0e431f20dcc60015fa5b5d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 6 Apr 2021 18:58:25 +0300 Subject: [PATCH] Migrate deprecations in core, compiler, idea, tests Replacing deprecated Char.toInt() with Char.code and Number.toChar() with Number.toInt().toChar(), where Number is not Int. KT-23451 --- .../kotlin/codegen/CommonVariableAsmNameManglingUtils.kt | 2 +- .../codegen/range/PrimitiveNumberRangeIntrinsicRangeValue.kt | 2 +- .../kotlin/codegen/state/SignatureDumpingBuilderFactory.kt | 4 ++-- .../src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt | 2 +- .../fir/deserialization/AbstractAnnotationDeserializer.kt | 2 +- .../kotlin/fir/deserialization/FirConstDeserializer.kt | 2 +- .../kotlin/fir/serialization/FirAnnotationArgumentVisitor.kt | 2 +- .../kotlin/fir/serialization/constant/ConstantValue.kt | 2 +- compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt | 4 ++-- .../kotlin/backend/common/lower/loops/ProgressionType.kt | 4 ++-- .../org/jetbrains/kotlin/backend/common/lower/loops/Utils.kt | 2 +- .../org/jetbrains/kotlin/ir/backend/js/lower/ConstLowering.kt | 2 +- .../jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt | 4 ++-- .../jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt | 2 +- .../kotlin/ir/interpreter/builtins/IrBuiltInsMapGenerated.kt | 2 +- .../kotlin/backend/common/serialization/IrFileSerializer.kt | 2 +- .../jetbrains/kotlin/serialization/AnnotationSerializer.kt | 2 +- .../jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt | 2 +- .../org/jetbrains/kotlin/resolve/constants/constantValues.kt | 2 +- .../serialization/deserialization/AnnotationDeserializer.kt | 2 +- .../kotlin/metadata/jvm/deserialization/utfEncoding.kt | 2 +- generators/interpreter/GenerateInterpreterMap.kt | 2 +- .../kotlin/idea/scratch/output/InlayScratchFileRenderer.kt | 2 +- idea/jvm-debugger/eval4j/src/org/jetbrains/eval4j/values.kt | 2 +- .../jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt | 2 +- .../jetbrains/kotlin/js/resolve/diagnostics/jsRenderers.kt | 4 ++-- .../src/org/jetbrains/kotlin/js/parser/sourcemaps/JSON.kt | 2 +- .../jetbrains/kotlin/js/parser/sourcemaps/SourceMapParser.kt | 1 + .../kotlin/js/translate/expression/WhenTranslator.kt | 2 +- .../kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt | 2 +- 30 files changed, 35 insertions(+), 34 deletions(-) diff --git a/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/CommonVariableAsmNameManglingUtils.kt b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/CommonVariableAsmNameManglingUtils.kt index 11e56f6247a..c4d35f42ec3 100644 --- a/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/CommonVariableAsmNameManglingUtils.kt +++ b/compiler/backend.common.jvm/src/org/jetbrains/kotlin/codegen/CommonVariableAsmNameManglingUtils.kt @@ -18,7 +18,7 @@ fun mangleNameIfNeeded(name: String): String { if (c.isValidCharacter()) { append(c) } else { - val hexString = Integer.toHexString(c.toInt()) + val hexString = Integer.toHexString(c.code) assert(hexString.length <= 4) append("_u").append(hexString) } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/range/PrimitiveNumberRangeIntrinsicRangeValue.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/range/PrimitiveNumberRangeIntrinsicRangeValue.kt index 14d5e088cfb..a8c4406c164 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/range/PrimitiveNumberRangeIntrinsicRangeValue.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/range/PrimitiveNumberRangeIntrinsicRangeValue.kt @@ -131,7 +131,7 @@ abstract class PrimitiveNumberRangeIntrinsicRangeValue( if (isProhibitedCharConstEndValue(step, endCharValue)) null else - createConstBoundedIntForLoopGenerator(codegen, forExpression, startValue, endCharValue.toInt(), step, isStartInclusive) + createConstBoundedIntForLoopGenerator(codegen, forExpression, startValue, endCharValue.code, step, isStartInclusive) } is LongValue -> { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/SignatureDumpingBuilderFactory.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/SignatureDumpingBuilderFactory.kt index f9446f634eb..fb91294e804 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/SignatureDumpingBuilderFactory.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/SignatureDumpingBuilderFactory.kt @@ -140,8 +140,8 @@ private fun jsonEscape(value: String): String = buildString { '\r' -> append("\\r") '\"' -> append("\\\"") '\\' -> append("\\\\") - else -> if (ch.toInt() < 32) { - append("\\u" + Integer.toHexString(ch.toInt()).padStart(4, '0')) + else -> if (ch.code < 32) { + append("\\u" + Integer.toHexString(ch.code).padStart(4, '0')) } else { append(ch) diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt index 53e51d10293..3d8e51e6bae 100644 --- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt +++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinCompileDaemon.kt @@ -47,7 +47,7 @@ class LogStream(name: String) : OutputStream() { val lineBuf = StringBuilder() override fun write(byte: Int) { - if (byte.toChar() == '\n') flush() + if (byte == '\n'.code) flush() else lineBuf.append(byte.toChar()) } diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt index 3f83309f35d..5864842392d 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt @@ -243,7 +243,7 @@ abstract class AbstractAnnotationDeserializer( const(kind, value.intValue) } - CHAR -> const(ConstantValueKind.Char, value.intValue.toChar()) + CHAR -> const(ConstantValueKind.Char, value.intValue.toInt().toChar()) FLOAT -> const(ConstantValueKind.Float, value.floatValue) DOUBLE -> const(ConstantValueKind.Double, value.doubleValue) BOOLEAN -> const(ConstantValueKind.Boolean, (value.intValue != 0L)) diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirConstDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirConstDeserializer.kt index c903d4d7735..b3b0adfaafc 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirConstDeserializer.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirConstDeserializer.kt @@ -54,7 +54,7 @@ class FirConstDeserializer( ): FirExpression? { return when (constKind) { "BYTE", "B" -> buildConstExpression(null, ConstantValueKind.Byte, ((protoValue?.intValue ?: sourceValue) as Number).toByte()) - "CHAR", "C" -> buildConstExpression(null, ConstantValueKind.Char, ((protoValue?.intValue ?: sourceValue) as Number).toChar()) + "CHAR", "C" -> buildConstExpression(null, ConstantValueKind.Char, ((protoValue?.intValue ?: sourceValue) as Number).toInt().toChar()) "SHORT", "S" -> buildConstExpression(null, ConstantValueKind.Short, ((protoValue?.intValue ?: sourceValue) as Number).toShort()) "INT", "I" -> buildConstExpression(null, ConstantValueKind.Int, protoValue?.intValue?.toInt() ?: sourceValue as Int) "LONG", "J" -> buildConstExpression(null, ConstantValueKind.Long, protoValue?.intValue ?: sourceValue as Long) diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationArgumentVisitor.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationArgumentVisitor.kt index 00d00ebad38..728ff08f05d 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationArgumentVisitor.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationArgumentVisitor.kt @@ -35,7 +35,7 @@ internal object FirAnnotationArgumentVisitor : AnnotationArgumentVisitor(value) { internal class CharValue(value: Char) : IntegerValueConstant(value) { override fun accept(visitor: AnnotationArgumentVisitor, data: D): R = visitor.visitCharValue(this, data) - override fun toString(): String = "\\u%04X ('%s')".format(value.toInt(), getPrintablePart(value)) + override fun toString(): String = "\\u%04X ('%s')".format(value.code, getPrintablePart(value)) private fun getPrintablePart(c: Char): String = when (c) { '\b' -> "\\b" diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt index e4db047ec32..c4a888e6d30 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -847,10 +847,10 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM if (value !is Char) { print(value.toString()) } else { - if (value.toInt() in 32..127) { + if (value.code in 32..127) { print(value) } else { - print(value.toInt()) + print(value.code) } } print(")") diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/ProgressionType.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/ProgressionType.kt index da92c8a3820..e1f315d5a86 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/ProgressionType.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/ProgressionType.kt @@ -82,8 +82,8 @@ internal class CharProgressionType(symbols: Symbols) : ProgressionType( elementClass = symbols.char.owner, stepClass = symbols.int.owner, - minValueAsLong = Char.MIN_VALUE.toLong(), - maxValueAsLong = Char.MAX_VALUE.toLong(), + minValueAsLong = Char.MIN_VALUE.code.toLong(), + maxValueAsLong = Char.MAX_VALUE.code.toLong(), // Uses `getProgressionLastElement(Int, Int, Int): Int` getProgressionLastElementFunction = symbols.getProgressionLastElementByReturnType[symbols.int] ) { diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/Utils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/Utils.kt index 226f0dfa5e8..3a5ce956106 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/Utils.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/Utils.kt @@ -76,7 +76,7 @@ internal val IrExpression.canHaveSideEffects: Boolean private fun Any?.toLong(): Long? = when (this) { is Number -> toLong() - is Char -> toLong() + is Char -> code.toLong() else -> null } diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ConstLowering.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ConstLowering.kt index 267eff257db..4dfd7501e3e 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ConstLowering.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ConstLowering.kt @@ -60,7 +60,7 @@ class ConstTransformer(private val context: JsIrBackendContext) : IrElementTrans } return when { expression.kind is IrConstKind.Char -> - lowerConst(charClassSymbol, IrConstImpl.Companion::int, IrConstKind.Char.valueOf(expression).toInt()) + lowerConst(charClassSymbol, IrConstImpl.Companion::int, IrConstKind.Char.valueOf(expression).code) expression.kind is IrConstKind.Long -> createLong(IrConstKind.Long.valueOf(expression)) diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt index 0ced5396255..359e0980657 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt @@ -736,7 +736,7 @@ class ExpressionCodegen( private fun isDefaultValueForType(type: Type, value: Any?): Boolean = when (type) { Type.BOOLEAN_TYPE -> value is Boolean && !value - Type.CHAR_TYPE -> value is Char && value.toInt() == 0 + Type.CHAR_TYPE -> value is Char && value.code == 0 Type.BYTE_TYPE, Type.SHORT_TYPE, Type.INT_TYPE, Type.LONG_TYPE -> value is Number && value.toLong() == 0L // Must use `equals` for these two to differentiate between +0.0 and -0.0: Type.FLOAT_TYPE -> value is Number && value.toFloat().equals(0.0f) @@ -836,7 +836,7 @@ class ExpressionCodegen( mv.nop() return BooleanConstant(this, value) } - is Char -> mv.iconst(value.toInt()) + is Char -> mv.iconst(value.code) is Long -> mv.lconst(value) is Float -> mv.fconst(value) is Double -> mv.dconst(value) diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt index 494883579b9..b04eedbc032 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt @@ -53,7 +53,7 @@ class BodyGenerator(val context: WasmFunctionCodegenContext) : IrElementVisitorV is IrConstKind.Short -> body.buildConstI32(kind.valueOf(expression).toInt()) is IrConstKind.Int -> body.buildConstI32(kind.valueOf(expression)) is IrConstKind.Long -> body.buildConstI64(kind.valueOf(expression)) - is IrConstKind.Char -> body.buildConstI32(kind.valueOf(expression).toInt()) + is IrConstKind.Char -> body.buildConstI32(kind.valueOf(expression).code) is IrConstKind.Float -> body.buildConstF32(kind.valueOf(expression)) is IrConstKind.Double -> body.buildConstF64(kind.valueOf(expression)) is IrConstKind.String -> { diff --git a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/builtins/IrBuiltInsMapGenerated.kt b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/builtins/IrBuiltInsMapGenerated.kt index d76c697fb05..f6f7ae18de7 100644 --- a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/builtins/IrBuiltInsMapGenerated.kt +++ b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/builtins/IrBuiltInsMapGenerated.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.ir.interpreter.state.* /** This file is generated by org.jetbrains.kotlin.backend.common.interpreter.builtins.GenerateBuiltInsMap.generateMap(). DO NOT MODIFY MANUALLY */ -@Suppress("DEPRECATION_ERROR") +@Suppress("DEPRECATION", "DEPRECATION_ERROR") val unaryFunctions = mapOf>( unaryOperation("hashCode", "Boolean") { a -> a.hashCode() }, unaryOperation("not", "Boolean") { a -> a.not() }, diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt index ef02dbf425a..cddc194752d 100644 --- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt +++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt @@ -580,7 +580,7 @@ open class IrFileSerializer( IrConstKind.Null -> proto.`null` = true IrConstKind.Boolean -> proto.boolean = value.value as Boolean IrConstKind.Byte -> proto.byte = (value.value as Byte).toInt() - IrConstKind.Char -> proto.char = (value.value as Char).toInt() + IrConstKind.Char -> proto.char = (value.value as Char).code IrConstKind.Short -> proto.short = (value.value as Short).toInt() IrConstKind.Int -> proto.int = value.value as Int IrConstKind.Long -> proto.long = value.value as Long diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt index 5c369f07168..0f8aff078d7 100644 --- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt +++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt @@ -73,7 +73,7 @@ open class AnnotationSerializer(private val stringTable: DescriptorAwareStringTa override fun visitCharValue(value: CharValue, data: Unit) { type = Type.CHAR - intValue = value.value.toLong() + intValue = value.value.code.toLong() } override fun visitDoubleValue(value: DoubleValue, data: Unit) { diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt index d5fcf2948e9..2a57031092b 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt @@ -46,7 +46,7 @@ class JvmNameResolverTest : KtUsefulTestCase() { internalString?.let { setString(it) } operation?.let { setOperation(it) } substringIndex?.let { addAllSubstringIndex(it) } - replaceChar?.let { addAllReplaceChar(it.map(Char::toInt)) } + replaceChar?.let { addAllReplaceChar(it.map(Char::code)) } }.build()) string?.let { strings.add(it) } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt index a952785bb88..1400ce39fdd 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/constantValues.kt @@ -85,7 +85,7 @@ class CharValue(value: Char) : IntegerValueConstant(value) { override fun accept(visitor: AnnotationArgumentVisitor, data: D) = visitor.visitCharValue(this, data) - override fun toString() = "\\u%04X ('%s')".format(value.toInt(), getPrintablePart(value)) + override fun toString() = "\\u%04X ('%s')".format(value.code, getPrintablePart(value)) private fun getPrintablePart(c: Char): String = when (c) { '\b' -> "\\b" diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt index e72873f80ca..298da63c258 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt @@ -73,7 +73,7 @@ class AnnotationDeserializer(private val module: ModuleDescriptor, private val n return when (value.type) { Type.BYTE -> value.intValue.toByte().letIf(isUnsigned, ::UByteValue, ::ByteValue) - Type.CHAR -> CharValue(value.intValue.toChar()) + Type.CHAR -> CharValue(value.intValue.toInt().toChar()) Type.SHORT -> value.intValue.toShort().letIf(isUnsigned, ::UShortValue, ::ShortValue) Type.INT -> value.intValue.toInt().letIf(isUnsigned, ::UIntValue, ::IntValue) Type.LONG -> value.intValue.letIf(isUnsigned, ::ULongValue, ::LongValue) diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/utfEncoding.kt b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/utfEncoding.kt index 0d018e1cda0..3102c67dfed 100644 --- a/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/utfEncoding.kt +++ b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/deserialization/utfEncoding.kt @@ -62,7 +62,7 @@ fun stringsToBytes(strings: Array): ByteArray { var i = 0 for (s in strings) { for (si in 0..s.length - 1) { - result[i++] = s[si].toByte() + result[i++] = s[si].code.toByte() } } diff --git a/generators/interpreter/GenerateInterpreterMap.kt b/generators/interpreter/GenerateInterpreterMap.kt index 87bdd6474f6..1d3ab58abc0 100644 --- a/generators/interpreter/GenerateInterpreterMap.kt +++ b/generators/interpreter/GenerateInterpreterMap.kt @@ -52,7 +52,7 @@ fun generateMap(): String { val binaryIrOperationsMap = getBinaryIrOperationMap(irBuiltIns) - p.println("@Suppress(\"DEPRECATION_ERROR\")") + p.println("@Suppress(\"DEPRECATION\", \"DEPRECATION_ERROR\")") p.println("val unaryFunctions = mapOf>(") p.println(generateUnaryBody(unaryOperationsMap, irBuiltIns)) p.println(")") diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt index 95df7c30aa7..3145de754bf 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchFileRenderer.kt @@ -21,7 +21,7 @@ class InlayScratchFileRenderer(val text: String, private val outputType: Scratch val attributes = getAttributesForOutputType(outputType) val fontStyle = attributes.fontType return ComplementaryFontsRegistry.getFontAbleToDisplay( - 'a'.toInt(), fontStyle, fontPreferences, FontInfo.getFontRenderContext(editor.contentComponent) + 'a'.code, fontStyle, fontPreferences, FontInfo.getFontRenderContext(editor.contentComponent) ) } diff --git a/idea/jvm-debugger/eval4j/src/org/jetbrains/eval4j/values.kt b/idea/jvm-debugger/eval4j/src/org/jetbrains/eval4j/values.kt index 5734469d7f6..cf324497d0b 100644 --- a/idea/jvm-debugger/eval4j/src/org/jetbrains/eval4j/values.kt +++ b/idea/jvm-debugger/eval4j/src/org/jetbrains/eval4j/values.kt @@ -94,7 +94,7 @@ class LabelValue(value: LabelNode) : AbstractValue(value, Type.VOID_T fun boolean(v: Boolean) = IntValue(if (v) 1 else 0, Type.BOOLEAN_TYPE) fun byte(v: Byte) = IntValue(v.toInt(), Type.BYTE_TYPE) fun short(v: Short) = IntValue(v.toInt(), Type.SHORT_TYPE) -fun char(v: Char) = IntValue(v.toInt(), Type.CHAR_TYPE) +fun char(v: Char) = IntValue(v.code, Type.CHAR_TYPE) fun int(v: Int) = IntValue(v, Type.INT_TYPE) fun long(v: Long) = LongValue(v) fun float(v: Float) = FloatValue(v) diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt index 1f8b9bdf1b6..31bcd475ddd 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt @@ -167,7 +167,7 @@ private fun String.offsetOf(position: CodePosition): Int { i++ offsetInLine++ - if (isEndOfLine(c.toInt())) { + if (isEndOfLine(c.code)) { offsetInLine = 0 lineCount++ assert(lineCount <= position.line) diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/jsRenderers.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/jsRenderers.kt index c768e61cd7c..1b83bb1244d 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/jsRenderers.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/jsRenderers.kt @@ -80,7 +80,7 @@ fun String.underlineAsText(from: Int, to: Int): String { marks.append(mark) lineWasMarked = lineWasMarked || mark != ' ' - if (isEndOfLine(c.toInt())) { + if (isEndOfLine(c.code)) { if (lineWasMarked) { lines.appendLine(marks.toString().trimEnd()) lineWasMarked = false @@ -121,7 +121,7 @@ fun String.underlineAsHtml(from: Int, to: Int): String { lines.append(mark) - if (isEndOfLine(c.toInt()) && openMarker) { + if (isEndOfLine(c.code) && openMarker) { lines.append(underlineEnd + c + underlineStart) } else { lines.append(c) diff --git a/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/JSON.kt b/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/JSON.kt index a6e0ee855a4..c708d3ed477 100644 --- a/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/JSON.kt +++ b/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/JSON.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +@file:Suppress("DEPRECATION") // TODO: needs an intensive rework for new Char API package org.jetbrains.kotlin.js.parser.sourcemaps import java.io.* diff --git a/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/SourceMapParser.kt b/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/SourceMapParser.kt index ac602ba3271..4a0e23e7794 100644 --- a/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/SourceMapParser.kt +++ b/js/js.parser/src/org/jetbrains/kotlin/js/parser/sourcemaps/SourceMapParser.kt @@ -14,6 +14,7 @@ * limitations under the License. */ +@file:Suppress("DEPRECATION") // TODO: needs an intensive rework for new Char API package org.jetbrains.kotlin.js.parser.sourcemaps import java.io.File diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.kt index c8468a34bab..1861b811857 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/WhenTranslator.kt @@ -197,7 +197,7 @@ private constructor(private val whenExpression: KtWhenExpression, context: Trans is Int -> JsIntLiteral(it) is Short -> JsIntLiteral(it.toInt()) is Byte -> JsIntLiteral(it.toInt()) - is Char -> JsIntLiteral(it.toInt()) + is Char -> JsIntLiteral(it.code) else -> null } } diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt index 9af096ef3af..cb8c559cc57 100644 --- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt +++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt @@ -1330,7 +1330,7 @@ class ClassFileToSourceStubConverter(val kaptContext: KaptContextForStubGenerati private fun convertValueOfPrimitiveTypeOrString(value: Any?): JCExpression? { fun specialFpValueNumerator(value: Double): Double = if (value.isNaN()) 0.0 else 1.0 * value.sign return when (value) { - is Char -> treeMaker.Literal(TypeTag.CHAR, value.toInt()) + is Char -> treeMaker.Literal(TypeTag.CHAR, value.code) is Byte -> treeMaker.TypeCast(treeMaker.TypeIdent(TypeTag.BYTE), treeMaker.Literal(TypeTag.INT, value.toInt())) is Short -> treeMaker.TypeCast(treeMaker.TypeIdent(TypeTag.SHORT), treeMaker.Literal(TypeTag.INT, value.toInt())) is Boolean, is Int, is Long, is String -> treeMaker.Literal(value)