Reformat SyntheticJavaPropertiesScope.kt

compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt

@@ -69,20 +69,24 @@ interface SyntheticJavaPropertyDescriptor : PropertyDescriptor {
                                      override val scopes: Collection<SyntheticScope> = listOf(syntheticScope)
                                  })
 
-        fun propertyNameByGetMethodName(methodName: Name): Name?
+        fun propertyNameByGetMethodName(methodName: Name): Name? = org.jetbrains.kotlin.load.java.propertyNameByGetMethodName(methodName)
-                = org.jetbrains.kotlin.load.java.propertyNameByGetMethodName(methodName)
 
-        fun propertyNameBySetMethodName(methodName: Name, withIsPrefix: Boolean): Name?
+        fun propertyNameBySetMethodName(methodName: Name, withIsPrefix: Boolean): Name? =
-                = org.jetbrains.kotlin.load.java.propertyNameBySetMethodName(methodName, withIsPrefix)
+            org.jetbrains.kotlin.load.java.propertyNameBySetMethodName(methodName, withIsPrefix)
     }
 }
 
 class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val lookupTracker: LookupTracker) : SyntheticScope {
-    private val syntheticPropertyInClass = storageManager.createMemoizedFunction<Pair<ClassDescriptor, Name>, SyntheticPropertyHolder> { pair ->
+    private val syntheticPropertyInClass =
+        storageManager.createMemoizedFunction<Pair<ClassDescriptor, Name>, SyntheticPropertyHolder> { pair ->
             syntheticPropertyInClassNotCached(pair.first, pair.second)
         }
 
-    private fun getSyntheticPropertyAndRecordLookups(classifier: ClassDescriptor, name: Name, location: LookupLocation): PropertyDescriptor? {
+    private fun getSyntheticPropertyAndRecordLookups(
+        classifier: ClassDescriptor,
+        name: Name,
+        location: LookupLocation
+    ): PropertyDescriptor? {
         val (descriptor, lookedNames) = syntheticPropertyInClass(Pair(classifier, name))
 
         if (location !is NoLookupLocation) {
@@ -168,7 +172,11 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
         return null
     }
 
-    override fun getSyntheticExtensionProperties(receiverTypes: Collection<KotlinType>, name: Name, location: LookupLocation): Collection<PropertyDescriptor> {
+    override fun getSyntheticExtensionProperties(
+        receiverTypes: Collection<KotlinType>,
+        name: Name,
+        location: LookupLocation
+    ): Collection<PropertyDescriptor> {
         var result: SmartList<PropertyDescriptor>? = null
         val processedTypes: MutableSet<TypeConstructor>? = if (receiverTypes.size > 1) HashSet<TypeConstructor>() else null
         for (type in receiverTypes) {
@@ -181,22 +189,25 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
         }
     }
 
-    override fun getSyntheticStaticFunctions(scope: ResolutionScope, name: Name, location: LookupLocation): Collection<FunctionDescriptor>
+    override fun getSyntheticStaticFunctions(scope: ResolutionScope, name: Name, location: LookupLocation): Collection<FunctionDescriptor> =
-            = emptyList()
+        emptyList()
 
-    override fun getSyntheticConstructors(scope: ResolutionScope, name: Name, location: LookupLocation): Collection<FunctionDescriptor>
+    override fun getSyntheticConstructors(scope: ResolutionScope, name: Name, location: LookupLocation): Collection<FunctionDescriptor> =
-            = emptyList()
+        emptyList()
 
-    override fun getSyntheticStaticFunctions(scope: ResolutionScope): Collection<FunctionDescriptor>
+    override fun getSyntheticStaticFunctions(scope: ResolutionScope): Collection<FunctionDescriptor> = emptyList()
-            = emptyList()
 
-    override fun getSyntheticConstructors(scope: ResolutionScope): Collection<FunctionDescriptor>
+    override fun getSyntheticConstructors(scope: ResolutionScope): Collection<FunctionDescriptor> = emptyList()
-            = emptyList()
 
-    override fun getSyntheticConstructor(constructor: ConstructorDescriptor): ConstructorDescriptor?
+    override fun getSyntheticConstructor(constructor: ConstructorDescriptor): ConstructorDescriptor? = null
-            = null
 
-    private fun collectSyntheticPropertiesByName(result: SmartList<PropertyDescriptor>?, type: TypeConstructor, name: Name, processedTypes: MutableSet<TypeConstructor>?, location: LookupLocation): SmartList<PropertyDescriptor>? {
+    private fun collectSyntheticPropertiesByName(
+        result: SmartList<PropertyDescriptor>?,
+        type: TypeConstructor,
+        name: Name,
+        processedTypes: MutableSet<TypeConstructor>?,
+        location: LookupLocation
+    ): SmartList<PropertyDescriptor>? {
         if (processedTypes != null && !processedTypes.add(type)) return result
 
         @Suppress("NAME_SHADOWING")
@@ -205,8 +216,7 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
         val classifier = type.declarationDescriptor
         if (classifier is ClassDescriptor) {
             result = result.add(getSyntheticPropertyAndRecordLookups(classifier, name, location))
-        }
+        } else {
-        else {
             type.supertypes.forEach { result = collectSyntheticPropertiesByName(result, it.constructor, name, processedTypes, location) }
         }
 
@@ -220,7 +230,10 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
         return result
     }
 
-    private fun MutableList<PropertyDescriptor>.collectSyntheticProperties(type: TypeConstructor, processedTypes: MutableSet<TypeConstructor>) {
+    private fun MutableList<PropertyDescriptor>.collectSyntheticProperties(
+        type: TypeConstructor,
+        processedTypes: MutableSet<TypeConstructor>
+    ) {
         if (!processedTypes.add(type)) return
 
         val classifier = type.declarationDescriptor
@@ -231,8 +244,7 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
                     addIfNotNull(syntheticPropertyInClass(Pair(classifier, propertyName)).descriptor)
                 }
             }
-        }
+        } else {
-        else {
             type.supertypes.forEach { collectSyntheticProperties(it.constructor, processedTypes) }
         }
     }
@@ -244,7 +256,12 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
         return list
     }
 
-    override fun getSyntheticMemberFunctions(receiverTypes: Collection<KotlinType>, name: Name, location: LookupLocation): Collection<FunctionDescriptor> = emptyList()
+    override fun getSyntheticMemberFunctions(
+        receiverTypes: Collection<KotlinType>,
+        name: Name,
+        location: LookupLocation
+    ): Collection<FunctionDescriptor> = emptyList()
+
     override fun getSyntheticMemberFunctions(receiverTypes: Collection<KotlinType>): Collection<FunctionDescriptor> = emptyList()
 
     private data class SyntheticPropertyHolder(val descriptor: PropertyDescriptor?, val lookedNames: List<Name>) {
@@ -276,9 +293,16 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
             private set
 
         companion object {
-            fun create(ownerClass: ClassDescriptor, getMethod: FunctionDescriptor, setMethod: FunctionDescriptor?, name: Name, type: KotlinType): MyPropertyDescriptor {
+            fun create(
+                ownerClass: ClassDescriptor,
+                getMethod: FunctionDescriptor,
+                setMethod: FunctionDescriptor?,
+                name: Name,
+                type: KotlinType
+            ): MyPropertyDescriptor {
                 val visibility = syntheticVisibility(getMethod, isUsedForExtension = true)
-                val descriptor = MyPropertyDescriptor(DescriptorUtils.getContainingModule(ownerClass),
+                val descriptor = MyPropertyDescriptor(
+                    DescriptorUtils.getContainingModule(ownerClass),
                     null,
                     Annotations.EMPTY,
                     Modality.FINAL,
@@ -286,19 +310,22 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
                     setMethod != null,
                     name,
                     CallableMemberDescriptor.Kind.SYNTHESIZED,
-                                                      SourceElement.NO_SOURCE)
+                    SourceElement.NO_SOURCE
+                )
                 descriptor.getMethod = getMethod
                 descriptor.setMethod = setMethod
 
                 val classTypeParams = ownerClass.typeConstructor.parameters
                 val typeParameters = ArrayList<TypeParameterDescriptor>(classTypeParams.size)
-                val typeSubstitutor = DescriptorSubstitutor.substituteTypeParameters(classTypeParams, TypeSubstitution.EMPTY, descriptor, typeParameters)
+                val typeSubstitutor =
+                    DescriptorSubstitutor.substituteTypeParameters(classTypeParams, TypeSubstitution.EMPTY, descriptor, typeParameters)
 
                 val propertyType = typeSubstitutor.safeSubstitute(type, Variance.INVARIANT)
                 val receiverType = typeSubstitutor.safeSubstitute(ownerClass.defaultType, Variance.INVARIANT)
                 descriptor.setType(propertyType, typeParameters, null, receiverType)
 
-                val getter = PropertyGetterDescriptorImpl(descriptor,
+                val getter = PropertyGetterDescriptorImpl(
+                    descriptor,
                     getMethod.annotations,
                     Modality.FINAL,
                     visibility,
@@ -307,11 +334,13 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
                     false,
                     CallableMemberDescriptor.Kind.SYNTHESIZED,
                     null,
-                                                          SourceElement.NO_SOURCE)
+                    SourceElement.NO_SOURCE
+                )
                 getter.initialize(null)
 
                 val setter = if (setMethod != null)
-                    PropertySetterDescriptorImpl(descriptor,
+                    PropertySetterDescriptorImpl(
+                        descriptor,
                         setMethod.annotations,
                         Modality.FINAL,
                         syntheticVisibility(setMethod, isUsedForExtension = true),
@@ -320,7 +349,8 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
                         false,
                         CallableMemberDescriptor.Kind.SYNTHESIZED,
                         null,
-                                                 SourceElement.NO_SOURCE)
+                        SourceElement.NO_SOURCE
+                    )
                 else
                     null
                 setter?.initializeDefault()