From 00a44f6d4fde9d67111259b325c6065c701ddc08 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 25 Jun 2015 17:33:35 +0300 Subject: [PATCH] StdLib deprecations cleanup: *array -> *arrayOf, copyToArray -> toTypedArray. --- .../test/kotlin/jdbc/JdbcTemplateTest.kt | 4 +-- .../test/kotlin/test/kotlin/jdbc/JdbcTest.kt | 2 +- libraries/stdlib/src/kotlin/text/Strings.kt | 4 +-- .../stdlib/test/collections/ArraysTest.kt | 12 ++++----- libraries/stdlib/test/io/Files.kt | 10 +++---- libraries/stdlib/test/js/MapJsTest.kt | 4 +-- .../stdlib/test/template/HtmlTemplateTest.kt | 2 +- .../test/template/LocaleTemplateTest.kt | 6 ++--- .../test/template/StringTemplateTest.kt | 2 +- libraries/stdlib/test/text/StringTest.kt | 26 +++++++++---------- .../kotlin/doc/JavadocStyleHtmlDoclet.kt | 2 +- .../jetbrains/kotlin/gradle/tasks/Tasks.kt | 2 +- 12 files changed, 37 insertions(+), 39 deletions(-) diff --git a/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTemplateTest.kt b/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTemplateTest.kt index 982205dae86..96f58db39da 100644 --- a/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTemplateTest.kt +++ b/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTemplateTest.kt @@ -18,14 +18,14 @@ class JdbcTemplateTest { // TODO will use a tuple soon dataSource.update( - StringTemplate(array("insert into foo (id, name) values (", id, ", ", name, ")")) + StringTemplate(arrayOf("insert into foo (id, name) values (", id, ", ", name, ")")) ) // Mimicks // datasource.query("select * from foo where id = $id") { it.map{ it["name"] } } val names = dataSource.query( - StringTemplate(array("select * from foo where id = ", id)) + StringTemplate(arrayOf("select * from foo where id = ", id)) ) { it.map{ it["name"] }.toList() } diff --git a/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTest.kt b/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTest.kt index 88d96168604..26eb3631629 100644 --- a/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTest.kt +++ b/libraries/kotlin-jdbc/src/test/kotlin/test/kotlin/jdbc/JdbcTest.kt @@ -49,7 +49,7 @@ class JdbcTest { } test fun stringFormat() { - dataSource.query(kotlin.template.StringTemplate(array("select * from foo where id = ", 1))) { + dataSource.query(kotlin.template.StringTemplate(arrayOf("select * from foo where id = ", 1))) { for (row in it) { println(row.getValuesAsMap()) } diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt index a4073631a4e..3b0e58e9267 100644 --- a/libraries/stdlib/src/kotlin/text/Strings.kt +++ b/libraries/stdlib/src/kotlin/text/Strings.kt @@ -732,7 +732,7 @@ public fun String.lastIndexOfAny(strings: Collection, startIndex: Int = */ public fun String.indexOf(char: Char, startIndex: Int = 0, ignoreCase: Boolean = false): Int { return if (ignoreCase) - indexOfAny(charArray(char), startIndex, ignoreCase) + indexOfAny(charArrayOf(char), startIndex, ignoreCase) else nativeIndexOf(char, startIndex) } @@ -760,7 +760,7 @@ public fun String.indexOf(string: String, startIndex: Int = 0, ignoreCase: Boole */ public fun String.lastIndexOf(char: Char, startIndex: Int = lastIndex, ignoreCase: Boolean = false): Int { return if (ignoreCase) - lastIndexOfAny(charArray(char), startIndex, ignoreCase) + lastIndexOfAny(charArrayOf(char), startIndex, ignoreCase) else nativeLastIndexOf(char, startIndex) } diff --git a/libraries/stdlib/test/collections/ArraysTest.kt b/libraries/stdlib/test/collections/ArraysTest.kt index 541ef8d01b2..ff1dbf37519 100644 --- a/libraries/stdlib/test/collections/ArraysTest.kt +++ b/libraries/stdlib/test/collections/ArraysTest.kt @@ -161,11 +161,11 @@ class ArraysTest { } test fun average() { - expect(0.0) { array().average() } - expect(3.8) { array(1, 2, 5, 8, 3).average() } - expect(2.1) { array(1.6, 2.6, 3.6, 0.6).average() } - expect(100.0) { array(100, 100, 100, 100, 100, 100).average() } - expect(0) { array(1, -1, 2, -2, 3, -3).average().toShort() } + expect(0.0) { arrayOf().average() } + expect(3.8) { arrayOf(1, 2, 5, 8, 3).average() } + expect(2.1) { arrayOf(1.6, 2.6, 3.6, 0.6).average() } + expect(100.0) { arrayOf(100, 100, 100, 100, 100, 100).average() } + expect(0) { arrayOf(1, -1, 2, -2, 3, -3).average().toShort() } // TODO: Property based tests // for each arr with size 1 arr.average() == arr[0] // for each arr with size > 0 arr.average() = arr.sum().toDouble() / arr.size() @@ -296,7 +296,7 @@ class ArraysTest { } test fun toPrimitiveArray() { - val genericArray: Array = array(1, 2, 3) + val genericArray: Array = arrayOf(1, 2, 3) val primitiveArray: IntArray = genericArray.toIntArray() expect(3) { primitiveArray.size() } assertEquals(genericArray.asList(), primitiveArray.asList()) diff --git a/libraries/stdlib/test/io/Files.kt b/libraries/stdlib/test/io/Files.kt index b1ea3a0ea1f..4d457dda207 100644 --- a/libraries/stdlib/test/io/Files.kt +++ b/libraries/stdlib/test/io/Files.kt @@ -348,10 +348,10 @@ class FilesTest { fail(::visitDirectoryFailed).forEach { it -> if (!it.isDirectory()) visitFile(it) } assert(stack.isEmpty()) val sep = File.separator - for (fileName in array("", "1", "1${sep}2", "1${sep}3", "6", "8")) { + for (fileName in arrayOf("", "1", "1${sep}2", "1${sep}3", "6", "8")) { assert(dirs.contains(fileName), fileName) } - for (fileName in array("1${sep}3${sep}4.txt", "1${sep}3${sep}4.txt", "7.txt", "8${sep}9.txt")) { + for (fileName in arrayOf("1${sep}3${sep}4.txt", "1${sep}3${sep}4.txt", "7.txt", "8${sep}9.txt")) { assert(files.contains(fileName), fileName) } @@ -362,7 +362,7 @@ class FilesTest { forEach { it -> if (it != basedir) visitFile(it) } assert(stack.isEmpty()) assert(dirs.size() == 1 && dirs.contains(""), dirs.size()) - for (file in array("1", "6", "7.txt", "8")) { + for (file in arrayOf("1", "6", "7.txt", "8")) { assert(files.contains(file), file) } @@ -376,11 +376,11 @@ class FilesTest { assert(stack.isEmpty()) assert(failed.size() == 1 && failed.contains("1"), failed.size()) assert(dirs.size() == 4, dirs.size()) - for (dir in array("", "1", "6", "8")) { + for (dir in arrayOf("", "1", "6", "8")) { assert(dirs.contains(dir), dir) } assert(files.size() == 2, files.size()) - for (file in array("7.txt", "8${sep}9.txt")) { + for (file in arrayOf("7.txt", "8${sep}9.txt")) { assert(files.contains(file), file) } } finally { diff --git a/libraries/stdlib/test/js/MapJsTest.kt b/libraries/stdlib/test/js/MapJsTest.kt index 01bd585feae..600c682cd5c 100644 --- a/libraries/stdlib/test/js/MapJsTest.kt +++ b/libraries/stdlib/test/js/MapJsTest.kt @@ -73,9 +73,9 @@ class LinkedHashMapTest : MapJsTest() { abstract class MapJsTest { val KEYS = listOf("zero", "one", "two", "three") - val VALUES = array(0, 1, 2, 3).toList() + val VALUES = arrayOf(0, 1, 2, 3).toList() - val SPECIAL_NAMES = array("__proto__", "constructor", "toString", "toLocaleString", "valueOf", "hasOwnProperty", "isPrototypeOf", "propertyIsEnumerable") + val SPECIAL_NAMES = arrayOf("__proto__", "constructor", "toString", "toLocaleString", "valueOf", "hasOwnProperty", "isPrototypeOf", "propertyIsEnumerable") test fun getOrElse() { val data = emptyMap() diff --git a/libraries/stdlib/test/template/HtmlTemplateTest.kt b/libraries/stdlib/test/template/HtmlTemplateTest.kt index 8f13f58e93c..c5c3a383401 100644 --- a/libraries/stdlib/test/template/HtmlTemplateTest.kt +++ b/libraries/stdlib/test/template/HtmlTemplateTest.kt @@ -16,7 +16,7 @@ class HtmlTemplateTest : TestCase() { // TODO will use a tuple soon //val actual = StringTemplate(Tuple3("

", foo, "

hey ", bar, "

")).toHtml() - val actual = StringTemplate(array("

", foo, "

hey ", bar, "

")).toHtml() + val actual = StringTemplate(arrayOf("

", foo, "

hey ", bar, "

")).toHtml() assertEquals("

James

hey x > 1

", actual) } diff --git a/libraries/stdlib/test/template/LocaleTemplateTest.kt b/libraries/stdlib/test/template/LocaleTemplateTest.kt index fe995b1c363..817df4a4064 100644 --- a/libraries/stdlib/test/template/LocaleTemplateTest.kt +++ b/libraries/stdlib/test/template/LocaleTemplateTest.kt @@ -32,9 +32,9 @@ class LocaleTemplateTest : TestCase() { // TODO will use a tuple soon //val actual = formatter.format(StringTemplate(Tuple2("hello ", name)) - val actual = StringTemplate(array("hello ", name, - " price ", price, - " data ", now)).toString(formatter) + val actual = StringTemplate(arrayOf("hello ", name, + " price ", price, + " data ", now)).toString(formatter) println("Got text: $actual") } diff --git a/libraries/stdlib/test/template/StringTemplateTest.kt b/libraries/stdlib/test/template/StringTemplateTest.kt index ab5e3e2790f..33c7d12a09f 100644 --- a/libraries/stdlib/test/template/StringTemplateTest.kt +++ b/libraries/stdlib/test/template/StringTemplateTest.kt @@ -15,7 +15,7 @@ class StringTemplateTest : TestCase() { // TODO will use a tuple soon //val actual = StringTemplate(Tuple3("hello ", name, "!"))).toString() - val actual = StringTemplate(array("hello ", name, "!")).toString() + val actual = StringTemplate(arrayOf("hello ", name, "!")).toString() assertEquals("hello James!", actual) } diff --git a/libraries/stdlib/test/text/StringTest.kt b/libraries/stdlib/test/text/StringTest.kt index 0b28ed17228..91cfb9d652f 100644 --- a/libraries/stdlib/test/text/StringTest.kt +++ b/libraries/stdlib/test/text/StringTest.kt @@ -262,8 +262,7 @@ class StringTest { } test fun trimStartAndEnd() { - val examples = array( - "a", + val examples = arrayOf("a", " a ", " a ", " a b ", @@ -279,12 +278,11 @@ class StringTest { assertEquals(example.trim(), example.trimStart().trimEnd()) } - val examplesForPredicate = array( - "123", + val examplesForPredicate = arrayOf("123", "-=123=-" ) - val trimChars = charArray('-','=') + val trimChars = charArrayOf('-', '=') val trimPredicate = { it: Char -> it < '0' || it > '9' } // TODO: Use !it.isDigit when available in JS for (example in examplesForPredicate) { assertEquals(example.trimStart(*trimChars).trimEnd(*trimChars), example.trim(*trimChars)) @@ -354,8 +352,8 @@ class StringTest { test fun split() { assertEquals(listOf(""), "".split(";")) - assertEquals(listOf("test"), "test".split(*charArray()), "empty list of delimiters, none matched -> entire string returned") - assertEquals(listOf("test"), "test".split(*array()), "empty list of delimiters, none matched -> entire string returned") + assertEquals(listOf("test"), "test".split(*charArrayOf()), "empty list of delimiters, none matched -> entire string returned") + assertEquals(listOf("test"), "test".split(*arrayOf()), "empty list of delimiters, none matched -> entire string returned") assertEquals(listOf("abc", "def", "123;456"), "abc;def,123;456".split(';', ',', limit = 3)) assertEquals(listOf("abc", "def", "123", "456"), "abc
def
123
456".split("
", ignoreCase = true)) @@ -379,7 +377,7 @@ class StringTest { test fun indexOfAnyChar() { val string = "abracadabra" - val chars = charArray('d','b') + val chars = charArrayOf('d', 'b') assertEquals(1, string.indexOfAny(chars)) assertEquals(6, string.indexOfAny(chars, startIndex = 2)) assertEquals(-1, string.indexOfAny(chars, startIndex = 9)) @@ -388,12 +386,12 @@ class StringTest { assertEquals(6, string.lastIndexOfAny(chars, startIndex = 7)) assertEquals(-1, string.lastIndexOfAny(chars, startIndex = 0)) - assertEquals(-1, string.indexOfAny(charArray())) + assertEquals(-1, string.indexOfAny(charArrayOf())) } test fun indexOfAnyCharIgnoreCase() { val string = "abraCadabra" - val chars = charArray('B','c') + val chars = charArrayOf('B', 'c') assertEquals(1, string.indexOfAny(chars, ignoreCase = true)) assertEquals(4, string.indexOfAny(chars, startIndex = 2, ignoreCase = true)) assertEquals(-1, string.indexOfAny(chars, startIndex = 9, ignoreCase = true)) @@ -473,8 +471,8 @@ class StringTest { assertEquals(2, string.lastIndexOf('e', 3)) for (startIndex in -1..string.length()+1) { - assertEquals(string.indexOfAny(charArray('e'), startIndex), string.indexOf('e', startIndex)) - assertEquals(string.lastIndexOfAny(charArray('e'), startIndex), string.lastIndexOf('e', startIndex)) + assertEquals(string.indexOfAny(charArrayOf('e'), startIndex), string.indexOf('e', startIndex)) + assertEquals(string.lastIndexOfAny(charArrayOf('e'), startIndex), string.lastIndexOf('e', startIndex)) } } @@ -490,8 +488,8 @@ class StringTest { for (startIndex in -1..string.length()+1){ - assertEquals(string.indexOfAny(charArray('e'), startIndex, ignoreCase = true), string.indexOf('E', startIndex, ignoreCase = true)) - assertEquals(string.lastIndexOfAny(charArray('E'), startIndex, ignoreCase = true), string.lastIndexOf('e', startIndex, ignoreCase = true)) + assertEquals(string.indexOfAny(charArrayOf('e'), startIndex, ignoreCase = true), string.indexOf('E', startIndex, ignoreCase = true)) + assertEquals(string.lastIndexOfAny(charArrayOf('E'), startIndex, ignoreCase = true), string.lastIndexOf('e', startIndex, ignoreCase = true)) } } diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt index 6adcb68b637..05a04a4c965 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt @@ -20,7 +20,7 @@ class JavadocStyleHtmlDoclet() : Doclet { fun generateExtensionFunctions(p: KPackage): Unit { val map = inheritedExtensionFunctions(p.functions) val pmap = inheritedExtensionProperties(p.properties) - val classes = hashSet() + val classes = hashSetOf() classes.addAll(map.keySet()) classes.addAll(pmap.keySet()) for (c in classes) { diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index ad3e0737d42..e6d7c6d764e 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -217,7 +217,7 @@ public open class Kotlin2JsCompile() : AbstractKotlinCompile() // defaults to null + args.libraryFiles = arrayOf() // defaults to null return args }