From 13b1e91eb5b98abb7058070c72d2ac2989feb5c9 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 22 Jan 2016 20:43:48 +0300
Subject: [PATCH] StdLib Generators: fix type projections, do not use concat.

---
 .../kotlin-stdlib-gen/src/templates/engine/DocExtensions.kt     | 2 +-
 .../tools/kotlin-stdlib-gen/src/templates/engine/Engine.kt      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/engine/DocExtensions.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/engine/DocExtensions.kt
index 97c861122c6..6a9c6b88904 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/engine/DocExtensions.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/engine/DocExtensions.kt
@@ -32,6 +32,6 @@ object DocExtensions {
         else -> this + "s"
     }
 
-    fun String.prefixWithArticle() = (if ("aeiou".any { this.startsWith(it, ignoreCase = true) }) "an " else "a ").concat(this)
+    fun String.prefixWithArticle() = (if ("aeiou".any { this.startsWith(it, ignoreCase = true) }) "an " else "a ") + this
 
 }
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/engine/Engine.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/engine/Engine.kt
index a665e000720..ba01a05c749 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/engine/Engine.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/engine/Engine.kt
@@ -325,7 +325,7 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
                     .drop(1)
                     .takeWhile { it != '>' }
                     .split(",")
-                    .map { it.removePrefix("out").removePrefix("in").trim() }
+                    .map { it.trim().removePrefix("out").removePrefix("in").trim() }
 
             // TODO: Model for type parameter
             val types = ArrayList(typeParams)