From 34d96dff28896218901dde1f02092301bf5cf9e3 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 11 Dec 2018 18:07:53 +0300 Subject: [PATCH] Minor: rename const according to style guide --- .../kotlin/jvm/abi/JvmAbiAnalysisHandlerExtension.kt | 4 ++-- .../src/org/jetbrains/kotlin/jvm/abi/asm/AsmApiVersion.kt | 2 +- .../kotlin/jvm/abi/asm/InnerClassesCollectingVisitor.kt | 2 +- .../kotlin/jvm/abi/asm/ReplaceWithEmptyMethodVisitor.kt | 2 +- .../jetbrains/kotlin/jvm/abi/AbstractJvmAbiContentTest.kt | 5 ++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiAnalysisHandlerExtension.kt b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiAnalysisHandlerExtension.kt index 5c1f60fbe22..62b88ed8994 100644 --- a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiAnalysisHandlerExtension.kt +++ b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiAnalysisHandlerExtension.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.incremental.LocalFileKotlinClass import org.jetbrains.kotlin.incremental.isClassFile import org.jetbrains.kotlin.jvm.abi.asm.AbiClassBuilder -import org.jetbrains.kotlin.jvm.abi.asm.AbiExtensionAsmApiVersion +import org.jetbrains.kotlin.jvm.abi.asm.ABI_EXTENSION_ASM_API_VERSION import org.jetbrains.kotlin.jvm.abi.asm.FilterInnerClassesVisitor import org.jetbrains.kotlin.jvm.abi.asm.InnerClassesCollectingVisitor import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass @@ -158,7 +158,7 @@ class JvmAbiAnalysisHandlerExtension( output.delete() } else { output.transform { writer -> - FilterInnerClassesVisitor(classesToRemove, AbiExtensionAsmApiVersion, writer) + FilterInnerClassesVisitor(classesToRemove, ABI_EXTENSION_ASM_API_VERSION, writer) } } } diff --git a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/AsmApiVersion.kt b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/AsmApiVersion.kt index 906472c2b58..d7debef0887 100644 --- a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/AsmApiVersion.kt +++ b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/AsmApiVersion.kt @@ -7,4 +7,4 @@ package org.jetbrains.kotlin.jvm.abi.asm import org.jetbrains.org.objectweb.asm.Opcodes -internal const val AbiExtensionAsmApiVersion = Opcodes.ASM6 \ No newline at end of file +internal const val ABI_EXTENSION_ASM_API_VERSION = Opcodes.ASM6 \ No newline at end of file diff --git a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/InnerClassesCollectingVisitor.kt b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/InnerClassesCollectingVisitor.kt index c3bdd7321c3..382cd82930e 100644 --- a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/InnerClassesCollectingVisitor.kt +++ b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/InnerClassesCollectingVisitor.kt @@ -2,7 +2,7 @@ package org.jetbrains.kotlin.jvm.abi.asm import org.jetbrains.org.objectweb.asm.ClassVisitor -internal class InnerClassesCollectingVisitor : ClassVisitor(AbiExtensionAsmApiVersion) { +internal class InnerClassesCollectingVisitor : ClassVisitor(ABI_EXTENSION_ASM_API_VERSION) { lateinit var ownInternalName: String private set diff --git a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/ReplaceWithEmptyMethodVisitor.kt b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/ReplaceWithEmptyMethodVisitor.kt index 3cbb227cfd6..6f7e7f0e68e 100644 --- a/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/ReplaceWithEmptyMethodVisitor.kt +++ b/plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/ReplaceWithEmptyMethodVisitor.kt @@ -16,7 +16,7 @@ internal class ReplaceWithEmptyMethodVisitor( desc: String, signature: String?, exceptions: Array? -) : TransformationMethodVisitor(delegate, access, name, desc, signature, exceptions, api = AbiExtensionAsmApiVersion) { +) : TransformationMethodVisitor(delegate, access, name, desc, signature, exceptions, api = ABI_EXTENSION_ASM_API_VERSION) { override fun performTransformations(methodNode: MethodNode) { methodNode.instructions.clear() } diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractJvmAbiContentTest.kt b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractJvmAbiContentTest.kt index d58710971ae..24aa02384ae 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractJvmAbiContentTest.kt +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractJvmAbiContentTest.kt @@ -3,8 +3,7 @@ package org.jetbrains.kotlin.jvm.abi import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.codegen.BytecodeListingTextCollectingVisitor import org.jetbrains.kotlin.incremental.isClassFile -import org.jetbrains.kotlin.jvm.abi.asm.AbiExtensionAsmApiVersion -import org.jetbrains.kotlin.utils.Printer +import org.jetbrains.kotlin.jvm.abi.asm.ABI_EXTENSION_ASM_API_VERSION import org.jetbrains.org.objectweb.asm.* import java.io.File @@ -22,7 +21,7 @@ abstract class AbstractJvmAbiContentTest : BaseJvmAbiTest() { val visitor = BytecodeListingTextCollectingVisitor( filter = BytecodeListingTextCollectingVisitor.Filter.EMPTY, withSignatures = false, - api = AbiExtensionAsmApiVersion + api = ABI_EXTENSION_ASM_API_VERSION ) reader.accept(visitor, 0) classToBytecode[classFile] = visitor.text