From 1b286042683f6d1a0c36bc248359f5f0137be3f1 Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Tue, 14 Aug 2012 19:11:35 +0400 Subject: [PATCH] java Iterable/Iterator replaced to jet ones in completion, js tests --- idea/testData/completion/basic/ExtensionFromStandardLibrary.kt | 2 +- idea/testData/completion/basic/extensions/JavaTypeExtension.kt | 2 +- js/js.libraries/src/stdlib/jutilCode.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/testData/completion/basic/ExtensionFromStandardLibrary.kt b/idea/testData/completion/basic/ExtensionFromStandardLibrary.kt index 71c73b263f7..2ee71c88785 100644 --- a/idea/testData/completion/basic/ExtensionFromStandardLibrary.kt +++ b/idea/testData/completion/basic/ExtensionFromStandardLibrary.kt @@ -9,6 +9,6 @@ fun firstFun() { // RUNTIME: 1 // TIME: 1 -// EXIST: toLinkedList@toLinkedList()~for java.lang.Iterable in kotlin +// EXIST: toLinkedList@toLinkedList()~for jet.Iterable in kotlin // EXIST: toLinkedList@toLinkedList()~for T? in kotlin.nullable // NUMBER: 2 \ No newline at end of file diff --git a/idea/testData/completion/basic/extensions/JavaTypeExtension.kt b/idea/testData/completion/basic/extensions/JavaTypeExtension.kt index 9f8e7ff4945..17bef4440fa 100644 --- a/idea/testData/completion/basic/extensions/JavaTypeExtension.kt +++ b/idea/testData/completion/basic/extensions/JavaTypeExtension.kt @@ -1,4 +1,4 @@ -fun java.lang.Iterable.first() : T? { +fun Iterable.first() : T? { return this.iterator()?.next() } diff --git a/js/js.libraries/src/stdlib/jutilCode.kt b/js/js.libraries/src/stdlib/jutilCode.kt index 90218dfadec..a62e5f17834 100644 --- a/js/js.libraries/src/stdlib/jutilCode.kt +++ b/js/js.libraries/src/stdlib/jutilCode.kt @@ -2,7 +2,7 @@ package kotlin import java.util.* -public inline fun java.lang.Iterable.toString(): String { +public inline fun Iterable.toString(): String { return makeString(", ", "[", "]") }