From 16aa4153e49f4b6f45e68e3fcb1849b4f85772a4 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 1 Apr 2013 14:15:56 +0400
Subject: [PATCH] KT-3457 fix: added missed spread operator and receiver became
 format template

---
 libraries/stdlib/src/kotlin/StringsJVM.kt | 2 +-
 libraries/stdlib/test/StringJVMTest.kt    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/stdlib/src/kotlin/StringsJVM.kt b/libraries/stdlib/src/kotlin/StringsJVM.kt
index 00740d705f4..82ea1ff2d4f 100644
--- a/libraries/stdlib/src/kotlin/StringsJVM.kt
+++ b/libraries/stdlib/src/kotlin/StringsJVM.kt
@@ -36,7 +36,7 @@ public inline fun String.toCharArray() : CharArray = (this as java.lang.String).
 
 public inline fun String.toCharList(): List<Char> = toCharArray().toList()
 
-public inline fun String.format(format : String, vararg args : Any?) : String = java.lang.String.format(format, args)
+public inline fun String.format(vararg args : Any?) : String = java.lang.String.format(this, *args)
 
 public inline fun String.split(regex : String) : Array<String> = (this as java.lang.String).split(regex)
 
diff --git a/libraries/stdlib/test/StringJVMTest.kt b/libraries/stdlib/test/StringJVMTest.kt
index c7808ba5bb2..cd55e7d6e12 100644
--- a/libraries/stdlib/test/StringJVMTest.kt
+++ b/libraries/stdlib/test/StringJVMTest.kt
@@ -236,4 +236,8 @@ class StringJVMTest {
         assertEquals("", data.take(-7))
         assertEquals(data, data.take(data.length + 42))
     }
+
+    test fun formatter() {
+        assertEquals("12", "%d%d".format(1, 2))
+    }
 }