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

KT-42589 Add listOf, setOf, mapOf overloads for a single value to common src-set

Browse Source 
`listOf`, `setOf` and `mapOf` overloads were defined in some source-sets
but common source-set was missing it.
This change adds common definition of these methods and also add
declarations for source-sets that were previously
missing it.

^KT-42589 fixed
This commit is contained in:
Filipp Zhinkin
2023-04-19 08:48:29 +02:00
committed by Space Team
parent aa85e6d95c
commit 50841e7cb0
12 changed files with 112 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/js/src/kotlin/collections.kt
+17 -14
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@@ -60,11 +60,12 @@ internal actual fun <T> copyToArrayImpl(collection: Collection<*>, array: Array<
return array
}
/**
* Returns an immutable list containing only the specified object [element].
* Returns a new read-only list containing only the specified object [element].
*
* @sample samples.collections.Collections.Lists.singletonReadOnlyList
*/
public fun <T> listOf(element: T): List<T> = arrayListOf(element)
public actual fun <T> listOf(element: T): List<T> = arrayListOf(element)
@PublishedApi
@SinceKotlin("1.3")
@@ -81,11 +82,12 @@ internal actual inline fun <E> buildListInternal(capacity: Int, builderAction: M
return ArrayList<E>(capacity).apply(builderAction).build()
}
/**
* Returns an immutable set containing only the specified object [element].
* Returns a new read-only set containing only the specified object [element].
*
* @sample samples.collections.Collections.Sets.singletonReadOnlySet
*/
public fun <T> setOf(element: T): Set<T> = hashSetOf(element)
public actual fun <T> setOf(element: T): Set<T> = hashSetOf(element)
@PublishedApi
@SinceKotlin("1.3")
@@ -101,13 +103,6 @@ internal actual inline fun <E> buildSetInternal(capacity: Int, builderAction: Mu
return LinkedHashSet<E>(capacity).apply(builderAction).build()
}
/**
* Returns an immutable map, mapping only the specified key to the
* specified value.
*/
public fun <K, V> mapOf(pair: Pair<K, V>): Map<K, V> = hashMapOf(pair)
@PublishedApi
@SinceKotlin("1.3")
@kotlin.internal.InlineOnly
@@ -260,3 +255,11 @@ internal actual fun mapCapacity(expectedSize: Int) = expectedSize
internal fun checkBuilderCapacity(capacity: Int) {
require(capacity >= 0) { "capacity must be non-negative." }
}
/**
* Returns a new read-only map, mapping only the specified key to the
* specified value.
*
* @sample samples.collections.Maps.Instantiation.mapFromPairs
*/
public actual fun <K, V> mapOf(pair: Pair<K, V>): Map<K, V> = hashMapOf(pair)