azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: rename const according to style guide

Browse Source
This commit is contained in:
Alexey Tsvetkov
2018-12-11 18:07:53 +03:00
parent b87058b532
commit 34d96dff28
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/JvmAbiAnalysisHandlerExtension.kt
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.diagnostics.Severity
import org.jetbrains.kotlin.incremental.LocalFileKotlinClass import org.jetbrains.kotlin.incremental.LocalFileKotlinClass
import org.jetbrains.kotlin.incremental.isClassFile import org.jetbrains.kotlin.incremental.isClassFile
import org.jetbrains.kotlin.jvm.abi.asm.AbiClassBuilder 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.FilterInnerClassesVisitor
import org.jetbrains.kotlin.jvm.abi.asm.InnerClassesCollectingVisitor import org.jetbrains.kotlin.jvm.abi.asm.InnerClassesCollectingVisitor
import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass
@@ -158,7 +158,7 @@ class JvmAbiAnalysisHandlerExtension(
output.delete() output.delete()
} else { } else {
output.transform { writer -> output.transform { writer ->
FilterInnerClassesVisitor(classesToRemove, AbiExtensionAsmApiVersion, writer) FilterInnerClassesVisitor(classesToRemove, ABI_EXTENSION_ASM_API_VERSION, writer)
} }
} }
} }
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/AsmApiVersion.kt
+1 -1
View File
@@ -7,4 +7,4 @@ package org.jetbrains.kotlin.jvm.abi.asm
import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.Opcodes
internal const val AbiExtensionAsmApiVersion = Opcodes.ASM6 internal const val ABI_EXTENSION_ASM_API_VERSION = Opcodes.ASM6
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/InnerClassesCollectingVisitor.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package org.jetbrains.kotlin.jvm.abi.asm
import org.jetbrains.org.objectweb.asm.ClassVisitor 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 lateinit var ownInternalName: String
private set private set
plugins/jvm-abi-gen/src/org/jetbrains/kotlin/jvm/abi/asm/ReplaceWithEmptyMethodVisitor.kt
+1 -1
View File
@@ -16,7 +16,7 @@ internal class ReplaceWithEmptyMethodVisitor(
desc: String, desc: String,
signature: String?, signature: String?,
exceptions: Array<out String>? exceptions: Array<out String>?
) : 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) { override fun performTransformations(methodNode: MethodNode) {
methodNode.instructions.clear() methodNode.instructions.clear()
} }
plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/AbstractJvmAbiContentTest.kt
+2 -3
View File
@@ -3,8 +3,7 @@ package org.jetbrains.kotlin.jvm.abi
import com.intellij.testFramework.UsefulTestCase import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.kotlin.codegen.BytecodeListingTextCollectingVisitor import org.jetbrains.kotlin.codegen.BytecodeListingTextCollectingVisitor
import org.jetbrains.kotlin.incremental.isClassFile import org.jetbrains.kotlin.incremental.isClassFile
import org.jetbrains.kotlin.jvm.abi.asm.AbiExtensionAsmApiVersion import org.jetbrains.kotlin.jvm.abi.asm.ABI_EXTENSION_ASM_API_VERSION
import org.jetbrains.kotlin.utils.Printer
import org.jetbrains.org.objectweb.asm.* import org.jetbrains.org.objectweb.asm.*
import java.io.File import java.io.File
@@ -22,7 +21,7 @@ abstract class AbstractJvmAbiContentTest : BaseJvmAbiTest() {
val visitor = BytecodeListingTextCollectingVisitor( val visitor = BytecodeListingTextCollectingVisitor(
filter = BytecodeListingTextCollectingVisitor.Filter.EMPTY, filter = BytecodeListingTextCollectingVisitor.Filter.EMPTY,
withSignatures = false, withSignatures = false,
api = AbiExtensionAsmApiVersion api = ABI_EXTENSION_ASM_API_VERSION
) )
reader.accept(visitor, 0) reader.accept(visitor, 0)
classToBytecode[classFile] = visitor.text classToBytecode[classFile] = visitor.text