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

Introduce plusElement and minusElement to disambiguate situations like List<List<T>> + List<T>

Browse Source 
#KT-9992 Fixed
This commit is contained in:
Ilya Gorbunov
2016-01-26 18:42:30 +03:00
parent fb21ef2e1d
commit 8d02467e6d
10 changed files with 134 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/collections/ArraysTest.kt
+14
View File
@@ -430,6 +430,20 @@ class ArraysTest {
assertTrue(intArrayOf(1).isNotEmpty())
}
@test fun plusInference() {
val arrayOfArrays: Array<Array<out Any>> = arrayOf(arrayOf<Any>("s") as Array<out Any>)
val elementArray = arrayOf<Any>("a") as Array<out Any>
val arrayPlusElement: Array<Array<out Any>> = arrayOfArrays.plusElement(elementArray)
assertEquals("a", arrayPlusElement[1][0])
// ambiguity
// val arrayPlusArray: Array<Array<out Any>> = arrayOfArrays + arrayOfArrays
val arrayOfStringArrays = arrayOf(arrayOf("s"))
val arrayPlusArray = arrayOfStringArrays + arrayOfStringArrays
assertEquals("s", arrayPlusArray[1][0])
}
@test fun plus() {
assertEquals(listOf("1", "2", "3", "4"), listOf("1", "2") + arrayOf("3", "4"))
assertArrayNotSameButEquals(arrayOf("1", "2", "3"), arrayOf("1", "2") + "3")