From bc61e5a3bc5da279f5f42995f443d8c383db5508 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Mon, 10 Dec 2018 17:32:29 +0300
Subject: [PATCH] Minor. Reformat BinaryJavaClass

---
 .../impl/classFiles/BinaryJavaClass.kt        | 55 +++++++++----------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt
index a747aab8afc..b4e36885dcf 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryJavaClass.kt
@@ -31,13 +31,13 @@ import java.text.CharacterIterator
 import java.text.StringCharacterIterator
 
 class BinaryJavaClass(
-        override val virtualFile: VirtualFile,
-        override val fqName: FqName,
-        internal val context: ClassifierResolutionContext,
-        private val signatureParser: BinaryClassSignatureParser,
-        override var access: Int = 0,
-        override val outerClass: JavaClass?,
-        classContent: ByteArray? = null
+    override val virtualFile: VirtualFile,
+    override val fqName: FqName,
+    internal val context: ClassifierResolutionContext,
+    private val signatureParser: BinaryClassSignatureParser,
+    override var access: Int = 0,
+    override val outerClass: JavaClass?,
+    classContent: ByteArray? = null
 ) : ClassVisitor(ASM_API_VERSION_FOR_CLASS_READING), VirtualFileBoundJavaClass, BinaryJavaModifierListOwner, MapBasedJavaAnnotationOwner {
     private lateinit var myInternalName: String
 
@@ -74,8 +74,8 @@ class BinaryJavaClass(
 
     init {
         ClassReader(classContent ?: virtualFile.contentsToByteArray()).accept(
-                this,
-                ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES
+            this,
+            ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES
         )
     }
 
@@ -115,20 +115,19 @@ class BinaryJavaClass(
     }
 
     override fun visit(
-            version: Int,
-            access: Int,
-            name: String,
-            signature: String?,
-            superName: String?,
-            interfaces: Array<out String>?
+        version: Int,
+        access: Int,
+        name: String,
+        signature: String?,
+        superName: String?,
+        interfaces: Array<out String>?
     ) {
         this.access = this.access or access
         this.myInternalName = name
 
         if (signature != null) {
             parseClassSignature(signature)
-        }
-        else {
+        } else {
             this.typeParameters = emptyList()
             this.supertypes = mutableListOf<JavaClassifierType>().apply {
                 addIfNotNull(superName?.convertInternalNameToClassifierType())
@@ -142,9 +141,9 @@ class BinaryJavaClass(
     private fun parseClassSignature(signature: String) {
         val iterator = StringCharacterIterator(signature)
         this.typeParameters =
-                signatureParser
-                        .parseTypeParametersDeclaration(iterator, context)
-                        .also(context::addTypeParameters)
+            signatureParser
+                .parseTypeParametersDeclaration(iterator, context)
+                .also(context::addTypeParameters)
 
         val supertypes = ContainerUtil.newSmartList<JavaClassifierType>()
         supertypes.addIfNotNull(signatureParser.parseClassifierRefSignature(iterator, context))
@@ -155,7 +154,7 @@ class BinaryJavaClass(
     }
 
     private fun String.convertInternalNameToClassifierType(): JavaClassifierType =
-            PlainJavaClassifierType({ context.resolveByInternalName(this) }, emptyList())
+        PlainJavaClassifierType({ context.resolveByInternalName(this) }, emptyList())
 
     override fun visitField(access: Int, name: String, desc: String, signature: String?, value: Any?): FieldVisitor? {
         if (access.isSet(Opcodes.ACC_SYNTHETIC)) return null
@@ -169,13 +168,13 @@ class BinaryJavaClass(
 
             object : FieldVisitor(ASM_API_VERSION_FOR_CLASS_READING) {
                 override fun visitAnnotation(desc: String, visible: Boolean) =
-                        BinaryJavaAnnotation.addAnnotation(this@run.annotations, desc, context, signatureParser)
+                    BinaryJavaAnnotation.addAnnotation(this@run.annotations, desc, context, signatureParser)
 
                 override fun visitTypeAnnotation(typeRef: Int, typePath: TypePath?, desc: String, visible: Boolean) =
-                        if (typePath == null)
-                            BinaryJavaAnnotation.addTypeAnnotation(type, desc, context, signatureParser)
-                        else
-                            null
+                    if (typePath == null)
+                        BinaryJavaAnnotation.addTypeAnnotation(type, desc, context, signatureParser)
+                    else
+                        null
             }
         }
     }
@@ -187,7 +186,7 @@ class BinaryJavaClass(
         if (fieldType !is JavaPrimitiveType || fieldType.type == null || value !is Int) return value
 
         return when (fieldType.type) {
-             PrimitiveType.BOOLEAN -> {
+            PrimitiveType.BOOLEAN -> {
                 when (value) {
                     0 -> false
                     1 -> true
@@ -200,7 +199,7 @@ class BinaryJavaClass(
     }
 
     override fun visitAnnotation(desc: String, visible: Boolean) =
-            BinaryJavaAnnotation.addAnnotation(annotations, desc, context, signatureParser)
+        BinaryJavaAnnotation.addAnnotation(annotations, desc, context, signatureParser)
 
     override fun findInnerClass(name: Name): JavaClass? {
         val access = ownInnerClassNameToAccess[name] ?: return null