From bfda9cc57be4ec12f49beb3b6c2eb88f8b3a61ba Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 3 Apr 2019 19:12:07 +0300 Subject: [PATCH] Fix inspection Integer.toString() -> int.toString() reports --- .../org/jetbrains/kotlin/codegen/AbstractLineNumberTest.kt | 4 ++-- .../jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt | 4 ++-- .../src/org/jetbrains/kotlin/js/naming/NameSuggestion.kt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.kt index dc7f8d8bcd8..d717044e8b7 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.kt @@ -110,7 +110,7 @@ abstract class AbstractLineNumberTest : CodegenTestCase() { } override fun visitLineNumber(line: Int, start: Label) { - labels2LineNumbers[start] = Integer.toString(line) + labels2LineNumbers[start] = line.toString() } } } @@ -147,7 +147,7 @@ abstract class AbstractLineNumberTest : CodegenTestCase() { for (i in lines.indices) { val matcher = TEST_LINE_NUMBER_PATTERN.matcher(lines[i]) if (matcher.matches()) { - lineNumbers.add(Integer.toString(i + 1)) + lineNumbers.add((i + 1).toString()) } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt index 73f3e8a07ae..049c6c2a838 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrLineNumberTest.kt @@ -54,13 +54,13 @@ abstract class AbstractIrLineNumberTest : AbstractLineNumberTest() { override fun visitLabel(label: Label) { if (lastLabel != null && !labels2LineNumbers.containsKey(lastLabel) && lastLine >= 0) { - labels2LineNumbers[lastLabel!!] = Integer.toString(lastLine) // Inherited line number + labels2LineNumbers[lastLabel!!] = lastLine.toString() // Inherited line number } lastLabel = label } override fun visitLineNumber(line: Int, start: Label) { - labels2LineNumbers[start] = Integer.toString(line) + labels2LineNumbers[start] = line.toString() lastLine = line } } diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/naming/NameSuggestion.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/naming/NameSuggestion.kt index c3a0a75c4a6..8e604f46df9 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/naming/NameSuggestion.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/naming/NameSuggestion.kt @@ -340,7 +340,7 @@ class NameSuggestion { private fun mangledId(forCalculateId: String): String { val absHashCode = Math.abs(forCalculateId.hashCode()) - return if (absHashCode != 0) Integer.toString(absHashCode, Character.MAX_RADIX) else "" + return if (absHashCode != 0) absHashCode.toString(Character.MAX_RADIX) else "" } private val DeclarationDescriptorWithVisibility.ownEffectiveVisibility