From 278f1cd6ef5a11332b4b4695cb56084407f14164 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Tue, 24 Nov 2015 18:21:13 +0300
Subject: [PATCH] Fix "Placing function type parameters after the function
 name" errors in project

---
 .../jetbrains/kotlin/container/DataStructures.kt |  2 +-
 .../org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt | 16 ++++++++--------
 .../jetbrains/kotlin/util/PerformanceCounter.kt  |  4 ++--
 .../src/org/jetbrains/kotlin/util/scopeUtils.kt  |  6 +++---
 .../declarationsSearch/declarationSearchUtil.kt  |  2 +-
 .../kotlin/idea/stubindex/IndexUtils.kt          |  4 ++--
 .../kotlin/idea/util/ApplicationUtils.kt         |  4 ++--
 .../idea/refactoring/jetRefactoringUtil.kt       |  6 +++---
 .../util/psi/patternMatching/KotlinPsiUnifier.kt |  2 +-
 .../refactoring/AbstractMemberPullPushTest.kt    |  2 +-
 .../kotlin/search/KotlinReferencesSearchTest.kt  |  2 +-
 .../kotlin/j2k/JavaToKotlinConverter.kt          |  2 +-
 .../kotlin/js/inline/ExpressionDecomposer.kt     |  2 +-
 .../kotlin/js/inline/util/collectUtils.kt        |  2 +-
 .../kotlin/js/inline/util/collectionUtils.kt     |  2 +-
 .../kotlin/js/inline/util/rewriteUtils.kt        |  2 +-
 js/js.libraries/src/core/javautilCode.kt         | 10 +++++-----
 js/js.libraries/src/core/javautilCollections.kt  |  4 ++--
 js/js.libraries/src/core/json.kt                 |  4 ++--
 js/js.libraries/src/core/kotlin.kt               | 12 ++++++------
 .../jetbrains/kotlin/js/parser/parserUtils.kt    |  2 +-
 21 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/compiler/container/src/org/jetbrains/kotlin/container/DataStructures.kt b/compiler/container/src/org/jetbrains/kotlin/container/DataStructures.kt
index 637b374c7fd..24b98c02748 100644
--- a/compiler/container/src/org/jetbrains/kotlin/container/DataStructures.kt
+++ b/compiler/container/src/org/jetbrains/kotlin/container/DataStructures.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.container
 import java.util.ArrayList
 import java.util.HashSet
 
-public fun topologicalSort<T>(items: Iterable<T>, dependencies: (T) -> Iterable<T>): List<T> {
+public fun <T> topologicalSort(items: Iterable<T>, dependencies: (T) -> Iterable<T>): List<T> {
     val itemsInProgress = HashSet<T>()
     val completedItems = HashSet<T>()
     val result = ArrayList<T>()
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt
index 753ab17a8c3..50b7cc116c8 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt
@@ -91,7 +91,7 @@ public fun PsiElement.nextLeaf(filter: (PsiElement) -> Boolean): PsiElement? {
     return leaf
 }
 
-public fun PsiElement.getParentOfTypesAndPredicate<T : PsiElement>(
+public fun <T : PsiElement> PsiElement.getParentOfTypesAndPredicate(
         strict: Boolean = false, vararg parentClasses: Class<T>, predicate: (T) -> Boolean
 ): T? {
     var element = if (strict) getParent() else this
@@ -110,27 +110,27 @@ public fun PsiElement.getParentOfTypesAndPredicate<T : PsiElement>(
     return null
 }
 
-public fun PsiElement.getNonStrictParentOfType<T : PsiElement>(parentClass: Class<T>): T? {
+public fun <T : PsiElement> PsiElement.getNonStrictParentOfType(parentClass: Class<T>): T? {
     return PsiTreeUtil.getParentOfType(this, parentClass, false)
 }
 
-inline public fun PsiElement.getParentOfType<reified T : PsiElement>(strict: Boolean): T? {
+inline public fun <reified T : PsiElement> PsiElement.getParentOfType(strict: Boolean): T? {
     return PsiTreeUtil.getParentOfType(this, javaClass<T>(), strict)
 }
 
-inline public fun PsiElement.getStrictParentOfType<reified T : PsiElement>(): T? {
+inline public fun <reified T : PsiElement> PsiElement.getStrictParentOfType(): T? {
     return PsiTreeUtil.getParentOfType(this, javaClass<T>(), true)
 }
 
-inline public fun PsiElement.getNonStrictParentOfType<reified T : PsiElement>(): T? {
+inline public fun <reified T : PsiElement> PsiElement.getNonStrictParentOfType(): T? {
     return PsiTreeUtil.getParentOfType(this, javaClass<T>(), false)
 }
 
-inline public fun PsiElement.getChildOfType<reified T : PsiElement>(): T? {
+inline public fun <reified T : PsiElement> PsiElement.getChildOfType(): T? {
     return PsiTreeUtil.getChildOfType(this, javaClass<T>())
 }
 
-inline public fun PsiElement.getChildrenOfType<reified T : PsiElement>(): Array<T> {
+inline public fun <reified T : PsiElement> PsiElement.getChildrenOfType(): Array<T> {
     return PsiTreeUtil.getChildrenOfType(this, javaClass<T>()) ?: arrayOf()
 }
 
@@ -148,7 +148,7 @@ public fun <T : PsiElement> T.getIfChildIsInBranch(element: PsiElement, branch:
     return if (branch().isAncestor(element)) this else null
 }
 
-public inline fun PsiElement.getParentOfTypeAndBranch<reified T : PsiElement>(strict: Boolean = false, noinline branch: T.() -> PsiElement?): T? {
+public inline fun <reified T : PsiElement> PsiElement.getParentOfTypeAndBranch(strict: Boolean = false, noinline branch: T.() -> PsiElement?): T? {
     return getParentOfType<T>(strict)?.getIfChildIsInBranch(this, branch)
 }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt b/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt
index dd5dc752070..308881fd81e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/util/PerformanceCounter.kt
@@ -88,7 +88,7 @@ public abstract class PerformanceCounter protected constructor(val name: String)
         count++
     }
 
-    public final fun time<T>(block: () -> T): T {
+    public final fun <T> time(block: () -> T): T {
         count++
         if (!enabled) return block()
 
@@ -110,7 +110,7 @@ public abstract class PerformanceCounter protected constructor(val name: String)
         totalTimeNanos += delta
     }
 
-    protected abstract fun countTime<T>(block: () -> T): T
+    protected abstract fun <T> countTime(block: () -> T): T
 
     public fun report(consumer: (String) -> Unit) {
         if (totalTimeNanos == 0L) {
diff --git a/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt
index 985b1bbed9f..8dabefd4282 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/util/scopeUtils.kt
@@ -39,7 +39,7 @@ public fun <T> Collection<T>?.concat(collection: Collection<T>): Collection<T>?
     return result
 }
 
-public fun concatInOrder<T>(c1: Collection<T>?, c2: Collection<T>?): Collection<T> {
+public fun <T> concatInOrder(c1: Collection<T>?, c2: Collection<T>?): Collection<T> {
     val result = if (c1 == null || c1.isEmpty())
         c2
     else if (c2 == null || c2.isEmpty())
@@ -53,7 +53,7 @@ public fun concatInOrder<T>(c1: Collection<T>?, c2: Collection<T>?): Collection<
     return result ?: emptySet()
 }
 
-public inline fun getFromAllScopes<Scope, T>(scopes: Array<out Scope>, callback: (Scope) -> Collection<T>): Collection<T> {
+public inline fun <Scope, T> getFromAllScopes(scopes: Array<out Scope>, callback: (Scope) -> Collection<T>): Collection<T> {
     if (scopes.isEmpty()) return emptySet()
     var result: Collection<T>? = null
     for (scope in scopes) {
@@ -62,7 +62,7 @@ public inline fun getFromAllScopes<Scope, T>(scopes: Array<out Scope>, callback:
     return result ?: emptySet()
 }
 
-public inline fun getFirstMatch<Scope, T : Any>(scopes: Array<out Scope>, callback: (Scope) -> T?): T? {
+public inline fun <Scope, T : Any> getFirstMatch(scopes: Array<out Scope>, callback: (Scope) -> T?): T? {
     // NOTE: This is performance-sensitive; please don't replace with map().firstOrNull()
     for (scope in scopes) {
         val result = callback(scope)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt
index fe428d3c8fe..fbf3d0b10ce 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt
@@ -61,7 +61,7 @@ public class HierarchySearchRequest<T: PsiElement> (
         override val searchScope: SearchScope,
         val searchDeeply: Boolean = true
 ) : SearchRequestWithElement<T> {
-    fun copy<U: PsiElement>(newOriginalElement: U): HierarchySearchRequest<U> =
+    fun <U: PsiElement> copy(newOriginalElement: U): HierarchySearchRequest<U> =
             HierarchySearchRequest(newOriginalElement, searchScope, searchDeeply)
 }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt
index a37e5d6ec70..a769aaf696b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt
@@ -21,14 +21,14 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.stubs.KotlinCallableStubBase
 import org.jetbrains.kotlin.util.aliasImportMap
 
-fun indexTopLevelExtension<TDeclaration : KtCallableDeclaration>(stub: KotlinCallableStubBase<TDeclaration>, sink: IndexSink) {
+fun <TDeclaration : KtCallableDeclaration> indexTopLevelExtension(stub: KotlinCallableStubBase<TDeclaration>, sink: IndexSink) {
     if (stub.isExtension()) {
         val declaration = stub.getPsi()
         declaration.getReceiverTypeReference()!!.typeElement?.index(declaration, sink)
     }
 }
 
-private fun KtTypeElement.index<TDeclaration : KtCallableDeclaration>(declaration: TDeclaration, sink: IndexSink) {
+private fun <TDeclaration : KtCallableDeclaration> KtTypeElement.index(declaration: TDeclaration, sink: IndexSink) {
     fun occurrence(typeName: String) {
         val name = declaration.getName() ?: return
         sink.occurrence(KotlinTopLevelExtensionsByReceiverTypeIndex.INSTANCE.getKey(),
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt
index 7ed13843a63..dffa2cc3def 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt
@@ -21,11 +21,11 @@ import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.Project
 
-public fun runReadAction<T>(action: () -> T): T {
+public fun <T> runReadAction(action: () -> T): T {
     return ApplicationManager.getApplication().runReadAction<T>(action)
 }
 
-public fun runWriteAction<T>(action: () -> T): T {
+public fun <T> runWriteAction(action: () -> T): T {
     return ApplicationManager.getApplication().runWriteAction<T>(action)
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
index 2f0fcf9deaa..f38c3462a54 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
@@ -342,7 +342,7 @@ public fun KtElement.getContextForContainingDeclarationBody(): BindingContext? {
     return bodyElement?.let { it.analyze() }
 }
 
-public fun chooseContainerElement<T>(
+public fun <T> chooseContainerElement(
         containers: List<T>,
         editor: Editor,
         title: String,
@@ -415,7 +415,7 @@ public fun chooseContainerElement<T>(
     ).showInBestPositionFor(editor)
 }
 
-public fun chooseContainerElementIfNecessary<T>(
+public fun <T> chooseContainerElementIfNecessary(
         containers: List<T>,
         editor: Editor,
         title: String,
@@ -462,7 +462,7 @@ private fun copyModifierListItems(from: PsiModifierList, to: PsiModifierList, wi
     }
 }
 
-private fun copyTypeParameters<T>(
+private fun <T> copyTypeParameters(
         from: T,
         to: T,
         inserter: (T, PsiTypeParameterList) -> Unit
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
index b3d21e5cbb3..fce1489aef5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
@@ -522,7 +522,7 @@ public class KotlinPsiUnifier(
             return (!decl1.isNameRelevant() && !decl2.isNameRelevant()) || desc1.getName() == desc2.getName()
         }
 
-        private fun matchContainedDescriptors<T: DeclarationDescriptor>(
+        private fun <T: DeclarationDescriptor> matchContainedDescriptors(
                 declarations1: List<T>,
                 declarations2: List<T>,
                 matchPair: (Pair<T, T>) -> Boolean
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt
index 990ec470b9d..692a88504ce 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt
@@ -99,7 +99,7 @@ public abstract class AbstractMemberPullPushTest : KotlinLightCodeInsightFixture
         }
     }
 
-    protected fun chooseMembers<T : MemberInfoBase<*>>(members: List<T>): List<T> {
+    protected fun <T : MemberInfoBase<*>> chooseMembers(members: List<T>): List<T> {
         members.forEach {
             val info = it.member.elementInfo
             it.isChecked = info.checked
diff --git a/idea/tests/org/jetbrains/kotlin/search/KotlinReferencesSearchTest.kt b/idea/tests/org/jetbrains/kotlin/search/KotlinReferencesSearchTest.kt
index 4929fae2320..75f13a405ce 100644
--- a/idea/tests/org/jetbrains/kotlin/search/KotlinReferencesSearchTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/search/KotlinReferencesSearchTest.kt
@@ -52,7 +52,7 @@ public class KotlinReferencesSearchTest(): AbstractSearcherTest() {
     // workaround for KT-9788 AssertionError from backand when we read field from inline function
     private val myFixtureProxy: JavaCodeInsightTestFixture get() = myFixture
 
-    private inline fun doTest<reified T: PsiElement>(): List<PsiReference> {
+    private inline fun <reified T: PsiElement> doTest(): List<PsiReference> {
         myFixtureProxy.configureByFile(getFileName())
         val func = myFixtureProxy.getElementAtCaret().getParentOfType<T>(false)!!
         return ReferencesSearch.search(func).findAll().sortedBy { it.getElement().getTextRange().getStartOffset() }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
index fada8f31f2b..c0cff02189a 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
@@ -238,7 +238,7 @@ public class JavaToKotlinConverter(
         private var fraction = 0.0
         private var pass = 1
 
-        fun processItems<TInputItem, TOutputItem>(
+        fun <TInputItem, TOutputItem> processItems(
                 fractionPortion: Double,
                 inputItems: Iterable<TInputItem>,
                 processItem: (TInputItem) -> TOutputItem
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt
index 0ac8e9e40e1..ce603ec3434 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt
@@ -292,7 +292,7 @@ internal class ExpressionDecomposer private constructor(
     }
 
     inline
-    private fun withNewAdditionalStatements<T>(fn: ()->T): T {
+    private fun <T> withNewAdditionalStatements(fn: ()->T): T {
         val backup = additionalStatements
         additionalStatements = SmartList<JsStatement>()
         val result = fn()
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt
index 0ffa2fd3b84..125ed188e00 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectUtils.kt
@@ -68,7 +68,7 @@ public fun collectNamedFunctions(scope: JsNode): IdentityHashMap<JsName, JsFunct
     return namedFunctions
 }
 
-public fun collectInstances<T : JsNode>(klass: Class<T>, scope: JsNode): List<T> {
+public fun <T : JsNode> collectInstances(klass: Class<T>, scope: JsNode): List<T> {
     return with(InstanceCollector(klass, visitNestedDeclarations = false)) {
         accept(scope)
         collected
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectionUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectionUtils.kt
index 9e4e3e77842..f9306ec5f4b 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectionUtils.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/collectionUtils.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.inline.util
 import java.util.Collections
 import java.util.IdentityHashMap
 
-public fun IdentitySet<T>(): MutableSet<T> {
+public fun <T> IdentitySet(): MutableSet<T> {
     return Collections.newSetFromMap(IdentityHashMap<T, Boolean>())
 }
 
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriteUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriteUtils.kt
index 504b5c1137b..99a6e8f7c76 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriteUtils.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/rewriteUtils.kt
@@ -30,6 +30,6 @@ public fun <T : JsNode> replaceNames(node: T, replaceMap: IdentityHashMap<JsName
     return NameReplacingVisitor(replaceMap).accept(node)!!
 }
 
-public fun replaceThisReference<T : JsNode>(node: T, replacement: JsExpression) {
+public fun <T : JsNode> replaceThisReference(node: T, replacement: JsExpression) {
     ThisReplacingVisitor(replacement).accept(node)
 }
diff --git a/js/js.libraries/src/core/javautilCode.kt b/js/js.libraries/src/core/javautilCode.kt
index 50399886b5c..c2f415dc087 100644
--- a/js/js.libraries/src/core/javautilCode.kt
+++ b/js/js.libraries/src/core/javautilCode.kt
@@ -16,18 +16,18 @@
 
 package java.util
 
-public fun HashSet<E>(c: Collection<E>): HashSet<E>
+public fun <E> HashSet(c: Collection<E>): HashSet<E>
         = HashSet<E>(c.size()).apply { addAll(c) }
 
-public fun LinkedHashSet<E>(c: Collection<E>): HashSet<E>
+public fun <E> LinkedHashSet(c: Collection<E>): HashSet<E>
         = LinkedHashSet<E>(c.size()).apply { addAll(c) }
 
-public fun HashMap<K, V>(m: Map<K, V>): HashMap<K, V>
+public fun <K, V> HashMap(m: Map<K, V>): HashMap<K, V>
         = HashMap<K, V>(m.size()).apply { putAll(m) }
 
-public fun LinkedHashMap<K, V>(m: Map<K, V>): LinkedHashMap<K, V>
+public fun <K, V> LinkedHashMap(m: Map<K, V>): LinkedHashMap<K, V>
         = LinkedHashMap<K, V>(m.size()).apply { putAll(m) }
 
-public fun ArrayList<E>(c: Collection<E>): ArrayList<E>
+public fun <E> ArrayList(c: Collection<E>): ArrayList<E>
         = ArrayList<E>().apply { asDynamic().array = c.toTypedArray<Any?>() } // black dynamic magic
 
diff --git a/js/js.libraries/src/core/javautilCollections.kt b/js/js.libraries/src/core/javautilCollections.kt
index 7026686ed7c..a7a130832a2 100644
--- a/js/js.libraries/src/core/javautilCollections.kt
+++ b/js/js.libraries/src/core/javautilCollections.kt
@@ -4,7 +4,7 @@ import java.lang.*
 import java.util.*
 
 public object Collections {
-    public fun max<T>(col: Collection<T>, comp: Comparator<in T>): T = java.util.max(col, comp)
+    public fun <T> max(col: Collection<T>, comp: Comparator<in T>): T = java.util.max(col, comp)
 
     @Deprecated("Use list.sort() instead.", ReplaceWith("list.sort()"))
     public fun <T: Comparable<T>> sort(list: MutableList<T>): Unit = java.util.sort(list, naturalOrder())
@@ -25,7 +25,7 @@ public object Collections {
 }
 
 @library("collectionsMax")
-private fun max<T>(col: Collection<T>, comp: Comparator<in T>): T = noImpl
+private fun <T> max(col: Collection<T>, comp: Comparator<in T>): T = noImpl
 
 @library("collectionsSort")
 private fun <T> sort(list: MutableList<T>, comparator: Comparator<in T>): Unit = noImpl
diff --git a/js/js.libraries/src/core/json.kt b/js/js.libraries/src/core/json.kt
index c8e1af33758..c54ed9fdc87 100644
--- a/js/js.libraries/src/core/json.kt
+++ b/js/js.libraries/src/core/json.kt
@@ -26,8 +26,8 @@ public interface JsonClass {
     public fun stringify(o: Any, replacer: Array<String>, space: Int): String
     public fun stringify(o: Any, replacer: Array<String>, space: String): String
 
-    public fun parse<T>(text: String): T
-    public fun parse<T>(text: String, reviver: ((key: String, value: Any?)->Any?)): T
+    public fun <T> parse(text: String): T
+    public fun <T> parse(text: String, reviver: ((key: String, value: Any?)->Any?)): T
 }
 
 @native
diff --git a/js/js.libraries/src/core/kotlin.kt b/js/js.libraries/src/core/kotlin.kt
index c8085aa61c9..414292356e2 100644
--- a/js/js.libraries/src/core/kotlin.kt
+++ b/js/js.libraries/src/core/kotlin.kt
@@ -38,36 +38,36 @@ public fun <reified T> Collection<T>.toTypedArray(): Array<T> = noImpl
 /**
  * Returns an immutable list containing only the specified object [element].
  */
-public fun listOf<T>(element: T): List<T> = arrayListOf(element)
+public fun <T> listOf(element: T): List<T> = arrayListOf(element)
 
 /**
  * Returns an immutable set containing only the specified object [element].
  */
-public fun setOf<T>(element: T): Set<T> = hashSetOf(element)
+public fun <T> setOf(element: T): Set<T> = hashSetOf(element)
 
 /**
  * Returns an immutable map, mapping only the specified key to the
  * specified value.
  */
-public fun mapOf<K, V>(pair: Pair<K, V>): Map<K, V> = hashMapOf(pair)
+public fun <K, V> mapOf(pair: Pair<K, V>): Map<K, V> = hashMapOf(pair)
 
 /**
  * Creates a new instance of the [Lazy] that uses the specified initialization function [initializer].
  */
-public fun lazy<T>(initializer: () -> T): Lazy<T> = UnsafeLazyImpl(initializer)
+public fun <T> lazy(initializer: () -> T): Lazy<T> = UnsafeLazyImpl(initializer)
 
 /**
  * Creates a new instance of the [Lazy] that uses the specified initialization function [initializer].
  *
  * The [mode] parameter is ignored. */
-public fun lazy<T>(mode: LazyThreadSafetyMode, initializer: () -> T): Lazy<T> = UnsafeLazyImpl(initializer)
+public fun <T> lazy(mode: LazyThreadSafetyMode, initializer: () -> T): Lazy<T> = UnsafeLazyImpl(initializer)
 
 /**
  * Creates a new instance of the [Lazy] that uses the specified initialization function [initializer].
  *
  * The [lock] parameter is ignored.
  */
-public fun lazy<T>(lock: Any?, initializer: () -> T): Lazy<T> = UnsafeLazyImpl(initializer)
+public fun <T> lazy(lock: Any?, initializer: () -> T): Lazy<T> = UnsafeLazyImpl(initializer)
 
 
 internal fun <T> arrayOfNulls(reference: Array<out T>, size: Int): Array<T> {
diff --git a/js/js.parser/src/org/jetbrains/kotlin/js/parser/parserUtils.kt b/js/js.parser/src/org/jetbrains/kotlin/js/parser/parserUtils.kt
index 72206de2fe9..23d1482ffef 100644
--- a/js/js.parser/src/org/jetbrains/kotlin/js/parser/parserUtils.kt
+++ b/js/js.parser/src/org/jetbrains/kotlin/js/parser/parserUtils.kt
@@ -78,7 +78,7 @@ private fun parse(
 }
 
 inline
-private fun Node.toJsAst<T>(scope: JsScope, mapAction: JsAstMapper.(Node)->T): T =
+private fun <T> Node.toJsAst(scope: JsScope, mapAction: JsAstMapper.(Node)->T): T =
         JsAstMapper(scope).mapAction(this)
 
 private fun StringReader(string: String, offset: Int): Reader {