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

Improve toReadOnlyList(), consider the case when size = 1

Browse Source
This commit is contained in:
Alexander Udalov
2015-08-07 02:43:36 +03:00
parent 182e2ebbab
commit d7b1e5d7a8
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java
+2 -1
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.types.DescriptorSubstitutor;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.TypeSubstitutor; import org.jetbrains.kotlin.types.TypeSubstitutor;
import org.jetbrains.kotlin.types.Variance; import org.jetbrains.kotlin.types.Variance;
import org.jetbrains.kotlin.utils.UtilsPackage;
import java.util.*; import java.util.*;
@@ -64,7 +65,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
@Nullable Modality modality, @Nullable Modality modality,
@NotNull Visibility visibility @NotNull Visibility visibility
) { ) {
this.typeParameters = new ArrayList<TypeParameterDescriptor>(typeParameters); this.typeParameters = UtilsPackage.toReadOnlyList(typeParameters);
this.unsubstitutedValueParameters = unsubstitutedValueParameters; this.unsubstitutedValueParameters = unsubstitutedValueParameters;
this.unsubstitutedReturnType = unsubstitutedReturnType; this.unsubstitutedReturnType = unsubstitutedReturnType;
this.modality = modality; this.modality = modality;
core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+2 -1
View File
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.FUN
import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.VAL import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.VAL
import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.VAR import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.VAR
import org.jetbrains.kotlin.serialization.deserialization.descriptors.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.*
import org.jetbrains.kotlin.utils.toReadOnlyList
public class MemberDeserializer(private val c: DeserializationContext) { public class MemberDeserializer(private val c: DeserializationContext) {
public fun loadCallable(proto: Callable): CallableMemberDescriptor { public fun loadCallable(proto: Callable): CallableMemberDescriptor {
@@ -187,7 +188,7 @@ public class MemberDeserializer(private val c: DeserializationContext) {
if (proto.hasVarargElementType()) c.typeDeserializer.type(proto.getVarargElementType()) else null, if (proto.hasVarargElementType()) c.typeDeserializer.type(proto.getVarargElementType()) else null,
SourceElement.NO_SOURCE SourceElement.NO_SOURCE
) )
} }.toReadOnlyList()
} }
private fun getParameterAnnotations( private fun getParameterAnnotations(
core/util.runtime/src/org/jetbrains/kotlin/utils/collections.kt
+8 -5
View File
@@ -16,12 +16,10 @@
package org.jetbrains.kotlin.utils package org.jetbrains.kotlin.utils
import java.util.LinkedHashMap
import java.util.ArrayList import java.util.ArrayList
import java.util.HashMap import java.util.HashMap
import java.util.HashSet import java.util.HashSet
import java.util.Collections import java.util.LinkedHashMap
import java.util.LinkedHashSet
public fun <K, V> Sequence<V>.valuesToMap(key: (V) -> K): Map<K, V> { public fun <K, V> Sequence<V>.valuesToMap(key: (V) -> K): Map<K, V> {
val map = LinkedHashMap<K, V>() val map = LinkedHashMap<K, V>()
@@ -102,6 +100,11 @@ public fun <E> newHashSetWithExpectedSize(expectedSize: Int): HashSet<E> {
} }
public fun <T> Collection<T>.toReadOnlyList(): List<T> = public fun <T> Collection<T>.toReadOnlyList(): List<T> =
if (isEmpty()) Collections.emptyList() else ArrayList(this) when (size()) {
0 -> emptyList()
1 -> listOf(first())
else -> ArrayList(this)
}
public fun <T: Any> T?.singletonOrEmptyList(): List<T> = if (this != null) Collections.singletonList(this) else Collections.emptyList() public fun <T: Any> T?.singletonOrEmptyList(): List<T> =
if (this != null) listOf(this) else emptyList()