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

Minor. Rename compactIfPossible -> compact

Browse Source 
As ArrayList can always be compacted
This commit is contained in:
Denis Zharkov
2017-07-18 12:40:43 +03:00
parent f454858bbb
commit 99a10d8d63
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryClassSignatureParser.kt
+3 -3
View File
@@ -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()
)
}
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Methods.kt
+3 -3
View File
@@ -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()
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
+2 -2
View File
@@ -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
}
}
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt
+2 -2
View File
@@ -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)
}
}
}
core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/GivenFunctionsMemberScope.kt
+2 -2
View File
@@ -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) {
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
+3 -3
View File
@@ -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<SimpleFunctionDescriptor>) {
@@ -163,7 +163,7 @@ abstract class DeserializedMemberScope protected constructor(
}
}
return result.compactIfPossible()
return result.compact()
}
private fun addFunctionsAndProperties(
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+2 -2
View File
@@ -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<T : Any>(override val jClass: Class<T>) : KDeclaration
}) {
result += KTypeImpl(descriptor.builtIns.anyType) { Any::class.java }
}
result.compactIfPossible()
result.compact()
}
val declaredNonStaticMembers: Collection<KCallableImpl<*>>
core/util.runtime/src/org/jetbrains/kotlin/utils/collections.kt
+1 -1
View File
@@ -78,7 +78,7 @@ fun <E> newLinkedHashSetWithExpectedSize(expectedSize: Int): LinkedHashSet<E> =
private fun capacity(expectedSize: Int): Int =
if (expectedSize < 3) 3 else expectedSize + expectedSize / 3 + 1
fun <T> ArrayList<T>.compactIfPossible(): List<T> =
fun <T> ArrayList<T>.compact(): List<T> =
when (size) {
0 -> emptyList()
1 -> listOf(first())