From 99a10d8d6370c89abb552d47012dec742c308a26 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 18 Jul 2017 12:40:43 +0300 Subject: [PATCH] Minor. Rename compactIfPossible -> compact As ArrayList can always be compacted --- .../structure/impl/classFiles/BinaryClassSignatureParser.kt | 6 +++--- .../kotlin/load/java/structure/impl/classFiles/Methods.kt | 6 +++--- .../jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt | 4 ++-- .../kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt | 4 ++-- .../kotlin/resolve/scopes/GivenFunctionsMemberScope.kt | 4 ++-- .../deserialization/descriptors/DeserializedMemberScope.kt | 6 +++--- .../src/kotlin/reflect/jvm/internal/KClassImpl.kt | 4 ++-- .../src/org/jetbrains/kotlin/utils/collections.kt | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryClassSignatureParser.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryClassSignatureParser.kt index 2fe283dc324..df2eae1b58e 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryClassSignatureParser.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryClassSignatureParser.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.addToStdlib.flattenTo -import org.jetbrains.kotlin.utils.compactIfPossible +import org.jetbrains.kotlin.utils.compact import org.jetbrains.org.objectweb.asm.Type import java.text.CharacterIterator import java.text.StringCharacterIterator @@ -53,7 +53,7 @@ class BinaryClassSignatureParser(globalContext: ClassifierResolutionContext) { typeParameters.add(parseTypeParameter(signature, context)) } signature.next() - return typeParameters.compactIfPossible() + return typeParameters.compact() } private fun parseTypeParameter(signature: CharacterIterator, context: ClassifierResolutionContext): JavaTypeParameter { @@ -152,7 +152,7 @@ class BinaryClassSignatureParser(globalContext: ClassifierResolutionContext) { return PlainJavaClassifierType( { context.resolveByInternalName(canonicalName.toString()) }, - argumentGroups.reversed().flattenTo(arrayListOf()).compactIfPossible() + argumentGroups.reversed().flattenTo(arrayListOf()).compact() ) } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Methods.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Methods.kt index b6f1c481fbd..ea71df155f5 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Methods.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Methods.kt @@ -21,7 +21,7 @@ import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.SpecialNames -import org.jetbrains.kotlin.utils.compactIfPossible +import org.jetbrains.kotlin.utils.compact import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.Opcodes import org.jetbrains.org.objectweb.asm.Type @@ -95,7 +95,7 @@ abstract class BinaryJavaMethodBase( else BinaryJavaMethod( access, containingClass, - parameterList.compactIfPossible(), + parameterList.compact(), info.typeParameters, Name.identifier(name), info.returnType ) @@ -141,7 +141,7 @@ abstract class BinaryJavaMethodBase( } if (iterator.current() != ')') throw ClsFormatException() - paramTypes = (paramTypes as ArrayList).compactIfPossible() + paramTypes = (paramTypes as ArrayList).compact() } iterator.next() diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt index 78cd5f959ff..45d1618d0e5 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiJavaModule import com.intellij.psi.PsiModifier import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.utils.compactIfPossible +import org.jetbrains.kotlin.utils.compact import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.ClassVisitor import org.jetbrains.org.objectweb.asm.ModuleVisitor @@ -82,7 +82,7 @@ class JavaModuleInfo( }, ClassReader.SKIP_DEBUG or ClassReader.SKIP_CODE or ClassReader.SKIP_FRAMES) return if (moduleName != null) - JavaModuleInfo(moduleName!!, requires.compactIfPossible(), exports.compactIfPossible()) + JavaModuleInfo(moduleName!!, requires.compact(), exports.compact()) else null } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt index 95309aaad4b..0739b40df16 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.AnnotationDeserializer import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.kotlin.utils.compactIfPossible +import org.jetbrains.kotlin.utils.compact import java.util.* class BinaryClassAnnotationAndConstantLoaderImpl( @@ -116,7 +116,7 @@ class BinaryClassAnnotationAndConstantLoaderImpl( override fun visitEnd() { val parameter = DescriptorResolverUtils.getAnnotationParameterByName(name, annotationClass) if (parameter != null) { - arguments[parameter] = factory.createArrayValue(elements.compactIfPossible(), parameter.type) + arguments[parameter] = factory.createArrayValue(elements.compact(), parameter.type) } } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/GivenFunctionsMemberScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/GivenFunctionsMemberScope.kt index 431c3ec467d..9c661eb5759 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/GivenFunctionsMemberScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/GivenFunctionsMemberScope.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.OverridingUtil import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.getValue import org.jetbrains.kotlin.utils.Printer -import org.jetbrains.kotlin.utils.compactIfPossible +import org.jetbrains.kotlin.utils.compact import java.util.* /** @@ -80,7 +80,7 @@ abstract class GivenFunctionsMemberScope( } } - return result.compactIfPossible() + return result.compact() } override fun printScopeStructure(p: Printer) { diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt index 12718d200eb..ebba36a8561 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext import org.jetbrains.kotlin.storage.getValue import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.addIfNotNull -import org.jetbrains.kotlin.utils.compactIfPossible +import org.jetbrains.kotlin.utils.compact import java.util.* abstract class DeserializedMemberScope protected constructor( @@ -100,7 +100,7 @@ abstract class DeserializedMemberScope protected constructor( val descriptors = protos.mapTo(arrayListOf(), factory) computeNonDeclared(descriptors) - return descriptors.compactIfPossible() + return descriptors.compact() } protected open fun computeNonDeclaredFunctions(name: Name, functions: MutableCollection) { @@ -163,7 +163,7 @@ abstract class DeserializedMemberScope protected constructor( } } - return result.compactIfPossible() + return result.compact() } private fun addFunctionsAndProperties( diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt index 1bf3d861408..0b997cfcfb2 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.deserialization.MemberDeserializer import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf -import org.jetbrains.kotlin.utils.compactIfPossible +import org.jetbrains.kotlin.utils.compact import kotlin.jvm.internal.TypeIntrinsics import kotlin.reflect.* import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.DECLARED @@ -145,7 +145,7 @@ internal class KClassImpl(override val jClass: Class) : KDeclaration }) { result += KTypeImpl(descriptor.builtIns.anyType) { Any::class.java } } - result.compactIfPossible() + result.compact() } val declaredNonStaticMembers: Collection> diff --git a/core/util.runtime/src/org/jetbrains/kotlin/utils/collections.kt b/core/util.runtime/src/org/jetbrains/kotlin/utils/collections.kt index 764b5927db7..67bc061b09f 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/utils/collections.kt +++ b/core/util.runtime/src/org/jetbrains/kotlin/utils/collections.kt @@ -78,7 +78,7 @@ fun newLinkedHashSetWithExpectedSize(expectedSize: Int): LinkedHashSet = private fun capacity(expectedSize: Int): Int = if (expectedSize < 3) 3 else expectedSize + expectedSize / 3 + 1 -fun ArrayList.compactIfPossible(): List = +fun ArrayList.compact(): List = when (size) { 0 -> emptyList() 1 -> listOf(first())