diff --git a/compiler/testData/codegen/box/elvis/genericNull.kt b/compiler/testData/codegen/box/elvis/genericNull.kt
index 909435bef07..beb1cb723f2 100644
--- a/compiler/testData/codegen/box/elvis/genericNull.kt
+++ b/compiler/testData/codegen/box/elvis/genericNull.kt
@@ -1,4 +1,4 @@
-fun foo<T: Number?>(t: T) {
+fun <T: Number?> foo(t: T) {
     (t ?: 42).toInt()
 }
 
diff --git a/compiler/testData/codegen/box/safeCall/genericNull.kt b/compiler/testData/codegen/box/safeCall/genericNull.kt
index fc229b13b00..d8ffc413616 100644
--- a/compiler/testData/codegen/box/safeCall/genericNull.kt
+++ b/compiler/testData/codegen/box/safeCall/genericNull.kt
@@ -1,4 +1,4 @@
-fun foo<T : Number?>(t: T) {
+fun <T : Number?> foo(t: T) {
     t?.toInt()
 }
 
diff --git a/compiler/testData/codegen/box/unit/nullableUnit.kt b/compiler/testData/codegen/box/unit/nullableUnit.kt
index 335dd498319..0289cca09ba 100644
--- a/compiler/testData/codegen/box/unit/nullableUnit.kt
+++ b/compiler/testData/codegen/box/unit/nullableUnit.kt
@@ -1,6 +1,6 @@
 fun isNull(x: Unit?) = x == null
 
-fun isNullGeneric<T : Any>(x: T?) = x == null
+fun <T : Any> isNullGeneric(x: T?) = x == null
 
 fun deepIsNull0(x: Unit?) = isNull(x)
 fun deepIsNull(x: Unit?) = deepIsNull0(x)
diff --git a/compiler/testData/codegen/boxInline/builders/builders.2.kt b/compiler/testData/codegen/boxInline/builders/builders.2.kt
index 2b498347798..5675206e3ed 100644
--- a/compiler/testData/codegen/boxInline/builders/builders.2.kt
+++ b/compiler/testData/codegen/boxInline/builders/builders.2.kt
@@ -23,7 +23,7 @@ abstract class Tag(val name: String) : Element() {
     val children = ArrayList<Element>()
     val attributes = HashMap<String, String>()
 
-    inline protected fun initTag<T : Element>(tag: T, init: T.() -> Unit): T {
+    inline protected fun <T : Element> initTag(tag: T, init: T.() -> Unit): T {
         tag.init()
         children.add(tag)
         return tag
@@ -47,7 +47,7 @@ abstract class Tag(val name: String) : Element() {
 }
 
 abstract class TagWithText(name: String) : Tag(name) {
-    fun String.plus() {
+    operator fun String.unaryPlus() {
         children.add(TextElement(this))
     }
 }
diff --git a/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.2.kt b/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.2.kt
index 917b4ae720e..862fbb7d8cc 100644
--- a/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.2.kt
+++ b/compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.2.kt
@@ -23,7 +23,7 @@ abstract class Tag(val name: String) : Element() {
     val children = ArrayList<Element>()
     val attributes = HashMap<String, String>()
 
-    inline protected fun initTag<T : Element>(tag: T, init: T.() -> Unit): T {
+    inline protected fun <T : Element> initTag(tag: T, init: T.() -> Unit): T {
         tag.init()
         children.add(tag)
         return tag
@@ -47,7 +47,7 @@ abstract class Tag(val name: String) : Element() {
 }
 
 abstract class TagWithText(name: String) : Tag(name) {
-    fun String.plus() {
+    operator fun String.unaryPlus() {
         children.add(TextElement(this))
     }
 }
diff --git a/compiler/testData/codegen/boxInline/reified/kt7017.2.kt b/compiler/testData/codegen/boxInline/reified/kt7017.2.kt
index 137047ae9a3..69528025b54 100644
--- a/compiler/testData/codegen/boxInline/reified/kt7017.2.kt
+++ b/compiler/testData/codegen/boxInline/reified/kt7017.2.kt
@@ -1,6 +1,6 @@
 package test
 
-inline fun test<reified T>(x: Any): Boolean {
+inline fun <reified T> test(x: Any): Boolean {
     val x = object {
         val y = x is T
     }
diff --git a/compiler/testData/codegen/boxInline/reified/kt8047.2.kt b/compiler/testData/codegen/boxInline/reified/kt8047.2.kt
index a6546500785..26cc6832fdf 100644
--- a/compiler/testData/codegen/boxInline/reified/kt8047.2.kt
+++ b/compiler/testData/codegen/boxInline/reified/kt8047.2.kt
@@ -1,5 +1,5 @@
 package test
 
-inline fun f<reified T>(x : () -> Unit) {
+inline fun <reified T> f(x : () -> Unit) {
     object { init { arrayOf<T>() } }
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/casts/asWithGeneric.kt b/compiler/testData/codegen/boxWithStdlib/casts/asWithGeneric.kt
index 62b916baf9f..5de4210c9a1 100644
--- a/compiler/testData/codegen/boxWithStdlib/casts/asWithGeneric.kt
+++ b/compiler/testData/codegen/boxWithStdlib/casts/asWithGeneric.kt
@@ -4,7 +4,7 @@ fun <T> test2(): T {
    return a as T
 }
 
-fun test3<T: Any>() = null as T
+fun <T: Any> test3() = null as T
 
 fun box(): String {
     if (test1<Int?>() != null) return "fail: test1"
diff --git a/compiler/testData/codegen/bytecodeText/redundantGotoRemoving.kt b/compiler/testData/codegen/bytecodeText/redundantGotoRemoving.kt
index 296c5bb9e17..a2c2727cfdb 100644
--- a/compiler/testData/codegen/bytecodeText/redundantGotoRemoving.kt
+++ b/compiler/testData/codegen/bytecodeText/redundantGotoRemoving.kt
@@ -1,5 +1,5 @@
 
-inline fun calc<T, R>(value : T, fn: (T)->R) : R = fn(value)
+inline fun <T, R> calc(value : T, fn: (T) -> R) : R = fn(value)
 inline fun <T> identity(value : T) : T = calc(value) {
     if (1 == 1) return it
     it
diff --git a/compiler/testData/codegen/notNullAssertions/assertionForNotNullTypeParam.kt b/compiler/testData/codegen/notNullAssertions/assertionForNotNullTypeParam.kt
index c3ea96443dd..801a613e91c 100644
--- a/compiler/testData/codegen/notNullAssertions/assertionForNotNullTypeParam.kt
+++ b/compiler/testData/codegen/notNullAssertions/assertionForNotNullTypeParam.kt
@@ -1 +1 @@
-fun foo<T : Any>(t: T) = t
+fun <T : Any> foo(t: T) = t
diff --git a/compiler/testData/constraintSystem/declarations.kt b/compiler/testData/constraintSystem/declarations.kt
index 6c16f640220..60253584451 100644
--- a/compiler/testData/constraintSystem/declarations.kt
+++ b/compiler/testData/constraintSystem/declarations.kt
@@ -1,4 +1,4 @@
-fun foo<T, P, E>() = 42
+fun <T, P, E> foo() = 42
 
 interface A
 interface B : A
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt
index a36344ba638..db4f81a3ef9 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt
@@ -8,7 +8,7 @@ class FC1: OC2(), T3
 interface T4: <!INTERFACE_WITH_SUPERCLASS!>OC1<!>
 interface T5: T2
 
-fun test<TP1: OC1, TP2: T2, TP3: OC2>(
+fun <TP1: OC1, TP2: T2, TP3: OC2> test(
     t2: T2,
     t4: T4,
     fc1: FC1,
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt
index 6c84314fb27..1f2a52a4d71 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt
@@ -6,7 +6,7 @@ open class OClass2
 class FClass1
 class FClass2
 
-fun test<TP1: OClass1, TP2: OClass2>(
+fun <TP1: OClass1, TP2: OClass2> test(
   t1: Trait1,
   oc1: OClass1,
   fc1: FClass1,
diff --git a/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt b/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt
index 9b901d2eede..9599e3169cb 100644
--- a/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt
+++ b/compiler/testData/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt
@@ -2,7 +2,7 @@ package test
 
 class MembersReferenceOuterTP<P> {
     inner class Inner {
-        fun f<Q : P>() {}
+        fun <Q : P> f() {}
         fun g(p: P): P = null!!
 
         val v: P = null!!
diff --git a/compiler/testData/psi/examples/With.kt b/compiler/testData/psi/examples/With.kt
index 63968e41fc0..0f1bbdf4b55 100644
--- a/compiler/testData/psi/examples/With.kt
+++ b/compiler/testData/psi/examples/With.kt
@@ -1,4 +1,4 @@
-inline fun with<T>(receiver : T, body :  T.() -> Unit) = receiver.body()
+inline fun <T> with(receiver : T, body :  T.() -> Unit) = receiver.body()
 
 fun example() {
 
diff --git a/compiler/testData/psi/examples/With.txt b/compiler/testData/psi/examples/With.txt
index b10c2514dea..19ba0b54479 100644
--- a/compiler/testData/psi/examples/With.txt
+++ b/compiler/testData/psi/examples/With.txt
@@ -9,12 +9,13 @@ JetFile: With.kt
     PsiWhiteSpace(' ')
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('with')
     TYPE_PARAMETER_LIST
       PsiElement(LT)('<')
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('T')
       PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('with')
     VALUE_PARAMETER_LIST
       PsiElement(LPAR)('(')
       VALUE_PARAMETER
diff --git a/compiler/testData/psi/examples/io/IOSamples.kt b/compiler/testData/psi/examples/io/IOSamples.kt
index cea319451a1..06c12de61c8 100644
--- a/compiler/testData/psi/examples/io/IOSamples.kt
+++ b/compiler/testData/psi/examples/io/IOSamples.kt
@@ -8,7 +8,7 @@ open class ICloseable {
 
 abstract class JavaCloseableWrapper(closeable : java.io.Closeable) : ICloseable(closeable)
 
-fun streamCopy<T>(from : IIterable<T>, to : IAdder<T>) {
+fun <T> streamCopy(from : IIterable<T>, to : IAdder<T>) {
   for (item in from) t.add(item)
 }
 
diff --git a/compiler/testData/psi/examples/io/IOSamples.txt b/compiler/testData/psi/examples/io/IOSamples.txt
index 5d716fca5c0..839c4c6b969 100644
--- a/compiler/testData/psi/examples/io/IOSamples.txt
+++ b/compiler/testData/psi/examples/io/IOSamples.txt
@@ -117,12 +117,13 @@ JetFile: IOSamples.kt
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('streamCopy')
     TYPE_PARAMETER_LIST
       PsiElement(LT)('<')
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('T')
       PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('streamCopy')
     VALUE_PARAMETER_LIST
       PsiElement(LPAR)('(')
       VALUE_PARAMETER
@@ -599,4 +600,4 @@ JetFile: IOSamples.kt
       PsiWhiteSpace(' ')
       PsiComment(EOL_COMMENT)('// throws IOException, you must catch or rethrow explicitly')
       PsiWhiteSpace('\n\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/testData/psi/examples/util/Comparison.kt b/compiler/testData/psi/examples/util/Comparison.kt
index a9cd6696260..8c890e5c0af 100644
--- a/compiler/testData/psi/examples/util/Comparison.kt
+++ b/compiler/testData/psi/examples/util/Comparison.kt
@@ -10,7 +10,7 @@ enum class ComparisonResult {
 
 typealias MatchableComparison<in T> =  (T, T) -> ComparisonResult
 
-fun asMatchableComparison<T>(cmp : Comparison<T>) : MatchableComparison<T> = {a, b ->
+fun <T> asMatchableComparison(cmp : Comparison<T>) : MatchableComparison<T> = {a, b ->
   val res = cmp(a, b)
   if (res == 0) return ComparisonResult.EQ
   if (res < 0) return ComparisonResult.LS
diff --git a/compiler/testData/psi/examples/util/Comparison.txt b/compiler/testData/psi/examples/util/Comparison.txt
index a1e830e8e36..72b81fef28c 100644
--- a/compiler/testData/psi/examples/util/Comparison.txt
+++ b/compiler/testData/psi/examples/util/Comparison.txt
@@ -273,12 +273,13 @@ JetFile: Comparison.kt
   FUN
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('asMatchableComparison')
     TYPE_PARAMETER_LIST
       PsiElement(LT)('<')
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('T')
       PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('asMatchableComparison')
     VALUE_PARAMETER_LIST
       PsiElement(LPAR)('(')
       VALUE_PARAMETER
diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt
index 85131e432e8..624d402980b 100644
--- a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt
+++ b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt
@@ -7,5 +7,5 @@ fun ((T) -> G)?.foo()
 fun ((T) -> G)??.foo()
 
 //--------------
-fun f<T>()
+fun <T> f()
 a.b class C
\ No newline at end of file
diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt
index 263474efaef..912636c7ca8 100644
--- a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt
+++ b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.txt
@@ -418,12 +418,13 @@ JetFile: FunctionsWithFunctionReceivers.kt
     PsiWhiteSpace('\n')
     PsiElement(fun)('fun')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f')
     TYPE_PARAMETER_LIST
       PsiElement(LT)('<')
       TYPE_PARAMETER
         PsiElement(IDENTIFIER)('T')
       PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    PsiElement(IDENTIFIER)('f')
     VALUE_PARAMETER_LIST
       PsiElement(LPAR)('(')
       PsiElement(RPAR)(')')
@@ -438,4 +439,4 @@ JetFile: FunctionsWithFunctionReceivers.kt
   CLASS
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('C')
+    PsiElement(IDENTIFIER)('C')
\ No newline at end of file
diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.kt b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.kt
index 2351caad754..6ca8d30811c 100644
--- a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.kt
+++ b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.kt
@@ -19,7 +19,7 @@ c<t>.
 
 //-----------
 class A<X> {
-    fun foo<Y>() {
+    fun <Y> foo() {
     }
 }
 
diff --git a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt
index be0176f4b4d..f219d293b3f 100644
--- a/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt
+++ b/compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceiversRecovery.txt
@@ -537,12 +537,13 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
       FUN
         PsiElement(fun)('fun')
         PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('foo')
         TYPE_PARAMETER_LIST
           PsiElement(LT)('<')
           TYPE_PARAMETER
             PsiElement(IDENTIFIER)('Y')
           PsiElement(GT)('>')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('foo')
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
           PsiElement(RPAR)(')')
@@ -600,4 +601,4 @@ JetFile: FunctionsWithFunctionReceiversRecovery.kt
             PsiElement(LPAR)('(')
             PsiElement(RPAR)(')')
       PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
+      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java b/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java
index 227d2465516..861f0f4c99f 100644
--- a/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java
@@ -65,20 +65,20 @@ public class KotlinOverloadTest extends KotlinLiteFixture {
                 "fun a() : Any");
 
         assertNotOverloadable(
-                "fun a<T1>() : T1",
-                "fun a<T>() : T");
+                "fun <T1> a() : T1",
+                "fun <T> a() : T");
 
         assertNotOverloadable(
-                "fun a<T1>(a : T1) : T1",
-                "fun a<T>(a : T) : T");
+                "fun <T1> a(a : T1) : T1",
+                "fun <T> a(a : T) : T");
 
         assertNotOverloadable(
-                "fun a<T1, X : T1>(a : T1) : T1",
-                "fun a<T, Y : T>(a : T) : T");
+                "fun <T1, X : T1> a(a : T1) : T1",
+                "fun <T, Y : T> a(a : T) : T");
 
         assertNotOverloadable(
-                "fun a<T1, X : T1>(a : T1) : T1",
-                "fun a<T, Y : T>(a : T) : Y");
+                "fun <T1, X : T1> a(a : T1) : T1",
+                "fun <T, Y : T> a(a : T) : Y");
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -100,50 +100,50 @@ public class KotlinOverloadTest extends KotlinLiteFixture {
                 "fun a(a : Int) : Int");
 
         assertNotOverloadable(
-                "fun a<T>(a : Int) : Int",
+                "fun <T> a(a : Int) : Int",
                 "fun a(a : Int) : Int");
 
         // TODO
         /*
         assertOverloadable(
-                "fun a<T1, X : T1>(a : T1) : T1",
-                "fun a<T, Y>(a : T) : T");
+                "fun <T1, X : T1> a(a : T1) : T1",
+                "fun <T, Y> a(a : T) : T");
         */
 
         assertOverloadable(
-                "fun a<T1, X : T1>(a : T1) : T1",
-                "fun a<T, Y : T>(a : Y) : T");
+                "fun <T1, X : T1> a(a : T1) : T1",
+                "fun <T, Y : T> a(a : Y) : T");
 
         assertNotOverloadable(
-                "fun a<T1, X : T1>(a : T1) : X",
-                "fun a<T, Y : T>(a : T) : T");
+                "fun <T1, X : T1> a(a : T1) : X",
+                "fun <T, Y : T> a(a : T) : T");
 
         // TODO
         /*
         assertNotOverloadable(
-                "fun a<T1, X : Array<out T1>>(a : Array<in T1>) : T1",
-                "fun a<T, Y : Array<out T>>(a : Array<in T>) : T");
+                "fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
+                "fun <T, Y : Array<out T>> a(a : Array<in T>) : T");
         */
 
         assertOverloadable(
-                "fun a<T1, X : Array<T1>>(a : Array<in T1>) : T1",
-                "fun a<T, Y : Array<out T>>(a : Array<in T>) : T");
+                "fun <T1, X : Array<T1>> a(a : Array<in T1>) : T1",
+                "fun <T, Y : Array<out T>> a(a : Array<in T>) : T");
 
         assertOverloadable(
-                "fun a<T1, X : Array<out T1>>(a : Array<in T1>) : T1",
-                "fun a<T, Y : Array<in T>>(a : Array<in T>) : T");
+                "fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
+                "fun <T, Y : Array<in T>> a(a : Array<in T>) : T");
 
         assertOverloadable(
-                "fun a<T1, X : Array<out T1>>(a : Array<in T1>) : T1",
-                "fun a<T, Y : Array<*>>(a : Array<in T>) : T");
+                "fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
+                "fun <T, Y : Array<*>> a(a : Array<in T>) : T");
 
         assertOverloadable(
-                "fun a<T1, X : Array<out T1>>(a : Array<in T1>) : T1",
-                "fun a<T, Y : Array<out T>>(a : Array<out T>) : T");
+                "fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
+                "fun <T, Y : Array<out T>> a(a : Array<out T>) : T");
 
         assertOverloadable(
-                "fun a<T1, X : Array<out T1>>(a : Array<*>) : T1",
-                "fun a<T, Y : Array<out T>>(a : Array<in T>) : T");
+                "fun <T1, X : Array<out T1>> a(a : Array<*>) : T1",
+                "fun <T, Y : Array<out T>> a(a : Array<in T>) : T");
 
         assertOverloadable(
                 "fun ff() : Int",
diff --git a/compiler/tests/org/jetbrains/kotlin/types/KotlinOverridingTest.java b/compiler/tests/org/jetbrains/kotlin/types/KotlinOverridingTest.java
index aa0ff4ebfcc..828bf30cf0e 100644
--- a/compiler/tests/org/jetbrains/kotlin/types/KotlinOverridingTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/types/KotlinOverridingTest.java
@@ -58,20 +58,20 @@ public class KotlinOverridingTest extends KotlinLiteFixture {
                 "fun a() : Int");
 
         assertOverridable(
-                "fun a<T1>() : T1",
-                "fun a<T>() : T");
+                "fun <T1> a() : T1",
+                "fun <T> a() : T");
 
         assertOverridable(
-                "fun a<T1>(a : T1) : T1",
-                "fun a<T>(a : T) : T");
+                "fun <T1> a(a : T1) : T1",
+                "fun <T> a(a : T) : T");
 
         assertOverridable(
-                "fun a<T1, X : T1>(a : T1) : T1",
-                "fun a<T, Y : T>(a : T) : T");
+                "fun <T1, X : T1> a(a : T1) : T1",
+                "fun <T, Y : T> a(a : T) : T");
 
         assertOverridable(
-                "fun a<T1, X : T1>(a : T1) : T1",
-                "fun a<T, Y : T>(a : T) : Y");
+                "fun <T1, X : T1> a(a : T1) : T1",
+                "fun <T, Y : T> a(a : T) : Y");
 
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -104,44 +104,44 @@ public class KotlinOverridingTest extends KotlinLiteFixture {
                 "fun a(a : Int) : Int");
 
         assertNotOverridable(
-                "fun a<T>(a : Int) : Int",
+                "fun <T> a(a : Int) : Int",
                 "fun a(a : Int) : Int");
 
         assertNotOverridable(
-                "fun a<T1, X : T1>(a : T1) : T1",
-                "fun a<T, Y>(a : T) : T");
+                "fun <T1, X : T1> a(a : T1) : T1",
+                "fun <T, Y> a(a : T) : T");
 
         assertNotOverridable(
-                "fun a<T1, X : T1>(a : T1) : T1",
-                "fun a<T, Y : T>(a : Y) : T");
+                "fun <T1, X : T1> a(a : T1) : T1",
+                "fun <T, Y : T> a(a : Y) : T");
 
         assertOverridable(
-                "fun a<T1, X : T1>(a : T1) : X",
-                "fun a<T, Y : T>(a : T) : T");
+                "fun <T1, X : T1> a(a : T1) : X",
+                "fun <T, Y : T> a(a : T) : T");
 
         assertOverridable(
-                "fun a<T1, X : Array<out T1>>(a : Array<in T1>) : T1",
-                "fun a<T, Y : Array<out T>>(a : Array<in T>) : T");
+                "fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
+                "fun <T, Y : Array<out T>> a(a : Array<in T>) : T");
 
         assertNotOverridable(
-                "fun a<T1, X : Array<T1>>(a : Array<in T1>) : T1",
-                "fun a<T, Y : Array<out T>>(a : Array<in T>) : T");
+                "fun <T1, X : Array<T1>> a(a : Array<in T1>) : T1",
+                "fun <T, Y : Array<out T>> a(a : Array<in T>) : T");
 
         assertNotOverridable(
-                "fun a<T1, X : Array<out T1>>(a : Array<in T1>) : T1",
-                "fun a<T, Y : Array<in T>>(a : Array<in T>) : T");
+                "fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
+                "fun <T, Y : Array<in T>> a(a : Array<in T>) : T");
 
         assertNotOverridable(
-                "fun a<T1, X : Array<out T1>>(a : Array<in T1>) : T1",
-                "fun a<T, Y : Array<*>>(a : Array<in T>) : T");
+                "fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
+                "fun <T, Y : Array<*>> a(a : Array<in T>) : T");
 
         assertNotOverridable(
-                "fun a<T1, X : Array<out T1>>(a : Array<in T1>) : T1",
-                "fun a<T, Y : Array<out T>>(a : Array<out T>) : T");
+                "fun <T1, X : Array<out T1>> a(a : Array<in T1>) : T1",
+                "fun <T, Y : Array<out T>> a(a : Array<out T>) : T");
 
         assertNotOverridable(
-                "fun a<T1, X : Array<out T1>>(a : Array<*>) : T1",
-                "fun a<T, Y : Array<out T>>(a : Array<in T>) : T");
+                "fun <T1, X : Array<out T1>> a(a : Array<*>) : T1",
+                "fun <T, Y : Array<out T>> a(a : Array<in T>) : T");
 
     }
 
diff --git a/core/builtins/src/kotlin/reflect/KType.kt b/core/builtins/src/kotlin/reflect/KType.kt
index 9875e0fe5f4..bf927dba8ff 100644
--- a/core/builtins/src/kotlin/reflect/KType.kt
+++ b/core/builtins/src/kotlin/reflect/KType.kt
@@ -33,7 +33,7 @@ public interface KType {
      * This may happen if it is a type of the type parameter with a nullable upper bound:
      *
      * ```
-     * fun foo<T>(t: T) {
+     * fun <T> foo(t: T) {
      *     // isMarkedNullable == false for t's type, but t can be null here
      * }
      * ```
diff --git a/eval4j/src/org/jetbrains/eval4j/values.kt b/eval4j/src/org/jetbrains/eval4j/values.kt
index 7d8e4583f4a..eaed17cfd51 100644
--- a/eval4j/src/org/jetbrains/eval4j/values.kt
+++ b/eval4j/src/org/jetbrains/eval4j/values.kt
@@ -99,7 +99,7 @@ fun int(v: Int) = IntValue(v, Type.INT_TYPE)
 fun long(v: Long) = LongValue(v)
 fun float(v: Float) = FloatValue(v)
 fun double(v: Double) = DoubleValue(v)
-//fun obj<T>(v: T, t: Type = if (v != null) Type.getType(v.javaClass) else Type.getType(javaClass<Any>())) = ObjectValue(v, t)
+//fun <T> obj(v: T, t: Type = if (v != null) Type.getType(v.javaClass) else Type.getType(javaClass<Any>())) = ObjectValue(v, t)
 
 val NULL_VALUE = ObjectValue(null, Type.getObjectType("null"))
 
diff --git a/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt b/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt
index 5cb9a27ff29..ca0574ede4a 100644
--- a/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt
+++ b/idea/idea-completion/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt
@@ -1,5 +1,5 @@
-fun genericFoo<T>(p: Int){}
-fun genericFoo<T>(c: Char){}
+fun <T> genericFoo(p: Int){}
+fun <T> genericFoo(c: Char){}
 
 fun foo() {
     genericFoo<<caret>
diff --git a/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/after.kt.template b/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/after.kt.template
index 8701c8a293f..664aea0983e 100644
--- a/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/after.kt.template
+++ b/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/after.kt.template
@@ -2,4 +2,4 @@ fun foo() {
     <spot>bar<String>("x")</spot>
 }
 
-fun bar<T>(t: T) : T = t
\ No newline at end of file
+fun <T> bar(t: T) : T = t
\ No newline at end of file
diff --git a/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/before.kt.template b/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/before.kt.template
index f869e201a8f..3e919e0b097 100644
--- a/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/before.kt.template
+++ b/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/before.kt.template
@@ -2,4 +2,4 @@ fun foo() {
     <spot>bar("x")</spot>
 }
 
-fun bar<T>(t: T) : T = t
\ No newline at end of file
+fun <T> bar(t: T) : T = t
\ No newline at end of file
diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt
index ad7681667c3..bdc5b88848d 100644
--- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt
+++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt
@@ -24,9 +24,6 @@ class TypeParams<in T1 : Any, out T2, T3 : (Int) -> Int, T4, T5 : Any?, T6 : T5,
     fun <T1> T1.withOwnParamExtension(p: T1) {
     }
 
-    fun T1.withOwnParamExtensionAfterName<T1>(p: T1) {
-    }
-
     val <G1> G1.withOwnParam: G1
         get() = throw IllegalStateException()
 
diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
index d6f4ba36af9..db183086b13 100644
--- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
+++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
@@ -422,20 +422,3 @@ PsiJetFileStubImpl[package=test]
             USER_TYPE:[isAbsoluteInRootPackage=false]
               REFERENCE_EXPRESSION:[referencedName=kotlin]
             REFERENCE_EXPRESSION:[referencedName=Unit]
-      FUN:[fqName=test.TypeParams.withOwnParamExtensionAfterName, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=true, isExtension=true, isTopLevel=false, name=withOwnParamExtensionAfterName]
-        MODIFIER_LIST:[public final]
-        TYPE_PARAMETER_LIST:
-          TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T1]
-        TYPE_REFERENCE:
-          USER_TYPE:[isAbsoluteInRootPackage=false]
-            REFERENCE_EXPRESSION:[referencedName=T1]
-        VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p]
-            TYPE_REFERENCE:
-              USER_TYPE:[isAbsoluteInRootPackage=false]
-                REFERENCE_EXPRESSION:[referencedName=T1]
-        TYPE_REFERENCE:
-          USER_TYPE:[isAbsoluteInRootPackage=false]
-            USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
-            REFERENCE_EXPRESSION:[referencedName=Unit]
diff --git a/idea/testData/diagnosticMessage/typeMismatchWithNothing.kt b/idea/testData/diagnosticMessage/typeMismatchWithNothing.kt
index 2d15094f53b..f6dc03ca339 100644
--- a/idea/testData/diagnosticMessage/typeMismatchWithNothing.kt
+++ b/idea/testData/diagnosticMessage/typeMismatchWithNothing.kt
@@ -5,7 +5,7 @@ package b
 
 interface A<T>
 
-fun infer<T>(a: A<T>) : T {}
+fun <T> infer(a: A<T>) : T {}
 
 fun foo(nothing: Nothing?) {
     val i = infer(nothing)
diff --git a/idea/testData/diagnosticMessage/upperBoundViolated.kt b/idea/testData/diagnosticMessage/upperBoundViolated.kt
index 911ff178dc6..1bf033ff2b4 100644
--- a/idea/testData/diagnosticMessage/upperBoundViolated.kt
+++ b/idea/testData/diagnosticMessage/upperBoundViolated.kt
@@ -4,14 +4,14 @@
 
 package i
 
-fun foo<R, T: List<R>>(r: R, list: T) {}
+fun <R, T: List<R>> foo(r: R, list: T) {}
 
 fun test1(i: Int, collection: Collection<Int>) {
     foo(i, collection) //error
 }
 
 //--------------
-fun bar<V : U, U>(v: V, u: MutableSet<U>) = u
+fun <V : U, U> bar(v: V, u: MutableSet<U>) = u
 
 fun test2(a: Any, s: MutableSet<String>) {
     bar(a, s) //error
@@ -21,7 +21,7 @@ fun test2(a: Any, s: MutableSet<String>) {
 interface A
 class B
 
-fun baz<T: R, R: B>(t: T, r: R) where T: A {
+fun <T: R, R: B> baz(t: T, r: R) where T: A {
 
 }
 
diff --git a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt
index d52013e5f85..2ef2bde3f34 100644
--- a/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt
+++ b/idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt
@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-fun foo<T>(<caret>t: T): T {
+fun <T> foo(<caret>t: T): T {
     println(t)
     return t
 }
diff --git a/idea/testData/indentationOnNewline/FunctionBlock.after.kt b/idea/testData/indentationOnNewline/FunctionBlock.after.kt
index f7b57785a17..0791f23c532 100644
--- a/idea/testData/indentationOnNewline/FunctionBlock.after.kt
+++ b/idea/testData/indentationOnNewline/FunctionBlock.after.kt
@@ -1,6 +1,6 @@
 package testing
 
-private fun times<T>(times : Int, body : () -> T) {}
+private fun <T> times(times : Int, body : () -> T) {}
 
 fun main(args: Array<String>) {
     times(3) {
diff --git a/idea/testData/indentationOnNewline/FunctionBlock.kt b/idea/testData/indentationOnNewline/FunctionBlock.kt
index c65baae700d..d76f1935dae 100644
--- a/idea/testData/indentationOnNewline/FunctionBlock.kt
+++ b/idea/testData/indentationOnNewline/FunctionBlock.kt
@@ -1,6 +1,6 @@
 package testing
 
-private fun times<T>(times : Int, body : () -> T) {}
+private fun <T> times(times : Int, body : () -> T) {}
 
 fun main(args: Array<String>) {
     times(3) {<caret>}
diff --git a/idea/testData/inspections/cleanup/cleanup.kt b/idea/testData/inspections/cleanup/cleanup.kt
index 6f38337bca0..201b3b2f8ac 100644
--- a/idea/testData/inspections/cleanup/cleanup.kt
+++ b/idea/testData/inspections/cleanup/cleanup.kt
@@ -64,7 +64,7 @@ class C {
     fun willBeInfix(i: Int) {}
 }
 
-fun typed<T>() {
+fun <T> typed() {
 }
 
 fun <T : Cloneable> withTypeParameters() where T : Comparable<T> {
diff --git a/idea/testData/intentions/addBraces/addBracesForDoWhile.kt b/idea/testData/intentions/addBraces/addBracesForDoWhile.kt
index 4900e987b5b..2317e09b3f1 100644
--- a/idea/testData/intentions/addBraces/addBracesForDoWhile.kt
+++ b/idea/testData/intentions/addBraces/addBracesForDoWhile.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>do doSomething("test")
diff --git a/idea/testData/intentions/addBraces/addBracesForDoWhile.kt.after b/idea/testData/intentions/addBraces/addBracesForDoWhile.kt.after
index f9971272bd2..b97cbfe36cf 100644
--- a/idea/testData/intentions/addBraces/addBracesForDoWhile.kt.after
+++ b/idea/testData/intentions/addBraces/addBracesForDoWhile.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     do {
diff --git a/idea/testData/intentions/addBraces/addBracesForElse.kt b/idea/testData/intentions/addBraces/addBracesForElse.kt
index 094ca177812..08e12358263 100644
--- a/idea/testData/intentions/addBraces/addBracesForElse.kt
+++ b/idea/testData/intentions/addBraces/addBracesForElse.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) doSomething("test")
diff --git a/idea/testData/intentions/addBraces/addBracesForElse.kt.after b/idea/testData/intentions/addBraces/addBracesForElse.kt.after
index b8e40aac012..1eaf4670a1d 100644
--- a/idea/testData/intentions/addBraces/addBracesForElse.kt.after
+++ b/idea/testData/intentions/addBraces/addBracesForElse.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) doSomething("test")
diff --git a/idea/testData/intentions/addBraces/addBracesForFor.kt b/idea/testData/intentions/addBraces/addBracesForFor.kt
index 0b50ba21cc7..711b7e4984f 100644
--- a/idea/testData/intentions/addBraces/addBracesForFor.kt
+++ b/idea/testData/intentions/addBraces/addBracesForFor.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     for (i in 1..4)
diff --git a/idea/testData/intentions/addBraces/addBracesForFor.kt.after b/idea/testData/intentions/addBraces/addBracesForFor.kt.after
index 428d0f7e3cf..f5a644a8c86 100644
--- a/idea/testData/intentions/addBraces/addBracesForFor.kt.after
+++ b/idea/testData/intentions/addBraces/addBracesForFor.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     for (i in 1..4) {
diff --git a/idea/testData/intentions/addBraces/addBracesForIf.kt b/idea/testData/intentions/addBraces/addBracesForIf.kt
index f93fefd6f7f..9c96e8fb9bd 100644
--- a/idea/testData/intentions/addBraces/addBracesForIf.kt
+++ b/idea/testData/intentions/addBraces/addBracesForIf.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>if (true) doSomething("test") else doSomething("test2")
diff --git a/idea/testData/intentions/addBraces/addBracesForIf.kt.after b/idea/testData/intentions/addBraces/addBracesForIf.kt.after
index 5b85659678b..07b52f92440 100644
--- a/idea/testData/intentions/addBraces/addBracesForIf.kt.after
+++ b/idea/testData/intentions/addBraces/addBracesForIf.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) {
diff --git a/idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt b/idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt
index 4e2ebebcd5d..46d6893d2fa 100644
--- a/idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt
+++ b/idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>if (true) doSomething("test")
diff --git a/idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt.after b/idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt.after
index 7c4ab49c01b..1e229495f00 100644
--- a/idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt.after
+++ b/idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) {
diff --git a/idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt b/idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt
index 7963225e163..417d6ad6c25 100644
--- a/idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt
+++ b/idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>if (true) doSomething("test");
diff --git a/idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt.after b/idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt.after
index 7c4ab49c01b..1e229495f00 100644
--- a/idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt.after
+++ b/idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) {
diff --git a/idea/testData/intentions/addBraces/addBracesForWhile.kt b/idea/testData/intentions/addBraces/addBracesForWhile.kt
index 785b0a2f250..2fed02b479e 100644
--- a/idea/testData/intentions/addBraces/addBracesForWhile.kt
+++ b/idea/testData/intentions/addBraces/addBracesForWhile.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>while (true)
diff --git a/idea/testData/intentions/addBraces/addBracesForWhile.kt.after b/idea/testData/intentions/addBraces/addBracesForWhile.kt.after
index 8e27e22383e..1a7370da25a 100644
--- a/idea/testData/intentions/addBraces/addBracesForWhile.kt.after
+++ b/idea/testData/intentions/addBraces/addBracesForWhile.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     while (true) {
diff --git a/idea/testData/intentions/addBraces/addBracesWithBraces.kt b/idea/testData/intentions/addBraces/addBracesWithBraces.kt
index ca5c54a7c88..cff533fef29 100644
--- a/idea/testData/intentions/addBraces/addBracesWithBraces.kt
+++ b/idea/testData/intentions/addBraces/addBracesWithBraces.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>if (true) {
diff --git a/idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt b/idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt
index 5be1951f3f5..731503af168 100644
--- a/idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt
+++ b/idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after b/idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after
index afff1fab549..710de712286 100644
--- a/idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after
+++ b/idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt
index a527cb91934..8cfeea3c4d9 100644
--- a/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt
+++ b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after
index e8e65a034ff..73a534a1f13 100644
--- a/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after
+++ b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt
index ce72b6f06b8..88185ab3d3a 100644
--- a/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt
+++ b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String = ""
diff --git a/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt
index fff38dfc146..9e66b34aa9f 100644
--- a/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt
+++ b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String = ""
diff --git a/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt
index b6776ac92d4..a5994e9529b 100644
--- a/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt
+++ b/idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt b/idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt
index 95a81bc5d77..a25f0f5f14b 100644
--- a/idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt
+++ b/idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (n == 1) {
diff --git a/idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after b/idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after
index 91b297361d6..c9c258f2378 100644
--- a/idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after
+++ b/idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (n == 1) {
diff --git a/idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt
index f666928030f..930abde10a5 100644
--- a/idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt
+++ b/idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>if (n == 1) {
diff --git a/idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after
index d14f08b85d2..66348d42ee1 100644
--- a/idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after
+++ b/idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>return if (n == 1) {
diff --git a/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt
index f37bcbeeded..a53c3e1b9fa 100644
--- a/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt
+++ b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>if (n == 1) {
diff --git a/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after
index 479577c1082..2438c560ae3 100644
--- a/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after
+++ b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>return if (n == 1) {
diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt b/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt
index df895de9567..cf8e5f34e67 100644
--- a/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt
+++ b/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after b/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after
index 91fcdde37d2..e3f66801cc9 100644
--- a/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after
+++ b/idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt
index 6a9a40a4e3f..f22f0f51d37 100644
--- a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt
+++ b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after
index 6c7427fe0a6..f63ab8d7fc7 100644
--- a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after
+++ b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt
index ccbe6641b90..98e8e4dbab8 100644
--- a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt
+++ b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String = ""
diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt
index e3613d8de2f..f37e9167cf0 100644
--- a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt
+++ b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String = ""
diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt
index e5702c3bbdb..a9fffea7f17 100644
--- a/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt
+++ b/idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt b/idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt
index d3882bbff04..9cb66cc0329 100644
--- a/idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt
+++ b/idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (3 > 2) {
diff --git a/idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after b/idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after
index 8c966e99e4e..47fc668f3e5 100644
--- a/idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after
+++ b/idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (3 > 2) {
diff --git a/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt
index 19af196ec03..356f6c134e3 100644
--- a/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt
+++ b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>when (n) {
diff --git a/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after
index 76d6c909722..63b1334375e 100644
--- a/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after
+++ b/idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>return when (n) {
diff --git a/idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt b/idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt
index 586ea73522b..3e463b646da 100644
--- a/idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt
+++ b/idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo: String? = null
diff --git a/idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt b/idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt
index 5d9d5ceec37..87d787fe9b2 100644
--- a/idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt
+++ b/idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun maybeFoo(): String? {
     return "foo"
diff --git a/idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt.after b/idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt.after
index b9051f282fe..7b65e62c533 100644
--- a/idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt.after
+++ b/idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun maybeFoo(): String? {
     return "foo"
diff --git a/idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt b/idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt
index aea116a80c5..3149eb67e73 100644
--- a/idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt
+++ b/idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo: String? = null
diff --git a/idea/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt b/idea/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt
index e46f095b494..aeb301bc42f 100644
--- a/idea/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt
+++ b/idea/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo: String? = "abc"
diff --git a/idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt b/idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt
index 728bc651f0d..b22fa103b29 100644
--- a/idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt
+++ b/idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt
@@ -2,7 +2,7 @@ fun maybeFoo(): String? {
     return "foo"
 }
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo = maybeFoo()
diff --git a/idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt.after b/idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt.after
index 1333ac3b987..a91271abfe4 100644
--- a/idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt.after
+++ b/idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt.after
@@ -2,7 +2,7 @@ fun maybeFoo(): String? {
     return "foo"
 }
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo = maybeFoo()
diff --git a/idea/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt b/idea/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt
index 355382ecf92..067df13e6d3 100644
--- a/idea/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt
+++ b/idea/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo: String? = "abc"
diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt b/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt
index 9bfdab5a00e..a219947c0d3 100644
--- a/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt
+++ b/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 class Foo {
     val b: String?
diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after
index 83148aeeb5d..14c9f9bb344 100644
--- a/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after
+++ b/idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 class Foo {
     val b: String?
diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt b/idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt
index 854d092e4b9..23d9d5ce137 100644
--- a/idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt
+++ b/idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val a: String? = "A"
diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt.after
index f51978ee6a4..078377297dd 100644
--- a/idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt.after
+++ b/idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val a: String? = "A"
diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt b/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt
index e3d5106731e..fbe44928cb6 100644
--- a/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt
+++ b/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     var a: String? = "A"
diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after
index 442b699eb87..ef41055be6e 100644
--- a/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after
+++ b/idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     var a: String? = "A"
diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt
index cda046018dd..edfd237342d 100644
--- a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt
+++ b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 val a: String? = "A"
 fun main(args: Array<String>) {
diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt.after
index 6e492136395..1c774c3e44a 100644
--- a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt.after
+++ b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 val a: String? = "A"
 fun main(args: Array<String>) {
diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt
index 7993bb0bb8c..2f0fae7aa8d 100644
--- a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt
+++ b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 val a: String?
     get() = ""
diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after
index 7d53cbd7e57..cb4c856afbe 100644
--- a/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after
+++ b/idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 val a: String?
     get() = ""
diff --git a/idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt b/idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt
index afff1fab549..710de712286 100644
--- a/idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt
+++ b/idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after
index 5be1951f3f5..731503af168 100644
--- a/idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after
+++ b/idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt b/idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt
index 57df8cfe368..aea5a5bda1a 100644
--- a/idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt
+++ b/idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after
index 1d1f26b3b72..589177fd53c 100644
--- a/idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after
+++ b/idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt
index e8e65a034ff..73a534a1f13 100644
--- a/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt
+++ b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after
index a527cb91934..8cfeea3c4d9 100644
--- a/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after
+++ b/idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt b/idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt
index c86fecce736..49301b4b50c 100644
--- a/idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt
+++ b/idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after
index 7fd5d6b64b4..b185073652a 100644
--- a/idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after
+++ b/idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt
index 6c7427fe0a6..f63ab8d7fc7 100644
--- a/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt
+++ b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after
index 6a9a40a4e3f..f22f0f51d37 100644
--- a/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after
+++ b/idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt
index e2e76858a2e..c0a704f16c0 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt
+++ b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String? {
     val res = <caret>if (n == 1) {
diff --git a/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt.after b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt.after
index 45f7ea817a9..c1a9e0ebbb6 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt.after
+++ b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String? {
     val res: String?
diff --git a/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt
index d0581293898..b51d4287aae 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt
+++ b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String? {
     var res = <caret>if (n == 1) {
diff --git a/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt.after b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt.after
index 46297e53a93..7706a4e0dc7 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt.after
+++ b/idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String? {
     var res: String?
diff --git a/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt
index 78282f4d676..9fdd50879a6 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt
+++ b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     val res<caret> = if (n == 1) {
diff --git a/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after
index ddfcae39357..f83b9af48e0 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after
+++ b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     val res: String
diff --git a/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt
index 8b9351efbba..4e13d00b340 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt
+++ b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res<caret> = if (n == 1) {
diff --git a/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after
index 8ddbde32ec9..59cea0ab1da 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after
+++ b/idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt
index bab2b2436ca..05c5a8bc178 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt
+++ b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     val res<caret> = when (n) {
diff --git a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after
index b65b8b621e1..7e52fe89d07 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after
+++ b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     val res: String
diff --git a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt
index b69d6d669ab..7c3ea3bd0b6 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt
+++ b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res<caret> = when (n) {
diff --git a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after
index e9df13c30a7..f7702f06d6e 100644
--- a/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after
+++ b/idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String
diff --git a/idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt b/idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt
index 91b297361d6..c9c258f2378 100644
--- a/idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt
+++ b/idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (n == 1) {
diff --git a/idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt.after b/idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt.after
index 95a81bc5d77..a25f0f5f14b 100644
--- a/idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt.after
+++ b/idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (n == 1) {
diff --git a/idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt b/idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt
index d14f08b85d2..66348d42ee1 100644
--- a/idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt
+++ b/idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>return if (n == 1) {
diff --git a/idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after
index f666928030f..930abde10a5 100644
--- a/idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after
+++ b/idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>if (n == 1) {
diff --git a/idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt b/idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt
index 8c966e99e4e..47fc668f3e5 100644
--- a/idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt
+++ b/idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (3 > 2) {
diff --git a/idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after b/idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after
index d3882bbff04..9cb66cc0329 100644
--- a/idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after
+++ b/idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (3 > 2) {
diff --git a/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt b/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt
index 932ced101af..4c1c4e3757c 100644
--- a/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt
+++ b/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>return when(n) {
diff --git a/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after b/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after
index e3bd3b96550..63f39fdd8a8 100644
--- a/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after
+++ b/idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>when(n) {
diff --git a/idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt b/idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt
index 78cf776a7da..364103d455f 100644
--- a/idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt.after b/idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt.after
index 952cb7db6a7..1e14b4a8031 100644
--- a/idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt.after
+++ b/idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt b/idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt
index 14b91aa966d..134ae7246dc 100644
--- a/idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt.after b/idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt.after
index b60336e6410..4815e1ecf54 100644
--- a/idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt.after
+++ b/idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt b/idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt
index ed9dd646a5f..e4e78d9a400 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt b/idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt
index 5bd53a61ceb..6928da5636b 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt.after b/idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt.after
index 9789f4849db..38fdbeb9ad9 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt.after
+++ b/idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt b/idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt
index 5c1bce29b46..da7769f502b 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     var res: String = ""
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt.after b/idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt.after
index bf510850dfc..f9924f113c6 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt.after
+++ b/idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     var res: String = ""
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt b/idea/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt
index cd73245bbfc..bd4909d5239 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     var res: String = ""
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithSubject.kt b/idea/testData/intentions/branched/when/merge/mergeWithSubject.kt
index 8a79481ae9d..db7c781adf7 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithSubject.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithSubject.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithSubject.kt.after b/idea/testData/intentions/branched/when/merge/mergeWithSubject.kt.after
index 223c0e1e9d9..9cec4359dce 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithSubject.kt.after
+++ b/idea/testData/intentions/branched/when/merge/mergeWithSubject.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt
index 004e860f3d0..8ecea672fa8 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt
index dbad7590056..5126bc323a5 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt
index cd46ac10c63..727794afbbe 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt
index b6ad4ac53af..a9643f655c0 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt
index 6415b952bb8..021083974ea 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt
index db7b74b663c..f65d41ce69d 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt
index 4d87fac2524..fa67b9cd54b 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt
index 44c65ce7b36..509350a24be 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt
index 178730ace8e..f30762b76f3 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithVarSubject.kt b/idea/testData/intentions/branched/when/merge/mergeWithVarSubject.kt
index a13894f4267..c17d394e787 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithVarSubject.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithVarSubject.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test() {
     var n = 0
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt b/idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt
index 13c5aaacb34..e12a1205b9f 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt
+++ b/idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt.after b/idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt.after
index 8eab31f8ca2..3ee3d8a0472 100644
--- a/idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt.after
+++ b/idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String
diff --git a/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt
index c13036ac392..f0f52f026a2 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt
+++ b/idea/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt
@@ -1,7 +1,7 @@
 // IS_APPLICABLE: false
 fun test() {
     class Test {
-        fun div<T>(a: Test): T? = a as? T
+        fun <T> div(a: Test): T? = a as? T
     }
     val test = Test()
     test.div<caret><Int>(Test())
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt
index 9665a4173fa..beed0bb2509 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test() {
     class Test{
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt.after
index d293e366713..6a05f6c696d 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt.after
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test() {
     class Test{
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt
index 961e739985a..17533f21978 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test() {
     class Test{
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt.after
index 363e6849ba0..16b81120658 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt.after
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test() {
     class Test{
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt
index 39f74eb1e4a..ca9c2f4b376 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt
@@ -1,6 +1,6 @@
 fun test() {
     class Test{
-        fun contains<T>(a: T): Boolean = false
+        fun <T> contains(a: T): Boolean = false
     }
     val test = Test()
     test.contai<caret>ns<Int>(1)
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt.after
index 4828a41496d..4fb335ce553 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt.after
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt.after
@@ -1,6 +1,6 @@
 fun test() {
     class Test{
-        fun contains<T>(a: T): Boolean = false
+        fun <T> contains(a: T): Boolean = false
     }
     val test = Test()
     1 in test
diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt
index baebf7ce4e6..e7959e6b75d 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt
+++ b/idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test() {
     class Test {
diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt.after
index 92316626640..6e14a539cce 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt.after
+++ b/idea/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test() {
     class Test {
diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt
index 63e08dd9212..972de8a215c 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt
+++ b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt
@@ -1,6 +1,6 @@
 fun test() {
     class Test {
-        fun invoke<T>(a: Int) {}
+        fun <T> invoke(a: Int) {}
     }
     val test = Test()
     test.i<caret>nvoke<Int>(0)
diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt.after
index 113d946fbff..4117619dcfb 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt.after
+++ b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt.after
@@ -1,6 +1,6 @@
 fun test() {
     class Test {
-        fun invoke<T>(a: Int) {}
+        fun <T> invoke(a: Int) {}
     }
     val test = Test()
     test<Int>(0)
diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt
index 9df69867bd0..9548fc08545 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt
+++ b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt
@@ -1,6 +1,6 @@
 fun test() {
     class Test {
-        fun invoke<T>(fn: () -> T) {}
+        fun <T> invoke(fn: () -> T) {}
     }
     val test = Test()
     test.i<caret>nvoke<Int> { 0 }
diff --git a/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt.after b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt.after
index 0999a897c0d..4f086e49fff 100644
--- a/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt.after
+++ b/idea/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt.after
@@ -1,6 +1,6 @@
 fun test() {
     class Test {
-        fun invoke<T>(fn: () -> T) {}
+        fun <T> invoke(fn: () -> T) {}
     }
     val test = Test()
     test<Int> { 0 }
diff --git a/idea/testData/intentions/convertFunctionToProperty/typeArgumentsConflict.kt b/idea/testData/intentions/convertFunctionToProperty/typeArgumentsConflict.kt
index cf42391def9..55db4ab00a6 100644
--- a/idea/testData/intentions/convertFunctionToProperty/typeArgumentsConflict.kt
+++ b/idea/testData/intentions/convertFunctionToProperty/typeArgumentsConflict.kt
@@ -1,6 +1,6 @@
 // SHOULD_FAIL_WITH: Type arguments will be lost after conversion: foo&lt;Double&gt;()
 class A(val n: Int) {
-    fun <caret>foo<T>(): Boolean = n > 1
+    fun <T> <caret>foo(): Boolean = n > 1
 }
 
 fun test() {
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt b/idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt
index dd69095a2fa..fc9c469f9d2 100644
--- a/idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt
@@ -1,3 +1,3 @@
 abstract class Owner<T> {
-    fun <caret>f<R>(t: T, r: R): R = r
+    fun <R> <caret>f(t: T, r: R): R = r
 }
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt.after
index 86d4f0d8d76..c1ee18f6097 100644
--- a/idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt.after
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt.after
@@ -1,4 +1,4 @@
 abstract class Owner<T> {
 }
 
-fun Owner<T>.<caret>f<T, R>(t: T, r: R): R = r
+fun <T, R> Owner<T>.f(t: T, r: R): R = r
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt b/idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt
index 0cfadfc44db..fc870620ca0 100644
--- a/idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt
@@ -1,3 +1,3 @@
 abstract class Owner {
-    fun <caret>f<T>(t: T): T = t
+    fun <T> <caret>f(t: T): T = t
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt.after
index 0142c812862..ac6c26ebb88 100644
--- a/idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt.after
+++ b/idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt.after
@@ -1,4 +1,4 @@
 abstract class Owner {
 }
 
-fun Owner.<caret>f<T>(t: T): T = t
\ No newline at end of file
+fun <T> Owner.f(t: T): T = t
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/inapplicableAlreadyTyped.kt b/idea/testData/intentions/insertExplicitTypeArguments/inapplicableAlreadyTyped.kt
index 26147a049d5..cb7917b6a60 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/inapplicableAlreadyTyped.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/inapplicableAlreadyTyped.kt
@@ -3,4 +3,4 @@ fun foo() {
     val x = <caret>bar<String>("x")
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable.kt b/idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable.kt
index 42c5b485a4e..661c9cc6ffa 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable.kt
@@ -3,4 +3,4 @@ fun foo() {
     val x = bar("<caret>x")
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable2.kt b/idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable2.kt
index f957e1f7e10..ede07bf59e8 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable2.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable2.kt
@@ -3,4 +3,4 @@ fun foo() {
     val x = bar("x") { <caret>2 }
 }
 
-fun bar<T>(t: T, v : () -> Int): Int = 1
\ No newline at end of file
+fun <T> bar(t: T, v : () -> Int): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/inapplicableTypeNotInferred.kt b/idea/testData/intentions/insertExplicitTypeArguments/inapplicableTypeNotInferred.kt
index 9bc2762c86e..9509863d5e0 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/inapplicableTypeNotInferred.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/inapplicableTypeNotInferred.kt
@@ -4,4 +4,4 @@ fun foo() {
     val x = <caret>bar(s) // s not definded, can't be inferred
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt b/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt
index 94c73859b6f..53abcb95f9a 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt
@@ -3,4 +3,4 @@ fun foo() {
       val z = <caret>bar("1", 1, 2, "x")
 }
 
-fun bar<T, V, R, K>(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
+fun <T, V, R, K> bar(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt.after
index 029031a8c26..4591c77a456 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt.after
@@ -3,4 +3,4 @@ fun foo() {
       val z = <caret>bar<String, Int, Int, String>("1", 1, 2, "x")
 }
 
-fun bar<T, V, R, K>(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
+fun <T, V, R, K> bar(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt b/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt
index e907215349a..4074a080db9 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt
@@ -3,4 +3,4 @@ fun foo() {
       val z = <caret>bar("1", 1, 2, "x")
 }
 
-fun bar<R, K, T, V>(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
+fun <R, K, T, V> bar(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt.after
index 5e7b8dfcf7f..deaef1e68b3 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt.after
@@ -3,4 +3,4 @@ fun foo() {
       val z = <caret>bar<Int, String, String, Int>("1", 1, 2, "x")
 }
 
-fun bar<R, K, T, V>(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
+fun <R, K, T, V> bar(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt b/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt
index 4da6ef543de..2ce53ce16bb 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt
@@ -7,4 +7,4 @@ fun test() {
 
 fun foo(vararg x: String) = x
 
-fun bar<T, R, V>(t: T, r: R, v: V) {}
+fun <T, R, V> bar(t: T, r: R, v: V) {}
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after
index 846ca07191a..e508a818b12 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after
@@ -9,4 +9,4 @@ fun test() {
 
 fun foo(vararg x: String) = x
 
-fun bar<T, R, V>(t: T, r: R, v: V) {}
+fun <T, R, V> bar(t: T, r: R, v: V) {}
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt b/idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt
index 96926081ab6..f5d03bc4e8f 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt
@@ -3,4 +3,4 @@ fun foo() {
     val x = <caret>bar("x", 0)
 }
 
-fun bar<T, V>(t: T, v: V): Int = 1
\ No newline at end of file
+fun <T, V> bar(t: T, v: V): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt.after
index e2703a4cb29..c4288a14108 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt.after
@@ -3,4 +3,4 @@ fun foo() {
     val x = bar<String, Int>("x", 0)
 }
 
-fun bar<T, V>(t: T, v: V): Int = 1
\ No newline at end of file
+fun <T, V> bar(t: T, v: V): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt
index 8a8a127cdc5..e72357c5c75 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt
@@ -3,4 +3,4 @@ fun foo() {
     <caret>bar({ i: Int -> 2 * i })
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt.after
index 9097a01730e..036d913a169 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt.after
@@ -3,4 +3,4 @@ fun foo() {
     bar<(Int) -> Int>({ i: Int -> 2 * i })
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt
index a83d91a36bb..591a9e79bee 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: true
-fun foo<T>(t: T) {
+fun <T> foo(t: T) {
     <caret>bar(t)
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt.after
index c1753292167..78e7f23d98e 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt.after
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: true
-fun foo<T>(t: T) {
+fun <T> foo(t: T) {
     bar<T>(t)
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt
index 73db0cc5bcb..c199917d8d5 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt
@@ -7,4 +7,4 @@ fun test() {
 
 fun foo(vararg x: String) = x
 
-fun bar<T>(vararg ts: T) {}
\ No newline at end of file
+fun <T> bar(vararg ts: T) {}
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after
index 052f9e58f84..93957b340df 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after
@@ -9,4 +9,4 @@ fun test() {
 
 fun foo(vararg x: String) = x
 
-fun bar<T>(vararg ts: T) {}
\ No newline at end of file
+fun <T> bar(vararg ts: T) {}
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt
index de35ce1f390..5c0412ee2f0 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt
@@ -3,4 +3,4 @@ fun foo() {
       val z = <caret>bar { it * 2 }
 }
 
-fun bar<T>(a: (Int)->T): T = a(1)
\ No newline at end of file
+fun <T> bar(a: (Int)->T): T = a(1)
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt.after
index 0f2f823020e..9e54b584851 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt.after
@@ -3,4 +3,4 @@ fun foo() {
       val z = bar<Int> { it * 2 }
 }
 
-fun bar<T>(a: (Int)->T): T = a(1)
\ No newline at end of file
+fun <T> bar(a: (Int)->T): T = a(1)
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt
index 0219fa09cda..7ca48d44bd8 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt
@@ -3,4 +3,4 @@ fun foo() {
     <caret>bar(1, 2, 3, 4)
 }
 
-fun bar<T>(vararg ts: T): Int = 1
\ No newline at end of file
+fun <T> bar(vararg ts: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt.after
index 7edbe6123d6..abf1b09082d 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt.after
@@ -3,4 +3,4 @@ fun foo() {
     bar<Int>(1, 2, 3, 4)
 }
 
-fun bar<T>(vararg ts: T): Int = 1
\ No newline at end of file
+fun <T> bar(vararg ts: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt b/idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt
index 5f8b5de4fa4..c6a8ac3eacd 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt
+++ b/idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt
@@ -3,4 +3,4 @@ fun foo() {
     <caret>bar("x")
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt.after b/idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt.after
index d1686744c40..f732f02a650 100644
--- a/idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt.after
+++ b/idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt.after
@@ -3,4 +3,4 @@ fun foo() {
     bar<String>("x")
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/inapplicable2.kt b/idea/testData/intentions/moveLambdaInsideParentheses/inapplicable2.kt
index c9e444d2a11..9f9656fee28 100644
--- a/idea/testData/intentions/moveLambdaInsideParentheses/inapplicable2.kt
+++ b/idea/testData/intentions/moveLambdaInsideParentheses/inapplicable2.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo(x: Int) {
     if (x == 1) <caret>{
diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt
index a6b03b8d32e..45216f242dc 100644
--- a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt
+++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt
@@ -3,6 +3,6 @@ fun foo() {
     bar<String>("x") <caret>{ it }
 }
 
-fun bar<T>(t:T, a: (Int) -> Int): Int {
+fun <T> bar(t:T, a: (Int) -> Int): Int {
     return a(1)
 }
diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt.after b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt.after
index 81dd0dfcf8e..f37e69f5b29 100644
--- a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt.after
+++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt.after
@@ -3,6 +3,6 @@ fun foo() {
     bar<String>("x", { it })
 }
 
-fun bar<T>(t:T, a: (Int) -> Int): Int {
+fun <T> bar(t:T, a: (Int) -> Int): Int {
     return a(1)
 }
diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt
index 0125985af4a..ee575a4af81 100644
--- a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt
+++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt
@@ -3,6 +3,6 @@ fun foo() {
     bar<String> <caret>{ it.toString() }
 }
 
-fun bar<T>(a: (Int)->T): T {
+fun <T> bar(a: (Int)->T): T {
     return a(1)
 }
diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt.after b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt.after
index 4e26428259e..79bf8e0a9ae 100644
--- a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt.after
+++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt.after
@@ -3,6 +3,6 @@ fun foo() {
     bar<String>({ it.toString() })
 }
 
-fun bar<T>(a: (Int)->T): T {
+fun <T> bar(a: (Int)->T): T {
     return a(1)
 }
diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt
index 308533a5e93..6532abc217d 100644
--- a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt
+++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt
@@ -3,6 +3,6 @@ fun foo() {
     bar<String, Int, Int>("x", 1, 2) <caret>{ it }
 }
 
-fun bar<T, V, K>(t: T, v: V, k: K, a: (Int)->Int): Int {
+fun <T, V, K> bar(t: T, v: V, k: K, a: (Int)->Int): Int {
     return a(1)
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt.after b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt.after
index 33af82989f5..c731afa0778 100644
--- a/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt.after
+++ b/idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt.after
@@ -3,6 +3,6 @@ fun foo() {
     bar<String, Int, Int>("x", 1, 2, { it })
 }
 
-fun bar<T, V, K>(t: T, v: V, k: K, a: (Int)->Int): Int {
+fun <T, V, K> bar(t: T, v: V, k: K, a: (Int)->Int): Int {
     return a(1)
 }
\ No newline at end of file
diff --git a/idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable2.kt b/idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable2.kt
index c9e444d2a11..9f9656fee28 100644
--- a/idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable2.kt
+++ b/idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable2.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo(x: Int) {
     if (x == 1) <caret>{
diff --git a/idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable3.kt b/idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable3.kt
index dd839bbed95..8f4cf08e1ca 100644
--- a/idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable3.kt
+++ b/idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable3.kt
@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo(x: Int) {
     if (x == 1) {
diff --git a/idea/testData/intentions/removeBraces/doWhile.kt b/idea/testData/intentions/removeBraces/doWhile.kt
index 66c2f0b39cc..26b0368ef05 100644
--- a/idea/testData/intentions/removeBraces/doWhile.kt
+++ b/idea/testData/intentions/removeBraces/doWhile.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     do {
diff --git a/idea/testData/intentions/removeBraces/doWhile.kt.after b/idea/testData/intentions/removeBraces/doWhile.kt.after
index b0b5c104ad6..592e1bc8053 100644
--- a/idea/testData/intentions/removeBraces/doWhile.kt.after
+++ b/idea/testData/intentions/removeBraces/doWhile.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     do doSomething("test")
diff --git a/idea/testData/intentions/removeBraces/doWhileWithTwoStatements.kt b/idea/testData/intentions/removeBraces/doWhileWithTwoStatements.kt
index 32188f51cff..22afd8b3002 100644
--- a/idea/testData/intentions/removeBraces/doWhileWithTwoStatements.kt
+++ b/idea/testData/intentions/removeBraces/doWhileWithTwoStatements.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     do {
diff --git a/idea/testData/intentions/removeBraces/else.kt b/idea/testData/intentions/removeBraces/else.kt
index 47c02397c9e..05abdc6123c 100644
--- a/idea/testData/intentions/removeBraces/else.kt
+++ b/idea/testData/intentions/removeBraces/else.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) {
diff --git a/idea/testData/intentions/removeBraces/else.kt.after b/idea/testData/intentions/removeBraces/else.kt.after
index 5b85659678b..07b52f92440 100644
--- a/idea/testData/intentions/removeBraces/else.kt.after
+++ b/idea/testData/intentions/removeBraces/else.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) {
diff --git a/idea/testData/intentions/removeBraces/for.kt b/idea/testData/intentions/removeBraces/for.kt
index 36bb446f12f..78d78bd92d7 100644
--- a/idea/testData/intentions/removeBraces/for.kt
+++ b/idea/testData/intentions/removeBraces/for.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     for (i in 1..4) {<caret>
diff --git a/idea/testData/intentions/removeBraces/for.kt.after b/idea/testData/intentions/removeBraces/for.kt.after
index 05930125351..bb89631c0c4 100644
--- a/idea/testData/intentions/removeBraces/for.kt.after
+++ b/idea/testData/intentions/removeBraces/for.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     for (i in 1..4) doSomething("test")
diff --git a/idea/testData/intentions/removeBraces/if.kt b/idea/testData/intentions/removeBraces/if.kt
index 1fec3b66c2f..33385bb6aa9 100644
--- a/idea/testData/intentions/removeBraces/if.kt
+++ b/idea/testData/intentions/removeBraces/if.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) {
diff --git a/idea/testData/intentions/removeBraces/if.kt.after b/idea/testData/intentions/removeBraces/if.kt.after
index e1dd424c946..b68f4dd50e6 100644
--- a/idea/testData/intentions/removeBraces/if.kt.after
+++ b/idea/testData/intentions/removeBraces/if.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) doSomething("test")
diff --git a/idea/testData/intentions/removeBraces/ifWithComment.kt b/idea/testData/intentions/removeBraces/ifWithComment.kt
index 801f06d30ae..4ba57395cb2 100644
--- a/idea/testData/intentions/removeBraces/ifWithComment.kt
+++ b/idea/testData/intentions/removeBraces/ifWithComment.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) <caret>{
diff --git a/idea/testData/intentions/removeBraces/ifWithComment.kt.after b/idea/testData/intentions/removeBraces/ifWithComment.kt.after
index 538aae35e4f..0a243781a1c 100644
--- a/idea/testData/intentions/removeBraces/ifWithComment.kt.after
+++ b/idea/testData/intentions/removeBraces/ifWithComment.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     //comment
diff --git a/idea/testData/intentions/removeBraces/ifWithSemicolon.kt b/idea/testData/intentions/removeBraces/ifWithSemicolon.kt
index b292cdda027..2922884339b 100644
--- a/idea/testData/intentions/removeBraces/ifWithSemicolon.kt
+++ b/idea/testData/intentions/removeBraces/ifWithSemicolon.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) {
diff --git a/idea/testData/intentions/removeBraces/ifWithSemicolon.kt.after b/idea/testData/intentions/removeBraces/ifWithSemicolon.kt.after
index e1dd424c946..b68f4dd50e6 100644
--- a/idea/testData/intentions/removeBraces/ifWithSemicolon.kt.after
+++ b/idea/testData/intentions/removeBraces/ifWithSemicolon.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) doSomething("test")
diff --git a/idea/testData/intentions/removeBraces/ifWithTwoStatements.kt b/idea/testData/intentions/removeBraces/ifWithTwoStatements.kt
index a7f1bb1a9fa..717c824e0de 100644
--- a/idea/testData/intentions/removeBraces/ifWithTwoStatements.kt
+++ b/idea/testData/intentions/removeBraces/ifWithTwoStatements.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) {
diff --git a/idea/testData/intentions/removeBraces/while.kt b/idea/testData/intentions/removeBraces/while.kt
index bfefbdeaca8..cca07cfc9b5 100644
--- a/idea/testData/intentions/removeBraces/while.kt
+++ b/idea/testData/intentions/removeBraces/while.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     while (true) {
diff --git a/idea/testData/intentions/removeBraces/while.kt.after b/idea/testData/intentions/removeBraces/while.kt.after
index 607d50e6007..77e6064ba7e 100644
--- a/idea/testData/intentions/removeBraces/while.kt.after
+++ b/idea/testData/intentions/removeBraces/while.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     while (true) doSomething("test")
diff --git a/idea/testData/intentions/removeBraces/whileWithTwoStatements.kt b/idea/testData/intentions/removeBraces/whileWithTwoStatements.kt
index 8a9aeb861b2..8829f2ed678 100644
--- a/idea/testData/intentions/removeBraces/whileWithTwoStatements.kt
+++ b/idea/testData/intentions/removeBraces/whileWithTwoStatements.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     while (true) {
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt b/idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt
index 1d209446456..bfb0b48bcfd 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt
+++ b/idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt
@@ -3,4 +3,4 @@ fun foo() {
     val z = bar<caret><String, Int, Int, String>("1", 1, 2, "x")
 }
 
-fun bar<T, V, R, K>(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
+fun <T, V, R, K> bar(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt.after b/idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt.after
index 16df8e6bf22..a68c40507b6 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt.after
+++ b/idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt.after
@@ -3,4 +3,4 @@ fun foo() {
     val z = bar("1", 1, 2, "x")
 }
 
-fun bar<T, V, R, K>(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
+fun <T, V, R, K> bar(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt b/idea/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt
index 0c358729509..8f0a1f4ffb9 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt
+++ b/idea/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt
@@ -5,4 +5,4 @@ fun foo() {
 
 fun baz(x: Int): Int = x
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt b/idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt
index f0668c8ac98..584bd1bd569 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt
+++ b/idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt
@@ -3,4 +3,4 @@ fun foo() {
     bar<caret><(Int) -> Int> { it: Int -> it }
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt.after b/idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt.after
index ab92606d5c7..9f4e9451662 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt.after
+++ b/idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt.after
@@ -3,4 +3,4 @@ fun foo() {
     bar { it: Int -> it }
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/literalString.kt b/idea/testData/intentions/removeExplicitTypeArguments/literalString.kt
index e457ba564bb..c3367a42710 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/literalString.kt
+++ b/idea/testData/intentions/removeExplicitTypeArguments/literalString.kt
@@ -3,4 +3,4 @@ fun foo() {
     bar<caret><String>("x")
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/literalString.kt.after b/idea/testData/intentions/removeExplicitTypeArguments/literalString.kt.after
index ee0866d36e4..725c4134602 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/literalString.kt.after
+++ b/idea/testData/intentions/removeExplicitTypeArguments/literalString.kt.after
@@ -3,4 +3,4 @@ fun foo() {
     bar("x")
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferred.kt b/idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferred.kt
index 870090562b7..9604bab7f20 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferred.kt
+++ b/idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferred.kt
@@ -3,4 +3,4 @@ fun foo() {
     val x = bar<caret><Any>("x")
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt b/idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt
index 6f073a228c3..8fc38d2826a 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt
+++ b/idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt
@@ -3,4 +3,4 @@ fun foo() {
     val x = bar<caret><String, Int>("x", 0)
 }
 
-fun bar<T, V>(t: T, v: V): Int = 1
\ No newline at end of file
+fun <T, V> bar(t: T, v: V): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt.after b/idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt.after
index f81cbd23dc1..7fa9beaa300 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt.after
+++ b/idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt.after
@@ -3,4 +3,4 @@ fun foo() {
     val x = bar("x", 0)
 }
 
-fun bar<T, V>(t: T, v: V): Int = 1
\ No newline at end of file
+fun <T, V> bar(t: T, v: V): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/variableString.kt b/idea/testData/intentions/removeExplicitTypeArguments/variableString.kt
index 117371cd4b9..38347aad56a 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/variableString.kt
+++ b/idea/testData/intentions/removeExplicitTypeArguments/variableString.kt
@@ -4,4 +4,4 @@ fun foo() {
     bar<caret><String>(x)
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/variableString.kt.after b/idea/testData/intentions/removeExplicitTypeArguments/variableString.kt.after
index d00a006e5c0..bba4e54dc62 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/variableString.kt.after
+++ b/idea/testData/intentions/removeExplicitTypeArguments/variableString.kt.after
@@ -4,4 +4,4 @@ fun foo() {
     bar(x)
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt b/idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt
index d8aaba0eab6..c9010fb775a 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt
+++ b/idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt
@@ -3,4 +3,4 @@ fun foo(x: String) {
     bar<caret><String>(x)
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt.after b/idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt.after
index 52f8dcca266..bae78b07507 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt.after
+++ b/idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt.after
@@ -3,4 +3,4 @@ fun foo(x: String) {
     bar(x)
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt b/idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt
index f6f85d02be8..f68f85c73bc 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt
+++ b/idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt
@@ -5,4 +5,4 @@ fun foo() {
     bar<caret><String>(x)
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt.after b/idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt.after
index bcb961e4827..ed272cf2ab4 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt.after
+++ b/idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt.after
@@ -5,4 +5,4 @@ fun foo() {
     bar(x)
 }
 
-fun bar<T>(t: T): Int = 1
\ No newline at end of file
+fun <T> bar(t: T): Int = 1
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt b/idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt
index 411eb4909b8..7d4b9c26fc1 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt
+++ b/idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt
@@ -5,4 +5,4 @@ fun foo() {
     val z = bar<caret><String, Int, Int, String>(x, 1, y, "x")
 }
 
-fun bar<T, V, R, K>(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
+fun <T, V, R, K> bar(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt.after b/idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt.after
index 0e4e97d6a64..18d584d1e5b 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt.after
+++ b/idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt.after
@@ -5,4 +5,4 @@ fun foo() {
     val z = bar(x, 1, y, "x")
 }
 
-fun bar<T, V, R, K>(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
+fun <T, V, R, K> bar(t: T, v: V, r: R, k: K): Int = 2
\ No newline at end of file
diff --git a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt
index d0d3a7c2ff0..e56814e1f43 100644
--- a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt
+++ b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt
@@ -1,2 +1,2 @@
-fun applyTwice<A>(f: (A) -> A, x: A) = f(f(x))
+fun <A> applyTwice(f: (A) -> A, x: A) = f(f(x))
 val x = applyTwice({ <caret>x -> 1 + x }, 40)
diff --git a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt.after b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt.after
index f976c977dc9..bf37b3e51bc 100644
--- a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt.after
+++ b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt.after
@@ -1,2 +1,2 @@
-fun applyTwice<A>(f: (A) -> A, x: A) = f(f(x))
+fun <A> applyTwice(f: (A) -> A, x: A) = f(f(x))
 val x = applyTwice({ <caret>1 + it }, 40)
diff --git a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt
index ee7a7faceba..0c013532de7 100644
--- a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt
+++ b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt
@@ -1,2 +1,2 @@
-fun applyTwice<A>(f: (A) -> A, x: A) = f(f(x))
+fun <A> applyTwice(f: (A) -> A, x: A) = f(f(x))
 val x = applyTwice({ x -> <caret>x + 1 }, 40)
diff --git a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt.after b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt.after
index 30e6e65a715..49cc0247a02 100644
--- a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt.after
+++ b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt.after
@@ -1,2 +1,2 @@
-fun applyTwice<A>(f: (A) -> A, x: A) = f(f(x))
+fun <A> applyTwice(f: (A) -> A, x: A) = f(f(x))
 val x = applyTwice({ <caret>it + 1 }, 40)
diff --git a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_alreadyUsesImplicitIt.kt b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_alreadyUsesImplicitIt.kt
index c85d05dccd7..04bac500530 100644
--- a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_alreadyUsesImplicitIt.kt
+++ b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_alreadyUsesImplicitIt.kt
@@ -1,4 +1,4 @@
 // IS_APPLICABLE: false
 
-fun applyTwice<A>(f: (A) -> A, x: A) = f(f(x))
+fun <A> applyTwice(f: (A) -> A, x: A) = f(f(x))
 val x = applyTwice({ i<caret>t + 1 }, 40)
diff --git a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_wrongPosition.kt b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_wrongPosition.kt
index ca84c760356..8ceca36868b 100644
--- a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_wrongPosition.kt
+++ b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_wrongPosition.kt
@@ -1,4 +1,4 @@
 // IS_APPLICABLE: false
 
-fun applyTwice<A>(f: (A) -> A, x: A) = f(f(x))
+fun <A> applyTwice(f: (A) -> A, x: A) = f(f(x))
 val x = applyTwice({ p -> p + <caret>1 }, 40)
diff --git a/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt b/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt
index e0e27a8cf1b..5f5170cab3c 100644
--- a/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt
+++ b/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt
@@ -1,2 +1,2 @@
-fun applyTwice<A>(f: (A) -> A, x: A) = f(f(x))
+fun <A> applyTwice(f: (A) -> A, x: A) = f(f(x))
 val x = applyTwice({ i<caret>t + 1 }, 40)
diff --git a/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt.after b/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt.after
index 502116cd9df..ea9289e81e6 100644
--- a/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt.after
+++ b/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt.after
@@ -1,2 +1,2 @@
-fun applyTwice<A>(f: (A) -> A, x: A) = f(f(x))
+fun <A> applyTwice(f: (A) -> A, x: A) = f(f(x))
 val x = applyTwice({ it -> <caret>it + 1 }, 40)
diff --git a/idea/testData/intentions/splitIf/and.kt b/idea/testData/intentions/splitIf/and.kt
index dab4ce249c9..f718d9b7854 100644
--- a/idea/testData/intentions/splitIf/and.kt
+++ b/idea/testData/intentions/splitIf/and.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/and.kt.after b/idea/testData/intentions/splitIf/and.kt.after
index 45131d41cf6..26551f72bdf 100644
--- a/idea/testData/intentions/splitIf/and.kt.after
+++ b/idea/testData/intentions/splitIf/and.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/caretOnIf.kt b/idea/testData/intentions/splitIf/caretOnIf.kt
index 0a65d3bf7d7..52393f9b67b 100644
--- a/idea/testData/intentions/splitIf/caretOnIf.kt
+++ b/idea/testData/intentions/splitIf/caretOnIf.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/caretOnIf.kt.after b/idea/testData/intentions/splitIf/caretOnIf.kt.after
index fd252316578..a3c074b080d 100644
--- a/idea/testData/intentions/splitIf/caretOnIf.kt.after
+++ b/idea/testData/intentions/splitIf/caretOnIf.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/ifAndOr.kt b/idea/testData/intentions/splitIf/ifAndOr.kt
index acdcc69e467..af83273704b 100644
--- a/idea/testData/intentions/splitIf/ifAndOr.kt
+++ b/idea/testData/intentions/splitIf/ifAndOr.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/ifAndOrWithBraces.kt b/idea/testData/intentions/splitIf/ifAndOrWithBraces.kt
index 44c1b6e93f5..83d747548d4 100644
--- a/idea/testData/intentions/splitIf/ifAndOrWithBraces.kt
+++ b/idea/testData/intentions/splitIf/ifAndOrWithBraces.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/ifAndOrWithBraces.kt.after b/idea/testData/intentions/splitIf/ifAndOrWithBraces.kt.after
index df9fd318d5d..4cfcac95abb 100644
--- a/idea/testData/intentions/splitIf/ifAndOrWithBraces.kt.after
+++ b/idea/testData/intentions/splitIf/ifAndOrWithBraces.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/ifAndWithBraces.kt b/idea/testData/intentions/splitIf/ifAndWithBraces.kt
index 97c2d46967e..8db0f85170b 100644
--- a/idea/testData/intentions/splitIf/ifAndWithBraces.kt
+++ b/idea/testData/intentions/splitIf/ifAndWithBraces.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/ifAndWithBraces.kt.after b/idea/testData/intentions/splitIf/ifAndWithBraces.kt.after
index 85257391c65..6c1bb9033c1 100644
--- a/idea/testData/intentions/splitIf/ifAndWithBraces.kt.after
+++ b/idea/testData/intentions/splitIf/ifAndWithBraces.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/ifWithElse.kt b/idea/testData/intentions/splitIf/ifWithElse.kt
index 0e47c4c0180..b378b4359ea 100644
--- a/idea/testData/intentions/splitIf/ifWithElse.kt
+++ b/idea/testData/intentions/splitIf/ifWithElse.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/ifWithElse.kt.after b/idea/testData/intentions/splitIf/ifWithElse.kt.after
index 77d455c651f..1d4ea68cafd 100644
--- a/idea/testData/intentions/splitIf/ifWithElse.kt.after
+++ b/idea/testData/intentions/splitIf/ifWithElse.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/keepComments/twoOperators.kt b/idea/testData/intentions/splitIf/keepComments/twoOperators.kt
index 1aea329656c..7a521458ef4 100644
--- a/idea/testData/intentions/splitIf/keepComments/twoOperators.kt
+++ b/idea/testData/intentions/splitIf/keepComments/twoOperators.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/keepComments/twoOperators.kt.after b/idea/testData/intentions/splitIf/keepComments/twoOperators.kt.after
index 64a9dfdd54d..e5cd57f4852 100644
--- a/idea/testData/intentions/splitIf/keepComments/twoOperators.kt.after
+++ b/idea/testData/intentions/splitIf/keepComments/twoOperators.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/keepComments/withAnd.kt b/idea/testData/intentions/splitIf/keepComments/withAnd.kt
index 79db15473db..dab603833d1 100644
--- a/idea/testData/intentions/splitIf/keepComments/withAnd.kt
+++ b/idea/testData/intentions/splitIf/keepComments/withAnd.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo(p: Int) {
     <caret>if (0 < p /* > 0 */ && p < 100 /* not too much */) {
diff --git a/idea/testData/intentions/splitIf/keepComments/withAnd.kt.after b/idea/testData/intentions/splitIf/keepComments/withAnd.kt.after
index a1b166a8dfd..3b37fa12610 100644
--- a/idea/testData/intentions/splitIf/keepComments/withAnd.kt.after
+++ b/idea/testData/intentions/splitIf/keepComments/withAnd.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo(p: Int) {
     <caret>if (0 < p /* > 0 */) {
diff --git a/idea/testData/intentions/splitIf/keepComments/withOR.kt b/idea/testData/intentions/splitIf/keepComments/withOR.kt
index 94e3ef22f0e..bb1b3b75b4f 100644
--- a/idea/testData/intentions/splitIf/keepComments/withOR.kt
+++ b/idea/testData/intentions/splitIf/keepComments/withOR.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo(p: Int) {
     <caret>if (p < 0 /* p < 0 */ || p > 100 /* too much */) {
diff --git a/idea/testData/intentions/splitIf/keepComments/withOR.kt.after b/idea/testData/intentions/splitIf/keepComments/withOR.kt.after
index 6655bfe7554..209733af111 100644
--- a/idea/testData/intentions/splitIf/keepComments/withOR.kt.after
+++ b/idea/testData/intentions/splitIf/keepComments/withOR.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo(p: Int) {
     <caret>if (p < 0 /* p < 0 */) {
diff --git a/idea/testData/intentions/splitIf/localFunction.kt b/idea/testData/intentions/splitIf/localFunction.kt
index dde44982d65..00937d48f65 100644
--- a/idea/testData/intentions/splitIf/localFunction.kt
+++ b/idea/testData/intentions/splitIf/localFunction.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     fun test(): Boolean { return false }
diff --git a/idea/testData/intentions/splitIf/localFunction.kt.after b/idea/testData/intentions/splitIf/localFunction.kt.after
index 8c178396aea..5632358b518 100644
--- a/idea/testData/intentions/splitIf/localFunction.kt.after
+++ b/idea/testData/intentions/splitIf/localFunction.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     fun test(): Boolean { return false }
diff --git a/idea/testData/intentions/splitIf/nestedIf.kt b/idea/testData/intentions/splitIf/nestedIf.kt
index c2d296ea0d8..23177c697c7 100644
--- a/idea/testData/intentions/splitIf/nestedIf.kt
+++ b/idea/testData/intentions/splitIf/nestedIf.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/nestedIf.kt.after b/idea/testData/intentions/splitIf/nestedIf.kt.after
index ef1618e5874..0ced6156313 100644
--- a/idea/testData/intentions/splitIf/nestedIf.kt.after
+++ b/idea/testData/intentions/splitIf/nestedIf.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/nestedIfNotApplicable.kt b/idea/testData/intentions/splitIf/nestedIfNotApplicable.kt
index ba68cd50cf5..8df379e1f98 100644
--- a/idea/testData/intentions/splitIf/nestedIfNotApplicable.kt
+++ b/idea/testData/intentions/splitIf/nestedIfNotApplicable.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/nestedIfOutside.kt b/idea/testData/intentions/splitIf/nestedIfOutside.kt
index 487857e33da..d52f797de7b 100644
--- a/idea/testData/intentions/splitIf/nestedIfOutside.kt
+++ b/idea/testData/intentions/splitIf/nestedIfOutside.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/nestedIfOutside.kt.after b/idea/testData/intentions/splitIf/nestedIfOutside.kt.after
index a5301be50ca..69d8deffad5 100644
--- a/idea/testData/intentions/splitIf/nestedIfOutside.kt.after
+++ b/idea/testData/intentions/splitIf/nestedIfOutside.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/nestedInside.kt b/idea/testData/intentions/splitIf/nestedInside.kt
index b2bcc2361a8..4baf0adfef9 100644
--- a/idea/testData/intentions/splitIf/nestedInside.kt
+++ b/idea/testData/intentions/splitIf/nestedInside.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/nestedInside.kt.after b/idea/testData/intentions/splitIf/nestedInside.kt.after
index 4d8ee82c746..deb1aa4ff16 100644
--- a/idea/testData/intentions/splitIf/nestedInside.kt.after
+++ b/idea/testData/intentions/splitIf/nestedInside.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/notIf.kt b/idea/testData/intentions/splitIf/notIf.kt
index c8a6aef5954..ba50b58dfc3 100644
--- a/idea/testData/intentions/splitIf/notIf.kt
+++ b/idea/testData/intentions/splitIf/notIf.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/onIfWithOr.kt b/idea/testData/intentions/splitIf/onIfWithOr.kt
index 3c9a241f2a9..262707e1079 100644
--- a/idea/testData/intentions/splitIf/onIfWithOr.kt
+++ b/idea/testData/intentions/splitIf/onIfWithOr.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/onIfWithOr.kt.after b/idea/testData/intentions/splitIf/onIfWithOr.kt.after
index 77bc8da7498..b41f644e616 100644
--- a/idea/testData/intentions/splitIf/onIfWithOr.kt.after
+++ b/idea/testData/intentions/splitIf/onIfWithOr.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/operatorAsFunctionParam.kt b/idea/testData/intentions/splitIf/operatorAsFunctionParam.kt
index 8d56c463f7a..ed6caa6c184 100644
--- a/idea/testData/intentions/splitIf/operatorAsFunctionParam.kt
+++ b/idea/testData/intentions/splitIf/operatorAsFunctionParam.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/orAnd.kt b/idea/testData/intentions/splitIf/orAnd.kt
index 65860b46f9a..4a09638be70 100644
--- a/idea/testData/intentions/splitIf/orAnd.kt
+++ b/idea/testData/intentions/splitIf/orAnd.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/orAnd.kt.after b/idea/testData/intentions/splitIf/orAnd.kt.after
index 1dffa0d23a7..44aa6d03bff 100644
--- a/idea/testData/intentions/splitIf/orAnd.kt.after
+++ b/idea/testData/intentions/splitIf/orAnd.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/orWithBraces.kt b/idea/testData/intentions/splitIf/orWithBraces.kt
index dc7b5168b83..45832de9cba 100644
--- a/idea/testData/intentions/splitIf/orWithBraces.kt
+++ b/idea/testData/intentions/splitIf/orWithBraces.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/orWithBraces.kt.after b/idea/testData/intentions/splitIf/orWithBraces.kt.after
index 6519bba8ef6..3e2731d34d1 100644
--- a/idea/testData/intentions/splitIf/orWithBraces.kt.after
+++ b/idea/testData/intentions/splitIf/orWithBraces.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/twoOperatorsFirst.kt b/idea/testData/intentions/splitIf/twoOperatorsFirst.kt
index 08250fc0f11..aa6028358ca 100644
--- a/idea/testData/intentions/splitIf/twoOperatorsFirst.kt
+++ b/idea/testData/intentions/splitIf/twoOperatorsFirst.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/twoOperatorsFirst.kt.after b/idea/testData/intentions/splitIf/twoOperatorsFirst.kt.after
index 7dd2477a21b..5cdc9051de9 100644
--- a/idea/testData/intentions/splitIf/twoOperatorsFirst.kt.after
+++ b/idea/testData/intentions/splitIf/twoOperatorsFirst.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/twoOperatorsSecond.kt b/idea/testData/intentions/splitIf/twoOperatorsSecond.kt
index 95c87ea75c4..3958b2e86b8 100644
--- a/idea/testData/intentions/splitIf/twoOperatorsSecond.kt
+++ b/idea/testData/intentions/splitIf/twoOperatorsSecond.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/twoOperatorsSecond.kt.after b/idea/testData/intentions/splitIf/twoOperatorsSecond.kt.after
index 89d63a30f0c..ac9c0fb39bf 100644
--- a/idea/testData/intentions/splitIf/twoOperatorsSecond.kt.after
+++ b/idea/testData/intentions/splitIf/twoOperatorsSecond.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/withNotOperator.kt b/idea/testData/intentions/splitIf/withNotOperator.kt
index f0d833be6d9..055f87fa1ba 100644
--- a/idea/testData/intentions/splitIf/withNotOperator.kt
+++ b/idea/testData/intentions/splitIf/withNotOperator.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/withNotOperatorGood.kt b/idea/testData/intentions/splitIf/withNotOperatorGood.kt
index 732f5ed667a..fc18dab10c3 100644
--- a/idea/testData/intentions/splitIf/withNotOperatorGood.kt
+++ b/idea/testData/intentions/splitIf/withNotOperatorGood.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/withNotOperatorGood.kt.after b/idea/testData/intentions/splitIf/withNotOperatorGood.kt.after
index 03b3bd93052..693dad7b99d 100644
--- a/idea/testData/intentions/splitIf/withNotOperatorGood.kt.after
+++ b/idea/testData/intentions/splitIf/withNotOperatorGood.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/withOR.kt b/idea/testData/intentions/splitIf/withOR.kt
index e5254cceebf..20072b6f714 100644
--- a/idea/testData/intentions/splitIf/withOR.kt
+++ b/idea/testData/intentions/splitIf/withOR.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/withOR.kt.after b/idea/testData/intentions/splitIf/withOR.kt.after
index 1714ad7a482..b3e5b3ed1e0 100644
--- a/idea/testData/intentions/splitIf/withOR.kt.after
+++ b/idea/testData/intentions/splitIf/withOR.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/withORElse.kt b/idea/testData/intentions/splitIf/withORElse.kt
index 791f5a1e075..7cc23b79043 100644
--- a/idea/testData/intentions/splitIf/withORElse.kt
+++ b/idea/testData/intentions/splitIf/withORElse.kt
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/withORElse.kt.after b/idea/testData/intentions/splitIf/withORElse.kt.after
index 013622f68a9..324874589a0 100644
--- a/idea/testData/intentions/splitIf/withORElse.kt.after
+++ b/idea/testData/intentions/splitIf/withORElse.kt.after
@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/splitIf/wrongCaretLocation.kt b/idea/testData/intentions/splitIf/wrongCaretLocation.kt
index fa8bda2a447..b97f9284f82 100644
--- a/idea/testData/intentions/splitIf/wrongCaretLocation.kt
+++ b/idea/testData/intentions/splitIf/wrongCaretLocation.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     val a = true
diff --git a/idea/testData/intentions/swapBinaryExpression/in.kt b/idea/testData/intentions/swapBinaryExpression/in.kt
index 9cc11021d8b..43332278f70 100644
--- a/idea/testData/intentions/swapBinaryExpression/in.kt
+++ b/idea/testData/intentions/swapBinaryExpression/in.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main() {
     for (elt<caret> in 0..3) {
diff --git a/idea/testData/intentions/swapBinaryExpression/is.kt b/idea/testData/intentions/swapBinaryExpression/is.kt
index b10f9235e3b..4752f2d22dc 100644
--- a/idea/testData/intentions/swapBinaryExpression/is.kt
+++ b/idea/testData/intentions/swapBinaryExpression/is.kt
@@ -2,7 +2,7 @@
 // ERROR: 'if' must have both main and 'else' branches if used as an expression
 // ERROR: Expression 'if "test" is String' of type 'kotlin.Unit' cannot be invoked as a function. The function invoke() is not found
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main() {
     if <caret>"test" is String {
diff --git a/idea/testData/intentions/swapBinaryExpression/nonBinaryExpr.kt b/idea/testData/intentions/swapBinaryExpression/nonBinaryExpr.kt
index 55a8f7e86d5..9c7f0942f32 100644
--- a/idea/testData/intentions/swapBinaryExpression/nonBinaryExpr.kt
+++ b/idea/testData/intentions/swapBinaryExpression/nonBinaryExpr.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main() {
     val c = 500
diff --git a/idea/testData/intentions/swapBinaryExpression/notIn.kt b/idea/testData/intentions/swapBinaryExpression/notIn.kt
index c151152da0c..907b3898e71 100644
--- a/idea/testData/intentions/swapBinaryExpression/notIn.kt
+++ b/idea/testData/intentions/swapBinaryExpression/notIn.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(x: Int) {
     if (x !in 5..6) {
diff --git a/idea/testData/intentions/swapBinaryExpression/notIs.kt b/idea/testData/intentions/swapBinaryExpression/notIs.kt
index a90e09efb92..f0009995018 100644
--- a/idea/testData/intentions/swapBinaryExpression/notIs.kt
+++ b/idea/testData/intentions/swapBinaryExpression/notIs.kt
@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(x: Int) {
     if (x !is Int) {
diff --git a/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt
index 9f58562a0bf..aa8fd172275 100644
--- a/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt
+++ b/idea/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt
@@ -3,7 +3,7 @@ package test.kotlin
 interface A
 
 @kotlin.jvm.JvmOverloads
-public fun foo<T : A>(k: Class<T>, a: A, b: Boolean = false, s: String="hello"): List<T> {
+public fun <T : A> foo(k: Class<T>, a: A, b: Boolean = false, s: String="hello"): List<T> {
     println("$b $s")
     return listOf()
 }
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt b/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt
index ae6baeccdf9..3dc1b27934d 100644
--- a/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt
+++ b/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt
@@ -2,7 +2,7 @@
 // ERROR: Type argument expected
 class C2<T>
 
-fun foo<T>() {}
+fun <T> foo() {}
 
 fun test() {
     foo<C2<caret>>()
diff --git a/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after b/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after
index ae6baeccdf9..3dc1b27934d 100644
--- a/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after
+++ b/idea/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after
@@ -2,7 +2,7 @@
 // ERROR: Type argument expected
 class C2<T>
 
-fun foo<T>() {}
+fun <T> foo() {}
 
 fun test() {
     foo<C2<caret>>()
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt
index accd066cf1f..389b38ee0b9 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 
-fun run<T>(f: () -> T) = f()
+fun <T> run(f: () -> T) = f()
 
 fun test() {
     run { <caret>Foo() }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt.after b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt.after
index 2e85934058b..29a5a20b043 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt.after
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 
-fun run<T>(f: () -> T) = f()
+fun <T> run(f: () -> T) = f()
 
 fun test() {
     run { Foo() }
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.after.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.after.kt
index 78a9c9da881..664f751c922 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.after.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.after.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a = J(u).Foo(u)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.Main.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.Main.kt
index a42b7852208..f3693e904d2 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.Main.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.Main.kt
@@ -1,6 +1,6 @@
 // "Create class 'Foo'" "true"
 // ERROR: Unresolved reference: Foo
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a = J(u).<caret>Foo(u)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt
index 097d588c95a..d57cb661026 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt
@@ -4,6 +4,6 @@ class A<T>(val n: T) {
 
 }
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a = A(u).<caret>Foo(u)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt.after b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt.after
index af2d70f686a..8f08d4a0957 100644
--- a/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt.after
@@ -7,6 +7,6 @@ class A<T>(val n: T) {
 
 }
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a = A(u).Foo(u)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt
index c497191d6ad..38c0565681b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt
@@ -2,6 +2,6 @@
 
 class A<T>(val n: T)
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a: A<U> = A(u) <caret>+ 2
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
index df90572e063..e70ecc18b13 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
@@ -6,6 +6,6 @@ class A<T>(val n: T) {
     }
 }
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a: A<U> = A(u) + 2
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt
index 3f6de74e7b3..2cc630cc998 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt
@@ -2,6 +2,6 @@
 
 class A<T>(val n: T)
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a: A<U> = A(u).<caret>foo(u)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
index baf44dc4a2c..a377ae1309c 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
@@ -6,6 +6,6 @@ class A<T>(val n: T) {
     }
 }
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a: A<U> = A(u).foo(u)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt
index aaafee40bfd..adb2b0f1251 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt
@@ -1,6 +1,6 @@
 // "Create function 'foo'" "true"
 
-fun run<T>(f: () -> T) = f()
+fun <T> run(f: () -> T) = f()
 
 fun test() {
     run { <caret>foo() }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
index 866cf2a002e..885f9043da0 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
@@ -1,6 +1,6 @@
 // "Create function 'foo'" "true"
 
-fun run<T>(f: () -> T) = f()
+fun <T> run(f: () -> T) = f()
 
 fun test() {
     run { foo() }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt
index 41f2668ea8f..2a0f05f9f19 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt
@@ -3,6 +3,6 @@
 class A<T>(val n: T)
 class B<T>(val m: T)
 
-fun test<U, V>(u: U): B<V> {
+fun <U, V> test(u: U): B<V> {
     return A(u)<caret>(u, "u")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
index c8cc9441f92..fc56c710115 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
@@ -8,6 +8,6 @@ class A<T>(val n: T) {
 
 class B<T>(val m: T)
 
-fun test<U, V>(u: U): B<V> {
+fun <U, V> test(u: U): B<V> {
     return A(u)(u, "u")
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt
index fec12102f47..433ff038cd8 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt
@@ -2,6 +2,6 @@
 
 class A<T>(val n: T)
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a: A<U> = <caret>-A(u)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
index 1c737b4a635..33ececf9fc5 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
@@ -6,6 +6,6 @@ class A<T>(val n: T) {
     }
 }
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a: A<U> = -A(u)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt
index 53739f72809..01f4e70144c 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt
@@ -1,7 +1,7 @@
 // "Create parameter 'foo'" "true"
 
 class A {
-    fun test<T>(n: Int) {
+    fun <T> test(n: Int) {
         val t: T = <caret>foo
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt.after
index a42704bc485..3fac93bee98 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt.after
@@ -1,7 +1,7 @@
 // "Create parameter 'foo'" "true"
 
 class A {
-    fun test<T>(n: Int, foo: T) {
+    fun <T> test(n: Int, foo: T) {
         val t: T = foo
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt
index bf1af0d4754..9c43c4d8a41 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt
@@ -1,7 +1,7 @@
 // "Create parameter 'foo'" "true"
 
 class A<T> {
-    fun test<T>(n: Int) {
+    fun <T> test(n: Int) {
         val t: T = <caret>foo
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt.after
index 3c6b6e394f6..3253b9858b6 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt.after
@@ -1,7 +1,7 @@
 // "Create parameter 'foo'" "true"
 
 class A<T> {
-    fun test<T>(n: Int, foo: T) {
+    fun <T> test(n: Int, foo: T) {
         val t: T = foo
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt
index f7f29f66db0..63dfb149e73 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt
@@ -3,6 +3,6 @@
 
 class A<T>(val n: T)
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a: A<U> = A(u).<caret>foo
 }
diff --git a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after
index c20284cf6e8..e47fab7d249 100644
--- a/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after
+++ b/idea/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after
@@ -5,6 +5,6 @@ class A<T>(val n: T) {
     val foo: A<T>
 }
 
-fun test<U>(u: U) {
+fun <U> test(u: U) {
     val a: A<U> = A(u).foo
 }
diff --git a/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt b/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
index 55b12a520be..65a9f06d3c8 100644
--- a/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
+++ b/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
@@ -1,6 +1,6 @@
 // "Specify type explicitly" "true"
 package a
 
-public fun emptyList<T>(): List<T> = null!!
+public fun <T> emptyList(): List<T> = null!!
 
 public val <caret>l = emptyList<Int>()
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after b/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
index 9c7196dc386..0c3c9b5a2bc 100644
--- a/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
+++ b/idea/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
@@ -1,6 +1,6 @@
 // "Specify type explicitly" "true"
 package a
 
-public fun emptyList<T>(): List<T> = null!!
+public fun <T> emptyList(): List<T> = null!!
 
 public val l: List<Int><caret> = emptyList<Int>()
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt b/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
index cd4342cced8..014434ffcc7 100644
--- a/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
+++ b/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
@@ -1,6 +1,6 @@
 // "Specify type explicitly" "true"
 package a
 
-public fun emptyList<T>(): List<T> = null!!
+public fun <T> emptyList(): List<T> = null!!
 
 <caret>public val l = emptyList<Int>()
diff --git a/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after b/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
index 32333dbbcd4..477b804e795 100644
--- a/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
+++ b/idea/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
@@ -1,6 +1,6 @@
 // "Specify type explicitly" "true"
 package a
 
-public fun emptyList<T>(): List<T> = null!!
+public fun <T> emptyList(): List<T> = null!!
 
 public val l: List<Int><caret> = emptyList<Int>()
diff --git a/idea/testData/quickfix/typeImports/hasThisImport.kt b/idea/testData/quickfix/typeImports/hasThisImport.kt
index 891f584aa1f..ae6ca45d928 100644
--- a/idea/testData/quickfix/typeImports/hasThisImport.kt
+++ b/idea/testData/quickfix/typeImports/hasThisImport.kt
@@ -1,7 +1,7 @@
 // "Remove initializer from property" "true"
 package a
 
-public fun emptyList<T>(): List<T> = null!!
+public fun <T> emptyList(): List<T> = null!!
 
 class M {
     interface A {
diff --git a/idea/testData/quickfix/typeImports/hasThisImport.kt.after b/idea/testData/quickfix/typeImports/hasThisImport.kt.after
index 86f8eec7051..2aca92b0d68 100644
--- a/idea/testData/quickfix/typeImports/hasThisImport.kt.after
+++ b/idea/testData/quickfix/typeImports/hasThisImport.kt.after
@@ -1,7 +1,7 @@
 // "Remove initializer from property" "true"
 package a
 
-public fun emptyList<T>(): List<T> = null!!
+public fun <T> emptyList(): List<T> = null!!
 
 class M {
     interface A {
diff --git a/idea/testData/quickfix/typeImports/toImport1.kt b/idea/testData/quickfix/typeImports/toImport1.kt
index 64a4fb36ba3..19b9725c688 100644
--- a/idea/testData/quickfix/typeImports/toImport1.kt
+++ b/idea/testData/quickfix/typeImports/toImport1.kt
@@ -1,7 +1,7 @@
 // "Remove initializer from property" "true"
 package a
 
-public fun emptyList<T>(): List<T> = null!!
+public fun <T> emptyList(): List<T> = null!!
 
 class M {
     interface A {
diff --git a/idea/testData/quickfix/typeImports/toImport1.kt.after b/idea/testData/quickfix/typeImports/toImport1.kt.after
index b51ac42f817..639423f5d09 100644
--- a/idea/testData/quickfix/typeImports/toImport1.kt.after
+++ b/idea/testData/quickfix/typeImports/toImport1.kt.after
@@ -1,7 +1,7 @@
 // "Remove initializer from property" "true"
 package a
 
-public fun emptyList<T>(): List<T> = null!!
+public fun <T> emptyList(): List<T> = null!!
 
 class M {
     interface A {
diff --git a/idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt b/idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt
index 7d13d0a2558..4b9345cafbd 100644
--- a/idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt
+++ b/idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt
@@ -1,5 +1,5 @@
 // "Change parameter 'n' type of function 'foo' to 'T'" "true"
-fun bar<T>(t: T) {
+fun <T> bar(t: T) {
     fun foo(n: Int) {
 
     }
diff --git a/idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt.after b/idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt.after
index 6a133cbca8b..dd6fdccb1e5 100644
--- a/idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt.after
+++ b/idea/testData/quickfix/typeMismatch/resolvableTypeParams.kt.after
@@ -1,5 +1,5 @@
 // "Change parameter 'n' type of function 'foo' to 'T'" "true"
-fun bar<T>(t: T) {
+fun <T> bar(t: T) {
     fun foo(n: T) {
 
     }
diff --git a/idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt b/idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt
index 228a661c210..c324ccac8cc 100644
--- a/idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt
+++ b/idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt
@@ -3,6 +3,6 @@ fun foo(n: Int) {
 
 }
 
-fun bar<T>(t: T) {
+fun <T> bar(t: T) {
     foo(<caret>t)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt.after b/idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt.after
index dd6e8a72fce..d96fbb7e64e 100644
--- a/idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt.after
+++ b/idea/testData/quickfix/typeMismatch/unresolvableTypeParams.kt.after
@@ -3,6 +3,6 @@ fun foo(n: Any?) {
 
 }
 
-fun bar<T>(t: T) {
+fun <T> bar(t: T) {
     foo(t)
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt b/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt
index 8f45686d3d8..f1ab8642a72 100644
--- a/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt
+++ b/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt
@@ -1,5 +1,5 @@
 // "Remove 'out' modifier" "true"
-fun foo<T>(x : T) {}
+fun <T> foo(x : T) {}
 
 fun bar() {
     foo<<caret>out Int>(44)
diff --git a/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after b/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after
index 9c334dfde6d..c040ad6d78c 100644
--- a/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after
+++ b/idea/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after
@@ -1,5 +1,5 @@
 // "Remove 'out' modifier" "true"
-fun foo<T>(x : T) {}
+fun <T> foo(x : T) {}
 
 fun bar() {
     foo<Int>(44)
diff --git a/idea/testData/quickfix/typeProjection/removeVariance.kt b/idea/testData/quickfix/typeProjection/removeVariance.kt
index fde203cebcf..4e83c7e04d3 100644
--- a/idea/testData/quickfix/typeProjection/removeVariance.kt
+++ b/idea/testData/quickfix/typeProjection/removeVariance.kt
@@ -1,2 +1,2 @@
 // "Remove 'out' modifier" "true"
-fun foo<out<caret> String>() { }
\ No newline at end of file
+fun <out<caret> String> foo() { }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeProjection/removeVariance.kt.after b/idea/testData/quickfix/typeProjection/removeVariance.kt.after
index f78228ccd66..2bf512c5f5d 100644
--- a/idea/testData/quickfix/typeProjection/removeVariance.kt.after
+++ b/idea/testData/quickfix/typeProjection/removeVariance.kt.after
@@ -1,2 +1,2 @@
 // "Remove 'out' modifier" "true"
-fun foo<String>() { }
\ No newline at end of file
+fun <String> foo() { }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/GenericFunctionsAfter.kt b/idea/testData/refactoring/changeSignature/GenericFunctionsAfter.kt
index 2e4f7d2f2a0..6aa03f0fab4 100644
--- a/idea/testData/refactoring/changeSignature/GenericFunctionsAfter.kt
+++ b/idea/testData/refactoring/changeSignature/GenericFunctionsAfter.kt
@@ -1,4 +1,4 @@
-fun foo<T: Any>(<caret>_x1: T? = null, _x2: Double?, _x3: ((T) -> T)?) {
+fun <T: Any> foo(<caret>_x1: T? = null, _x2: Double?, _x3: ((T) -> T)?) {
     foo(2, 3.5, null);
     val y1 = _x1;
     val y2 = _x2;
diff --git a/idea/testData/refactoring/changeSignature/GenericFunctionsBefore.kt b/idea/testData/refactoring/changeSignature/GenericFunctionsBefore.kt
index a537b2620e3..c2dda3fbbf5 100644
--- a/idea/testData/refactoring/changeSignature/GenericFunctionsBefore.kt
+++ b/idea/testData/refactoring/changeSignature/GenericFunctionsBefore.kt
@@ -1,4 +1,4 @@
-fun foo<T: Any>(<caret>x1: T? = null, x2: Double, x3: ((T) -> T)?) {
+fun <T: Any> foo(<caret>x1: T? = null, x2: Double, x3: ((T) -> T)?) {
     foo(2, 3.5, null);
     val y1 = x1;
     val y2 = x2;
diff --git a/idea/testData/refactoring/changeSignature/GenericsWithOverridesAfter.kt b/idea/testData/refactoring/changeSignature/GenericsWithOverridesAfter.kt
index fb3fb80ac38..ab96ec19cf1 100644
--- a/idea/testData/refactoring/changeSignature/GenericsWithOverridesAfter.kt
+++ b/idea/testData/refactoring/changeSignature/GenericsWithOverridesAfter.kt
@@ -1,7 +1,7 @@
 class U<A>
 
 interface T<A, B> {
-    fun foofoofoo<C>(a: List<C>, b: A?, c: U<B>): U<C>?
+    fun <C> foofoofoo(a: List<C>, b: A?, c: U<B>): U<C>?
 }
 
 abstract class T1<X, Y> : T<U<X>, U<Y>> {
@@ -17,7 +17,7 @@ abstract class T2<X> : T1<X, String>() {
 }
 
 class T3 : T2<Any>() {
-    override fun foofoofoo<D>(a: List<D>, b: U<Any>?, c: U<U<String>>): U<D>? {
+    override fun <D> foofoofoo(a: List<D>, b: U<Any>?, c: U<U<String>>): U<D>? {
         throw UnsupportedOperationException()
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/GenericsWithOverridesBefore.kt b/idea/testData/refactoring/changeSignature/GenericsWithOverridesBefore.kt
index a6adba21e93..91bcc3994d4 100644
--- a/idea/testData/refactoring/changeSignature/GenericsWithOverridesBefore.kt
+++ b/idea/testData/refactoring/changeSignature/GenericsWithOverridesBefore.kt
@@ -1,7 +1,7 @@
 class U<A>
 
 interface T<A, B> {
-    fun <caret>foofoofoo<C>(a: A, b: B, c: C): Int
+    fun <C> <caret>foofoofoo(a: A, b: B, c: C): Int
 }
 
 abstract class T1<X, Y> : T<U<X>, U<Y>> {
@@ -17,7 +17,7 @@ abstract class T2<X> : T1<X, String>() {
 }
 
 class T3 : T2<Any>() {
-    override fun foofoofoo<D>(a: U<Any>, b: U<String>, c: D): Int {
+    override fun <D> foofoofoo(a: U<Any>, b: U<String>, c: D): Int {
         throw UnsupportedOperationException()
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersAfter.kt b/idea/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersAfter.kt
index 21e5850452a..15994bf27c4 100644
--- a/idea/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersAfter.kt
+++ b/idea/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersAfter.kt
@@ -4,7 +4,7 @@ interface A<D> {
     public fun <caret>bar(receiverTypes: Collection<X>): Collection<D>
 }
 
-fun foo<D>(): A<D> {
+fun <D> foo(): A<D> {
     return object: A<D> {
         override fun bar(receiverTypes: Collection<X>): Collection<D> {
             throw UnsupportedOperationException()
diff --git a/idea/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersBefore.kt b/idea/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersBefore.kt
index f7708096a74..224c4c0a2c3 100644
--- a/idea/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersBefore.kt
+++ b/idea/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersBefore.kt
@@ -4,7 +4,7 @@ interface A<D> {
     public fun <caret>foo(receiverTypes: Collection<X>): Collection<D>
 }
 
-fun foo<D>(): A<D> {
+fun <D> foo(): A<D> {
     return object: A<D> {
         override fun foo(receiverTypes: Collection<X>): Collection<D> {
             throw UnsupportedOperationException()
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt
index 72a80993350..b5cd0559e41 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt
@@ -6,7 +6,7 @@
 // PARAM_DESCRIPTOR: value-parameter val b: B defined in foo
 // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
 // SIBLING:
-fun foo<A: Any, B: A>(b: B): Int {
+fun <A: Any, B: A> foo(b: B): Int {
     var a: A? = null
     var c: Int = 1
 
diff --git a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after
index 668f719a5d7..78711621b2c 100644
--- a/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after
+++ b/idea/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after
@@ -6,7 +6,7 @@
 // PARAM_DESCRIPTOR: value-parameter val b: B defined in foo
 // PARAM_DESCRIPTOR: var c: kotlin.Int defined in foo
 // SIBLING:
-fun foo<A: Any, B: A>(b: B): Int {
+fun <A: Any, B: A> foo(b: B): Int {
     var a: A? = null
     var c: Int = 1
 
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/localClassInBound.kt b/idea/testData/refactoring/extractFunction/typeParameters/localClassInBound.kt
index 0d299f151ce..3de61ce8942 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/localClassInBound.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/localClassInBound.kt
@@ -2,7 +2,7 @@
 fun foo() {
     open class X(val x: Int)
 
-    fun bar<T: X>(t: T): Int {
+    fun <T: X> bar(t: T): Int {
         return <selection>t.x + 1</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/localClassInTypeConstraint.kt b/idea/testData/refactoring/extractFunction/typeParameters/localClassInTypeConstraint.kt
index b70d918ef34..de09a858f90 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/localClassInTypeConstraint.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/localClassInTypeConstraint.kt
@@ -2,7 +2,7 @@
 fun foo() {
     open class X(val x: Int)
 
-    fun bar<T>(t: T): Int where T: X {
+    fun <T> bar(t: T): Int where T: X {
         return <selection>t.x + 1</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt
index 923c22caff6..a96c4b37826 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt
@@ -5,6 +5,6 @@ open class Data(val x: Int)
 class Pair<A, B>(val a: A, val b: B)
 
 // SIBLING:
-fun foo<V: Data>(v: V): Pair<Int, V> {
+fun <V: Data> foo(v: V): Pair<Int, V> {
     return <selection>Pair(v.x + 10, v)</selection>
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after
index 1bb6ac53bbb..2780fbb593e 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after
@@ -5,7 +5,7 @@ open class Data(val x: Int)
 class Pair<A, B>(val a: A, val b: B)
 
 // SIBLING:
-fun foo<V: Data>(v: V): Pair<Int, V> {
+fun <V: Data> foo(v: V): Pair<Int, V> {
     return pair(v)
 }
 
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt
index feb5de1e85a..9a65725f8be 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt
@@ -6,6 +6,6 @@ interface DataEx
 class Pair<A, B>(val a: A, val b: B)
 
 // SIBLING:
-fun foo<V: Data>(v: V): Pair<Int, V> where V: DataEx {
+fun <V: Data> foo(v: V): Pair<Int, V> where V: DataEx {
     return <selection>Pair(v.x + 10, v)</selection>
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after
index 6c34363ad4b..9cdd5ab9442 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after
@@ -6,7 +6,7 @@ interface DataEx
 class Pair<A, B>(val a: A, val b: B)
 
 // SIBLING:
-fun foo<V: Data>(v: V): Pair<Int, V> where V: DataEx {
+fun <V: Data> foo(v: V): Pair<Int, V> where V: DataEx {
     return pair(v)
 }
 
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt
index 3eb3e5e0806..e19576c0817 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt
@@ -1,6 +1,6 @@
 // SUGGESTED_NAMES: i, getA
-fun foo<U>() = 1
+fun <U> foo() = 1
 
-fun test<T>() {
+fun <T> test() {
     val a = <selection>foo<T>()</selection>
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt.after
index 4a83ac6716e..af96506b9f6 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt.after
@@ -1,7 +1,7 @@
 // SUGGESTED_NAMES: i, getA
-fun foo<U>() = 1
+fun <U> foo() = 1
 
-fun test<T>() {
+fun <T> test() {
     val a = i<T>()
 }
 
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt
index e12202196e1..65a26fa47c5 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt
@@ -1,8 +1,8 @@
 // SUGGESTED_NAMES: i, getA
 // PARAM_DESCRIPTOR: value-parameter val t: T defined in test
 // PARAM_TYPES: T
-fun foo<U>(u: U) = 1
+fun <U> foo(u: U) = 1
 
-fun test<T>(t: T) {
+fun <T> test(t: T) {
     val a = <selection>foo<T>(t)</selection>
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt.after
index 062cee22764..93891a3a836 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt.after
@@ -1,9 +1,9 @@
 // SUGGESTED_NAMES: i, getA
 // PARAM_DESCRIPTOR: value-parameter val t: T defined in test
 // PARAM_TYPES: T
-fun foo<U>(u: U) = 1
+fun <U> foo(u: U) = 1
 
-fun test<T>(t: T) {
+fun <T> test(t: T) {
     val a = i(t)
 }
 
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt
index 3c36bb644fd..36534f1bdff 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt
@@ -11,7 +11,7 @@ interface DataExEx
 // SIBLING:
 class A<T: Data>(val t: T) where T: DataEx {
     inner class B<U: Data>(val u: U) where U: DataExEx {
-        fun foo<V: Data>(v: V): Int where V: DataEx {
+        fun <V: Data> foo(v: V): Int where V: DataEx {
             return <selection>t.x + u.x + v.x</selection>
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
index 4cbe0f2f219..044316a5260 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
@@ -11,7 +11,7 @@ interface DataExEx
 // SIBLING:
 class A<T: Data>(val t: T) where T: DataEx {
     inner class B<U: Data>(val u: U) where U: DataExEx {
-        fun foo<V: Data>(v: V): Int where V: DataEx {
+        fun <V: Data> foo(v: V): Int where V: DataEx {
             return i(this@A, this@B, v)
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt
index 4a5923086df..50c3aa2a5f8 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt
@@ -9,7 +9,7 @@ interface DataExEx
 class A<T: Data>(val t: T) where T: DataEx {
     // SIBLING:
     inner class B<U: Data>(val u: U) where U: DataExEx {
-        fun foo<V: Data>(v: V): Int where V: DataEx {
+        fun <V: Data> foo(v: V): Int where V: DataEx {
             return <selection>t.x + u.x + v.x</selection>
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after
index 57a6f57a147..3cdd61e08d2 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after
@@ -9,7 +9,7 @@ interface DataExEx
 class A<T: Data>(val t: T) where T: DataEx {
     // SIBLING:
     inner class B<U: Data>(val u: U) where U: DataExEx {
-        fun foo<V: Data>(v: V): Int where V: DataEx {
+        fun <V: Data> foo(v: V): Int where V: DataEx {
             return i(v)
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt
index cfd591774e0..8547fb407f8 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt
@@ -7,7 +7,7 @@ interface DataExEx
 class A<T: Data>(val t: T) where T: DataEx {
     inner class B<U: Data>(val u: U) where U: DataExEx {
         // SIBLING:
-        fun foo<V: Data>(v: V): Int where V: DataEx {
+        fun <V: Data> foo(v: V): Int where V: DataEx {
             return <selection>t.x + u.x + v.x</selection>
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after
index 58a34cf4dc6..5db708dbd77 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after
@@ -7,7 +7,7 @@ interface DataExEx
 class A<T: Data>(val t: T) where T: DataEx {
     inner class B<U: Data>(val u: U) where U: DataExEx {
         // SIBLING:
-        fun foo<V: Data>(v: V): Int where V: DataEx {
+        fun <V: Data> foo(v: V): Int where V: DataEx {
             return i(v)
         }
 
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt
index 32ce5bd3004..85f11eeaafe 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt
@@ -9,7 +9,7 @@ open class Data(val x: Int)
 // SIBLING:
 class A<T: Data>(val t: T) {
     inner class B<U: Data>(val u: U) {
-        fun foo<V: Data>(v: V): Int {
+        fun <V: Data> foo(v: V): Int {
             return <selection>t.x + u.x + v.x</selection>
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
index 81f0d1fc6b0..fb2dd4e20a1 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
@@ -9,7 +9,7 @@ open class Data(val x: Int)
 // SIBLING:
 class A<T: Data>(val t: T) {
     inner class B<U: Data>(val u: U) {
-        fun foo<V: Data>(v: V): Int {
+        fun <V: Data> foo(v: V): Int {
             return i(this@A, this@B, v)
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt
index 46f331dc2c9..731462bf7e7 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt
@@ -7,7 +7,7 @@ open class Data(val x: Int)
 class A<T: Data>(val t: T) {
     // SIBLING:
     inner class B<U: Data>(val u: U) {
-        fun foo<V: Data>(v: V): Int {
+        fun <V: Data> foo(v: V): Int {
             return <selection>t.x + u.x + v.x</selection>
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after
index cc41b3afe35..c2f6bc9440f 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after
@@ -7,7 +7,7 @@ open class Data(val x: Int)
 class A<T: Data>(val t: T) {
     // SIBLING:
     inner class B<U: Data>(val u: U) {
-        fun foo<V: Data>(v: V): Int {
+        fun <V: Data> foo(v: V): Int {
             return i(v)
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt
index c2fcc37073f..3dffc8297e1 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt
@@ -5,7 +5,7 @@ open class Data(val x: Int)
 class A<T: Data>(val t: T) {
     inner class B<U: Data>(val u: U) {
         // SIBLING:
-        fun foo<V: Data>(v: V): Int {
+        fun <V: Data> foo(v: V): Int {
             return <selection>t.x + u.x + v.x</selection>
         }
     }
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after
index 0ff43a3d75f..553eae05951 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after
@@ -5,7 +5,7 @@ open class Data(val x: Int)
 class A<T: Data>(val t: T) {
     inner class B<U: Data>(val u: U) {
         // SIBLING:
-        fun foo<V: Data>(v: V): Int {
+        fun <V: Data> foo(v: V): Int {
             return i(v)
         }
 
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt
index 5445c2118bf..0553f79ed3c 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt
@@ -7,7 +7,7 @@ interface DataEx
 
 // SIBLING:
 class A<T: Data>(val t: T) where T: DataEx {
-    fun foo<V: Data>(v: V): Int {
+    fun <V: Data> foo(v: V): Int {
         return <selection>t.x + v.x</selection>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
index 5faae6015fa..fcf88c261b1 100644
--- a/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
+++ b/idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
@@ -7,7 +7,7 @@ interface DataEx
 
 // SIBLING:
 class A<T: Data>(val t: T) where T: DataEx {
-    fun foo<V: Data>(v: V): Int {
+    fun <V: Data> foo(v: V): Int {
         return i(v)
     }
 }
diff --git a/idea/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt b/idea/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt
index 0e735e241db..6b7e5bea151 100644
--- a/idea/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt
+++ b/idea/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt
@@ -6,7 +6,7 @@ interface Z<T>
 class C<W: I> {
     inner class <caret>B<X: I, Y>(x: X, y: Y): A<X, I, Z<Y>>() {
         // INFO: {"checked": "true"}
-        fun foo<S : X>(x1: X, x2: Z<X>, y1: Y, y2: Z<Y>, w1: W, w2: Z<W>, s1: S, s2: Z<S>) {
+        fun <S : X> foo(x1: X, x2: Z<X>, y1: Y, y2: Z<Y>, w1: W, w2: Z<W>, s1: S, s2: Z<S>) {
 
         }
         // INFO: {"checked": "true"}
diff --git a/idea/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt.after b/idea/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt.after
index 4a64013a156..b26204b4ce4 100644
--- a/idea/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt.after
+++ b/idea/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt.after
@@ -6,7 +6,7 @@ interface Z<T>
 class C<W: I> {
     inner class B<X: I, Y>(x: X, y: Y): A<X, I, Z<Y>>() {
         // INFO: {"checked": "true"}
-        override fun foo<S : X>(x1: X, x2: Z<X>, y1: Y, y2: Z<Y>, w1: W, w2: Z<W>, s1: S, s2: Z<S>) {
+        override fun <S : X> foo(x1: X, x2: Z<X>, y1: Y, y2: Z<Y>, w1: W, w2: Z<W>, s1: S, s2: Z<S>) {
 
         }
 
diff --git a/idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt b/idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt
index 8891cdc0960..b42f5924109 100644
--- a/idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt
+++ b/idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt
@@ -8,7 +8,7 @@ open class A<T: I, U: I, V>
 class C<W: I> {
     inner class <caret>B<X: I, Y>(x: X, y: Y): A<X, I, Z<Y>>() {
         // INFO: {"checked": "true"}
-        fun foo<S>(x1: X, x2: Z<X>, y1: Y, y2: Z<Y>, w1: W, w2: Z<W>, s1: S, s2: Z<S>) {
+        fun <S> foo(x1: X, x2: Z<X>, y1: Y, y2: Z<Y>, w1: W, w2: Z<W>, s1: S, s2: Z<S>) {
 
         }
         // INFO: {"checked": "true"}
diff --git a/idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt.after b/idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt.after
index 81a7e071b75..ac2efb4d6cb 100644
--- a/idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt.after
+++ b/idea/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt.after
@@ -22,7 +22,7 @@ abstract class A<T: I, U: I, V>(x: T, y: Any?) {
     abstract val foo8: Z<Any?>
 
     // INFO: {"checked": "true"}
-    fun foo<S>(x1: T, x2: Z<T>, y1: Any?, y2: Z<Any?>, w1: I, w2: Z<I>, s1: S, s2: Z<S>) {
+    fun <S> foo(x1: T, x2: Z<T>, y1: Any?, y2: Z<Any?>, w1: I, w2: Z<I>, s1: S, s2: Z<S>) {
 
     }
 
diff --git a/idea/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt b/idea/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt
index 7fd9445f5a8..b563463564a 100644
--- a/idea/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt
+++ b/idea/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt
@@ -7,7 +7,7 @@ open class <caret>A<T> {
     val t2: Z<T>
 
     // INFO: {"checked": "true"}
-    fun foo<S>(t1: T, t2: Z<T>, s1: S, s2: Z<S>): Boolean = true
+    fun <S> foo(t1: T, t2: Z<T>, s1: S, s2: Z<S>): Boolean = true
 
     // INFO: {"checked": "true"}
     inner class X : Z<T> {
diff --git a/idea/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt.after b/idea/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt.after
index b8ddd79f29c..db2466372b1 100644
--- a/idea/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt.after
+++ b/idea/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt.after
@@ -11,7 +11,7 @@ class B<S> : A<Z<S>>() {
     val t2: Z<Z<S>>
 
     // INFO: {"checked": "true"}
-    fun foo<S>(t1: Z<S>, t2: Z<Z<S>>, s1: S, s2: Z<S>): Boolean = true
+    fun <S> foo(t1: Z<S>, t2: Z<Z<S>>, s1: S, s2: Z<S>): Boolean = true
 
     // INFO: {"checked": "true"}
     inner class X : Z<Z<S>> {
@@ -32,7 +32,7 @@ class C<K> : A<B<K>>() {
     val t2: Z<B<K>>
 
     // INFO: {"checked": "true"}
-    fun foo<S>(t1: B<K>, t2: Z<B<K>>, s1: S, s2: Z<S>): Boolean = true
+    fun <S> foo(t1: B<K>, t2: Z<B<K>>, s1: S, s2: Z<S>): Boolean = true
 
     // INFO: {"checked": "true"}
     inner class X : Z<B<K>> {
diff --git a/idea/testData/refactoring/rename/automaticRenamer/after/lib.kt b/idea/testData/refactoring/rename/automaticRenamer/after/lib.kt
index f738e66d130..7c2d535bbda 100644
--- a/idea/testData/refactoring/rename/automaticRenamer/after/lib.kt
+++ b/idea/testData/refactoring/rename/automaticRenamer/after/lib.kt
@@ -4,4 +4,4 @@ data class Pair<out A, out B>(
 )
 
 
-public fun listOf<T>(): List<T> = throw Error()
+public fun <T> listOf(): List<T> = throw Error()
diff --git a/idea/testData/refactoring/rename/automaticRenamer/before/lib.kt b/idea/testData/refactoring/rename/automaticRenamer/before/lib.kt
index f738e66d130..7c2d535bbda 100644
--- a/idea/testData/refactoring/rename/automaticRenamer/before/lib.kt
+++ b/idea/testData/refactoring/rename/automaticRenamer/before/lib.kt
@@ -4,4 +4,4 @@ data class Pair<out A, out B>(
 )
 
 
-public fun listOf<T>(): List<T> = throw Error()
+public fun <T> listOf(): List<T> = throw Error()
diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt
index 325c97bce44..4dc71c2d245 100644
--- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt
+++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt
@@ -1,5 +1,5 @@
 class A<<caret>X> {
-    fun foo<Y, Z>() where Y: X {
+    fun <Y, Z> foo() where Y: X {
 
     }
 }
diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt
index 40c23733c3f..5d5287edac6 100644
--- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt
+++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt
@@ -1,5 +1,5 @@
 class A<X> {
-    fun foo<<caret>Y, Z>() {
+    fun <<caret>Y, Z> foo() {
 
     }
 }
diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after
index 4a8974a37bb..8214b99cc90 100644
--- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after
+++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after
@@ -1,5 +1,5 @@
 class A<X> {
-    fun foo<Z>() {
+    fun <Z> foo() {
 
     }
 }
diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt
index 6290ec9452f..7209cde6dc9 100644
--- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt
+++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt
@@ -1,5 +1,5 @@
 class A<X> {
-    fun foo<Y, <caret>Z>() {
+    fun <Y, <caret>Z> foo() {
 
     }
 }
diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after
index 8e5042316a4..14e3dac7c97 100644
--- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after
+++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after
@@ -1,5 +1,5 @@
 class A<X> {
-    fun foo<Y>() {
+    fun <Y> foo() {
 
     }
 }
diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt
index fec914237a2..18020b00e41 100644
--- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt
+++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt
@@ -1,5 +1,5 @@
 class A<<caret>X> {
-    fun foo<Y, Z>() where Y: X {
+    fun <Y, Z> foo() where Y: X {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt
index b16dedb3343..bfe3adcf49b 100644
--- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt
+++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt
@@ -1,5 +1,5 @@
 class A<X> {
-    fun foo<<caret>Y, Z>() {
+    fun <<caret>Y, Z> foo() {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after
index 8b5f91e83be..4c6326eda67 100644
--- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after
+++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after
@@ -1,5 +1,5 @@
 class A<X> {
-    fun foo<Z>() {
+    fun <Z> foo() {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt
index abc255f3b13..4db1da350b8 100644
--- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt
+++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt
@@ -1,5 +1,5 @@
 class A<X> {
-    fun foo<Y, <caret>Z>() {
+    fun <Y, <caret>Z> foo() {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after
index 92bb08f20f8..b881e313229 100644
--- a/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after
+++ b/idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after
@@ -1,5 +1,5 @@
 class A<X> {
-    fun foo<Y>() {
+    fun <Y> foo() {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt b/idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt
index 6384fdfebc8..9bedf65a2eb 100644
--- a/idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt
+++ b/idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt
@@ -1,21 +1,21 @@
 class A(val n: Int)
 
 fun test() {
-    <selection>fun foo<T: A>(t: T): Int {
+    <selection>fun <T: A> foo(t: T): Int {
         fun A.a(n: Int): Int = this.n + n
         fun A.b(n: Int): Int = this.n - n
 
         return t.n + A(1).a(2) - A(2).b(1)
     }</selection>
 
-    fun foo<U: A>(u: U): Int {
+    fun <U: A> foo(u: U): Int {
         fun A.x(m: Int): Int = n + m
         fun A.y(n: Int): Int = this.n - n
 
         return u.n + A(1).x(2) - A(2).y(1)
     }
 
-    fun foo<V: A>(v: V): Int {
+    fun <V: A> foo(v: V): Int {
         fun A.a(n: Int): Int = this.n + n
         fun A.b(n: Int): Int = this.n + n
 
diff --git a/idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt.match b/idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt.match
index c653c13cb05..dbdf1d734a2 100644
--- a/idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt.match
+++ b/idea/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt.match
@@ -1,11 +1,11 @@
-fun foo<T: A>(t: T): Int {
+fun <T: A> foo(t: T): Int {
         fun A.a(n: Int): Int = this.n + n
         fun A.b(n: Int): Int = this.n - n
 
         return t.n + A(1).a(2) - A(2).b(1)
     }
 
-fun foo<U: A>(u: U): Int {
+fun <U: A> foo(u: U): Int {
         fun A.x(m: Int): Int = n + m
         fun A.y(n: Int): Int = this.n - n
 
diff --git a/idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt b/idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt
index 70eff644c7d..1f3b20900a5 100644
--- a/idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt
+++ b/idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt
@@ -1,21 +1,21 @@
 class A(val n: Int)
 
 fun test() {
-    <selection>fun foo<T: A>(t: T): Int {
+    <selection>fun <T: A> foo(t: T): Int {
         fun a(p: Int): Int = p + 1
         fun b(q: Int): Int = q - 1
 
         return t.n + a(1) - b(2)
     }</selection>
 
-    fun foo<U: A>(u: U): Int {
+    fun <U: A> foo(u: U): Int {
         fun x(a: Int): Int = a + 1
         fun y(a: Int): Int = a - 1
 
         return u.n + x(1) - y(2)
     }
 
-    fun foo<V: A>(v: V): Int {
+    fun <V: A> foo(v: V): Int {
         fun a(p: Int): Int = p + 1
         fun b(p: Int): Int = p + 1
 
@@ -25,7 +25,7 @@ fun test() {
     fun a(p: Int): Int = p + 1
     fun b(q: Int): Int = q - 1
 
-    fun foo<W: A>(w: W): Int {
+    fun <W: A> foo(w: W): Int {
         return w.n + a(1) - b(2)
     }
 }
\ No newline at end of file
diff --git a/idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt.match b/idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt.match
index 8727d647e10..2bfc4c3622d 100644
--- a/idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt.match
+++ b/idea/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt.match
@@ -1,11 +1,11 @@
-fun foo<T: A>(t: T): Int {
+fun <T: A> foo(t: T): Int {
         fun a(p: Int): Int = p + 1
         fun b(q: Int): Int = q - 1
 
         return t.n + a(1) - b(2)
     }
 
-fun foo<U: A>(u: U): Int {
+fun <U: A> foo(u: U): Int {
         fun x(a: Int): Int = a + 1
         fun y(a: Int): Int = a - 1
 
diff --git a/idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt b/idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt
index f48e39c1c6a..846413e3526 100644
--- a/idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt
+++ b/idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt
@@ -1,17 +1,17 @@
 fun foo() {
     abstract class T
 
-    <selection>fun bar1<A, B, C>(a: A, b: B, c: C): A where B: A, C: B, C: T = c</selection>
+    <selection>fun <A, B, C> bar1(a: A, b: B, c: C): A where B: A, C: B, C: T = c</selection>
 
-    fun bar2<X, Y: X, Z>(x: X, y: Y, z: Z): X where Z: Y, Z: T = z
+    fun <X, Y: X, Z> bar2(x: X, y: Y, z: Z): X where Z: Y, Z: T = z
 
-    fun bar3<X, Y, Z: Y>(x: X, y: Y, z: Z): X where Y: X, Z: T = z
+    fun <X, Y, Z: Y> bar3(x: X, y: Y, z: Z): X where Y: X, Z: T = z
 
-    fun bar4<X, Y: X, Z: Y>(x: X, y: Y, z: Z): X where Z: T = z
+    fun <X, Y: X, Z: Y> bar4(x: X, y: Y, z: Z): X where Z: T = z
 
-    fun bar5<X, Y: X, Z: T>(x: X, y: Y, z: Z): X where Z: Y = z
+    fun <X, Y: X, Z: T> bar5(x: X, y: Y, z: Z): X where Z: Y = z
 
-    fun bar6<X, Z: Y, Y>(x: X, y: Y, z: Z): X where Y: X, Z: T = z
+    fun <X, Z: Y, Y> bar6(x: X, y: Y, z: Z): X where Y: X, Z: T = z
 
-    fun bar7<X, Y: T, Z>(x: X, y: Y, z: Z): X where Y: X, Z: Y, Z: T = z
+    fun <X, Y: T, Z> bar7(x: X, y: Y, z: Z): X where Y: X, Z: Y, Z: T = z
 }
\ No newline at end of file
diff --git a/idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt.match b/idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt.match
index 4102f194c9b..bd7abf56b1c 100644
--- a/idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt.match
+++ b/idea/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt.match
@@ -1,9 +1,9 @@
-fun bar1<A, B, C>(a: A, b: B, c: C): A where B: A, C: B, C: T = c
+fun <A, B, C> bar1(a: A, b: B, c: C): A where B: A, C: B, C: T = c
 
-fun bar2<X, Y: X, Z>(x: X, y: Y, z: Z): X where Z: Y, Z: T = z
+fun <X, Y: X, Z> bar2(x: X, y: Y, z: Z): X where Z: Y, Z: T = z
 
-fun bar3<X, Y, Z: Y>(x: X, y: Y, z: Z): X where Y: X, Z: T = z
+fun <X, Y, Z: Y> bar3(x: X, y: Y, z: Z): X where Y: X, Z: T = z
 
-fun bar4<X, Y: X, Z: Y>(x: X, y: Y, z: Z): X where Z: T = z
+fun <X, Y: X, Z: Y> bar4(x: X, y: Y, z: Z): X where Z: T = z
 
-fun bar5<X, Y: X, Z: T>(x: X, y: Y, z: Z): X where Z: Y = z
+fun <X, Y: X, Z: T> bar5(x: X, y: Y, z: Z): X where Z: Y = z
diff --git a/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt b/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt
index ba54690bf35..752a6e23f5e 100644
--- a/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt
+++ b/idea/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt
@@ -2,11 +2,11 @@
 class A
 class B
 
-fun foo<T>(klass: Class<T>) {
+fun <T> foo(klass: Class<T>) {
 
 }
 
-fun bar<T>(klass: Class<T>) {
+fun <T> bar(klass: Class<T>) {
 
 }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt
index 78245e3cf03..22283872c4f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt
@@ -125,8 +125,8 @@ public class DebugTextByStubTest : LightCodeInsightFixtureTestCase() {
     fun testFunction() {
         function("fun foo()")
         function("fun <T> foo()")
-        function("fun foo<T>()")
-        function("fun foo<T, G>()")
+        function("fun <T> foo()")
+        function("fun <T, G> foo()")
         function("fun foo(a: Int, b: String)")
         function("fun Int.foo()")
         function("fun foo(): String")
diff --git a/j2k/testData/KotlinApi.kt b/j2k/testData/KotlinApi.kt
index 3b28da1a69e..2297aa8f518 100644
--- a/j2k/testData/KotlinApi.kt
+++ b/j2k/testData/KotlinApi.kt
@@ -29,7 +29,7 @@ public interface KotlinTrait {
 
 public fun globalFunction(s: String): String = s
 public fun nullableGlobalFunction(s: String?): String? = s
-public fun globalGenericFunction<T>(t: T): T = t
+public fun <T> globalGenericFunction(t: T): T = t
 
 public fun Int.extensionFunction(): String = toString()
 
diff --git a/js/js.translator/testData/_commonFiles/asserts.kt b/js/js.translator/testData/_commonFiles/asserts.kt
index d24ded89de5..f40b21da3bd 100644
--- a/js/js.translator/testData/_commonFiles/asserts.kt
+++ b/js/js.translator/testData/_commonFiles/asserts.kt
@@ -4,14 +4,14 @@ package kotlin
 
 fun fail(message: String? = null): Nothing = throw Exception(message)
 
-fun assertEquals<T>(expected: T, actual: T, message: String? = null) {
+fun <T> assertEquals(expected: T, actual: T, message: String? = null) {
     if (expected != actual) {
         val msg = if (message == null) "" else (" message = '" + message + "',")
         fail("Unexpected value:$msg expected = '$expected', actual = '$actual'")
     }
 }
 
-fun assertNotEquals<T>(illegal: T, actual: T, message: String? = null) {
+fun <T> assertNotEquals(illegal: T, actual: T, message: String? = null) {
     if (illegal == actual) {
         val msg = if (message == null) "" else (" message = '" + message + "',")
         fail("Illegal value:$msg illegal = '$illegal', actual = '$actual'")
diff --git a/js/js.translator/testData/bridges/_commonFiles/javautil.kt b/js/js.translator/testData/bridges/_commonFiles/javautil.kt
index d594c518bbb..723d9db8f54 100644
--- a/js/js.translator/testData/bridges/_commonFiles/javautil.kt
+++ b/js/js.translator/testData/bridges/_commonFiles/javautil.kt
@@ -1,7 +1,7 @@
 package java.util
 
 public object Arrays {
-    public fun asList<T>(vararg ts : T) : List<T> {
+    public fun <T> asList(vararg ts : T) : List<T> {
         val result = ArrayList<T>()
         for (t in ts) {
             result.add(t)
diff --git a/js/js.translator/testData/closure/_commonFiles/utils.kt b/js/js.translator/testData/closure/_commonFiles/utils.kt
index 79f75e0832e..1aa42609486 100644
--- a/js/js.translator/testData/closure/_commonFiles/utils.kt
+++ b/js/js.translator/testData/closure/_commonFiles/utils.kt
@@ -1,3 +1,3 @@
 package foo
 
-fun myRun<T>(f: () -> T) = f()
+fun <T> myRun(f: () -> T) = f()
diff --git a/js/js.translator/testData/closure/cases/closureInWithInsideWith.kt b/js/js.translator/testData/closure/cases/closureInWithInsideWith.kt
index edaae9306d0..59d2fda529a 100644
--- a/js/js.translator/testData/closure/cases/closureInWithInsideWith.kt
+++ b/js/js.translator/testData/closure/cases/closureInWithInsideWith.kt
@@ -8,7 +8,7 @@ class A {
 
 class B
 
-fun with<T>(o: T, body: T.() -> Unit) {
+fun <T> with(o: T, body: T.() -> Unit) {
     o.body()
 }
 
diff --git a/js/js.translator/testData/dataClass/cases/hashcode.kt b/js/js.translator/testData/dataClass/cases/hashcode.kt
index 42a7d6b7c66..b1a597f44a6 100644
--- a/js/js.translator/testData/dataClass/cases/hashcode.kt
+++ b/js/js.translator/testData/dataClass/cases/hashcode.kt
@@ -9,7 +9,7 @@ data class Dat(val start: String, val end: String)
 
 class Obj(val start: String, val end: String)
 
-fun assertSomeNotEqual<T>(c: Iterable<T>) {
+fun <T> assertSomeNotEqual(c: Iterable<T>) {
     val it = c.iterator()
     val first = it.next()
     while (it.hasNext()) {
@@ -21,7 +21,7 @@ fun assertSomeNotEqual<T>(c: Iterable<T>) {
     throw Exception("All elements are the same: $first")
 }
 
-fun assertAllEqual<T>(c: Iterable<out T>) {
+fun <T> assertAllEqual(c: Iterable<out T>) {
     val it = c.iterator()
     val first = it.next()
     while (it.hasNext()) {
diff --git a/js/js.translator/testData/defaultArguments/cases/defaultArgumentsInFunctionWithExpressionAsBody.kt b/js/js.translator/testData/defaultArguments/cases/defaultArgumentsInFunctionWithExpressionAsBody.kt
index 9627e6c7df1..8fa89a5475d 100644
--- a/js/js.translator/testData/defaultArguments/cases/defaultArgumentsInFunctionWithExpressionAsBody.kt
+++ b/js/js.translator/testData/defaultArguments/cases/defaultArgumentsInFunctionWithExpressionAsBody.kt
@@ -1,7 +1,7 @@
 // KT-6037: KT-6037 Javascript default function arguments fill code generated in wrong order on method without "return keyword"
 package foo
 
-inline fun id<T>(x: T) = x
+inline fun <T> id(x: T) = x
 
 fun test(arg: Int = 10) = id(arg)
 
diff --git a/js/js.translator/testData/examples/sortedTests/unsupported/forwardTypeParameter.kt b/js/js.translator/testData/examples/sortedTests/unsupported/forwardTypeParameter.kt
index 060472dc351..554373f43fa 100644
--- a/js/js.translator/testData/examples/sortedTests/unsupported/forwardTypeParameter.kt
+++ b/js/js.translator/testData/examples/sortedTests/unsupported/forwardTypeParameter.kt
@@ -3,9 +3,9 @@ class Foo() {
 class Bar() {
 }
 
-fun isInstance<T>(obj: Any?) = obj is T
+fun <T> isInstance(obj: Any?) = obj is T
 
-fun isInstance2<T>(obj: Any?) = isInstance<T>(obj)
+fun <T> isInstance2(obj: Any?) = isInstance<T>(obj)
 
 fun box(): String {
     if (!isInstance2<Foo>(Foo())) return "fail 1"
diff --git a/js/js.translator/testData/expression/cast/cases/castToGenericType.kt b/js/js.translator/testData/expression/cast/cases/castToGenericType.kt
index 09687e93127..171621bf5aa 100644
--- a/js/js.translator/testData/expression/cast/cases/castToGenericType.kt
+++ b/js/js.translator/testData/expression/cast/cases/castToGenericType.kt
@@ -2,14 +2,14 @@ package foo
 
 class A(val s: String)
 
-fun castsNotNullToNullableT<T>(a: Any) {
+fun <T> castsNotNullToNullableT(a: Any) {
     a as T
     a as T?
     a as? T
     a as? T?
 }
 
-fun castsNullableToNullableT<T>(a: Any?) {
+fun <T> castsNullableToNullableT(a: Any?) {
     a as T
     a as T?
     a as? T
@@ -17,18 +17,18 @@ fun castsNullableToNullableT<T>(a: Any?) {
 }
 
 
-fun castsNotNullToNotNullT<T : Any>(a: Any) {
+fun <T : Any> castsNotNullToNotNullT(a: Any) {
     a as T
     a as T?
     a as? T
     a as? T?
 }
 
-fun castNullableToNotNullT<T : Any>(a: Any?) {
+fun <T : Any> castNullableToNotNullT(a: Any?) {
     a as T
 }
 
-fun castsNullableToNotNullT<T : Any>(a: Any?) {
+fun <T : Any> castsNullableToNotNullT(a: Any?) {
     a as T?
     a as? T
     a as? T?
diff --git a/js/js.translator/testData/expression/evaluationOrder/cases/callVarargs.kt b/js/js.translator/testData/expression/evaluationOrder/cases/callVarargs.kt
index 1c2ac124dda..a5af4f45442 100644
--- a/js/js.translator/testData/expression/evaluationOrder/cases/callVarargs.kt
+++ b/js/js.translator/testData/expression/evaluationOrder/cases/callVarargs.kt
@@ -2,16 +2,16 @@ package foo
 
 var global: String = ""
 
-fun bar<T>(s: String, value: T): T {
+fun <T> bar(s: String, value: T): T {
     global += s
     return value
 }
 
-fun baz<T>(vararg args: T): String {
+fun <T> baz(vararg args: T): String {
     return "baz: ${args.size()}"
 }
 
-fun idVarArg<T>(vararg a: T) = a
+fun <T> idVarArg(vararg a: T) = a
 
 fun box(): String {
     baz(bar("A", 10), try { global += "B"; 20} finally {})
diff --git a/js/js.translator/testData/expression/function/cases/functionExpression.kt b/js/js.translator/testData/expression/function/cases/functionExpression.kt
index 9a4422a22c2..17646aceac9 100644
--- a/js/js.translator/testData/expression/function/cases/functionExpression.kt
+++ b/js/js.translator/testData/expression/function/cases/functionExpression.kt
@@ -8,9 +8,9 @@ fun Int.foo2(): (i: Int) -> Int {
     return { x -> x + this }
 }
 
-fun fooT1<T>(t: T) = { t.toString() }
+fun <T> fooT1(t: T) = { t.toString() }
 
-fun fooT2<T>(t: T) = { x: T -> t.toString() + x.toString() }
+fun <T> fooT2(t: T) = { x: T -> t.toString() + x.toString() }
 
 fun box(): Any? {
     if ( (10.foo1())() != "23910") return "foo1 fail"
diff --git a/js/js.translator/testData/expression/function/cases/vararg.kt b/js/js.translator/testData/expression/function/cases/vararg.kt
index f5d7b85e3a7..22dcdb4670c 100644
--- a/js/js.translator/testData/expression/function/cases/vararg.kt
+++ b/js/js.translator/testData/expression/function/cases/vararg.kt
@@ -34,9 +34,9 @@ fun spreadInObjectMethodCall(size: Int, sum: Int, vararg args: Int) = obj.test(s
 
 fun testVarargWithFunLit(vararg args: Int, f: (a: IntArray) -> Boolean): Boolean = f(args)
 
-fun idVarArgs<T>(vararg a: T) = a
+fun <T> idVarArgs(vararg a: T) = a
 
-fun idArrayVarArg<T>(vararg a: Array<T>) = a
+fun <T> idArrayVarArg(vararg a: Array<T>) = a
 
 fun sumFunValuesOnParameters(x: Int, y: Int, vararg a: Int, f: (Int) -> Int): Int {
     var result = f(x) + f(y)
diff --git a/js/js.translator/testData/inline/cases/expressionBodyWithLambdaCall.kt b/js/js.translator/testData/inline/cases/expressionBodyWithLambdaCall.kt
index 926faab5e6b..9bb30235fef 100644
--- a/js/js.translator/testData/inline/cases/expressionBodyWithLambdaCall.kt
+++ b/js/js.translator/testData/inline/cases/expressionBodyWithLambdaCall.kt
@@ -5,7 +5,7 @@ package foo
 // A copy of stdlib run function.
 // Copied to not to depend on run implementation.
 // It's important, that the body is just `return fn()`.
-internal inline fun evaluate<T>(fn: ()->T): T = fn()
+internal inline fun <T> evaluate(fn: ()->T): T = fn()
 
 internal fun test(n: Int): Int {
     return evaluate {
diff --git a/js/js.translator/testData/inline/cases/lambdaInLambda.kt b/js/js.translator/testData/inline/cases/lambdaInLambda.kt
index 3437145f473..0a3eca9d006 100644
--- a/js/js.translator/testData/inline/cases/lambdaInLambda.kt
+++ b/js/js.translator/testData/inline/cases/lambdaInLambda.kt
@@ -4,7 +4,7 @@ package foo
 // CHECK_NOT_CALLED_IN_SCOPE: scope=multiplyBy2 function=multiplyBy2$f_0
 // CHECK_NOT_CALLED_IN_SCOPE: scope=multiplyBy2 function=run
 
-internal inline fun runLambdaInLambda<T>(noinline inner: (T) -> T, outer: ((T) -> T, T) -> T, arg: T): T {
+internal inline fun <T> runLambdaInLambda(noinline inner: (T) -> T, outer: ((T) -> T, T) -> T, arg: T): T {
     return outer(inner, arg)
 }
 
diff --git a/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt b/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt
index 16751ad055b..7d07aa91d59 100644
--- a/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt
+++ b/js/js.translator/testData/inline/cases/metadataForPublicFunction.kt
@@ -12,27 +12,27 @@ package foo
 // CHECK_HAS_NO_INLINE_METADATA: applyO_hiyix$
 
 inline
-public fun apply<T>(arg: T, func: (T)->T): T = func(arg)
+public fun <T> apply(arg: T, func: (T)->T): T = func(arg)
 
 public open class L {
     inline
-    protected fun applyL<T>(arg: T, func: (T)->T): T = func(arg)
+    protected fun <T> applyL(arg: T, func: (T)->T): T = func(arg)
 }
 
 public class M {
     inline
-    public fun applyM<T>(arg: T, func: (T)->T): T = func(arg)
+    public fun <T> applyM(arg: T, func: (T)->T): T = func(arg)
 }
 
 internal class N {
     inline
-    public fun applyN<T>(arg: T, func: (T)->T): T = func(arg)
+    public fun <T> applyN(arg: T, func: (T)->T): T = func(arg)
 }
 
 private object O {
     public object OInner {
         inline
-        public fun applyO<T>(arg: T, func: (T)->T): T = func(arg)
+        public fun <T> applyO(arg: T, func: (T)->T): T = func(arg)
     }
 }
 
diff --git a/js/js.translator/testData/inline/cases/noInlineLambda.kt b/js/js.translator/testData/inline/cases/noInlineLambda.kt
index 64d0aee3150..98f28fd9f67 100644
--- a/js/js.translator/testData/inline/cases/noInlineLambda.kt
+++ b/js/js.translator/testData/inline/cases/noInlineLambda.kt
@@ -3,7 +3,7 @@ package foo
 // CHECK_CALLED_IN_SCOPE: scope=multiplyBy2 function=multiplyBy2$f
 // CHECK_NOT_CALLED_IN_SCOPE: scope=multiplyBy2 function=run
 
-internal inline fun run<T>(noinline func: (T) -> T, arg: T): T {
+internal inline fun <T> run(noinline func: (T) -> T, arg: T): T {
     return func(arg)
 }
 
diff --git a/js/js.translator/testData/inlineEvaluationOrder/_commonFiles/utils.kt b/js/js.translator/testData/inlineEvaluationOrder/_commonFiles/utils.kt
index 46150de3492..0c970b3c9b7 100644
--- a/js/js.translator/testData/inlineEvaluationOrder/_commonFiles/utils.kt
+++ b/js/js.translator/testData/inlineEvaluationOrder/_commonFiles/utils.kt
@@ -14,13 +14,13 @@ fun pullLog(): String {
     return string
 }
 
-fun fizz<T>(x: T): T {
+fun <T> fizz(x: T): T {
     log("fizz($x)")
     return x
 }
 
 inline
-fun buzz<T>(x: T): T {
+fun <T> buzz(x: T): T {
     log("buzz($x)")
     return x
 }
\ No newline at end of file
diff --git a/js/js.translator/testData/java/abstractList/cases/iterator.kt b/js/js.translator/testData/java/abstractList/cases/iterator.kt
index a5cb20cf7c0..f0cdc5243ea 100644
--- a/js/js.translator/testData/java/abstractList/cases/iterator.kt
+++ b/js/js.translator/testData/java/abstractList/cases/iterator.kt
@@ -7,7 +7,7 @@ class MyList<T>(vararg val data: T) : AbstractList<T>() {
     override val size: Int get() = data.size()
 }
 
-fun test<T>(expected: String, list: List<T>) {
+fun <T> test(expected: String, list: List<T>) {
     var s = ""
     for (e in list) {
         s += "$e,"
diff --git a/js/js.translator/testData/java/arrayList/cases/indexOf.kt b/js/js.translator/testData/java/arrayList/cases/indexOf.kt
index 2816a3f5a5a..35fb23b5f25 100644
--- a/js/js.translator/testData/java/arrayList/cases/indexOf.kt
+++ b/js/js.translator/testData/java/arrayList/cases/indexOf.kt
@@ -2,7 +2,7 @@ package foo
 
 import java.util.ArrayList;
 
-fun test<T>(list: List<T>, elements: List<T>, expected: List<Int>, method: List<T>.(T) -> Int, methodName: String): String? {
+fun <T> test(list: List<T>, elements: List<T>, expected: List<Int>, method: List<T>.(T) -> Int, methodName: String): String? {
     for (i in 0..elements.size() - 1) {
         val actual = list.method(elements[i])
         if (actual != expected[i]) return "$methodName failed when find: ${elements[i]}, expected: ${expected[i]}, actual: $actual"
diff --git a/js/js.translator/testData/java/arrayList/cases/removeAll.kt b/js/js.translator/testData/java/arrayList/cases/removeAll.kt
index 90f7c44e120..3060244f535 100644
--- a/js/js.translator/testData/java/arrayList/cases/removeAll.kt
+++ b/js/js.translator/testData/java/arrayList/cases/removeAll.kt
@@ -3,7 +3,7 @@ package foo
 import java.util.ArrayList;
 
 
-fun test<T>(a: List<T>, b: List<T>, removed: Boolean, expected: List<T>): String? {
+fun <T> test(a: List<T>, b: List<T>, removed: Boolean, expected: List<T>): String? {
     val t = ArrayList<T>(a.size())
     t.addAll(a)
 
diff --git a/js/js.translator/testData/java/arrayList/cases/retainAll.kt b/js/js.translator/testData/java/arrayList/cases/retainAll.kt
index ea8042f7348..dba224e4932 100644
--- a/js/js.translator/testData/java/arrayList/cases/retainAll.kt
+++ b/js/js.translator/testData/java/arrayList/cases/retainAll.kt
@@ -2,7 +2,7 @@ package foo
 
 import java.util.ArrayList;
 
-fun test<T>(a: List<T>, b: List<T>, removed: Boolean, expected: List<T>): String? {
+fun <T> test(a: List<T>, b: List<T>, removed: Boolean, expected: List<T>): String? {
     val t = ArrayList<T>(a.size)
     t.addAll(a)
 
diff --git a/js/js.translator/testData/jsCode/cases/invocation.kt b/js/js.translator/testData/jsCode/cases/invocation.kt
index 72c6e346bbb..18f02fe6e71 100644
--- a/js/js.translator/testData/jsCode/cases/invocation.kt
+++ b/js/js.translator/testData/jsCode/cases/invocation.kt
@@ -1,6 +1,6 @@
 package foo
 
-fun run<A, B, C>(a: A, b: B, func: (A, B) -> C): C = js("func(a, b)")
+fun <A, B, C> run(a: A, b: B, func: (A, B) -> C): C = js("func(a, b)")
 
 fun box(): String {
     assertEquals(3, run(1, 2) { a, b -> a + b})
diff --git a/js/js.translator/testData/jsCode/cases/literal.kt b/js/js.translator/testData/jsCode/cases/literal.kt
index 19d4b190041..2ea45c35038 100644
--- a/js/js.translator/testData/jsCode/cases/literal.kt
+++ b/js/js.translator/testData/jsCode/cases/literal.kt
@@ -4,7 +4,7 @@ package foo
     val name: String
 }
 
-fun assertArrayEquals<T>(expected: Array<T>, actual: Array<T>) {
+fun <T> assertArrayEquals(expected: Array<T>, actual: Array<T>) {
     val expectedSize = expected.size()
     val actualSize = actual.size()
 
diff --git a/js/js.translator/testData/labels/cases/labelOnExpression.kt b/js/js.translator/testData/labels/cases/labelOnExpression.kt
index 80d120c5c07..922d226e862 100644
--- a/js/js.translator/testData/labels/cases/labelOnExpression.kt
+++ b/js/js.translator/testData/labels/cases/labelOnExpression.kt
@@ -5,7 +5,7 @@
 
 package foo
 
-fun myRun<R>(f: () -> R) = f()
+fun <R> myRun(f: () -> R) = f()
 
 fun test0() {
     val a = aa@ 1
diff --git a/js/js.translator/testData/native/cases/inheritanceFromNativeTrait.kt b/js/js.translator/testData/native/cases/inheritanceFromNativeTrait.kt
index c06f4d31bb1..c0757e30f7a 100644
--- a/js/js.translator/testData/native/cases/inheritanceFromNativeTrait.kt
+++ b/js/js.translator/testData/native/cases/inheritanceFromNativeTrait.kt
@@ -23,7 +23,7 @@ class AnotherClass : Trait {
     override fun baz(): String = "AnotherClass().boo()"
 }
 
-fun test<T : NativeTrait>(c: T, className: String) {
+fun <T : NativeTrait> test(c: T, className: String) {
     assertEquals("$className().foo", c.foo)
     assertEquals("$className().bar(3)", c.bar(3))
     assertEquals("$className().boo()", c.baz())
diff --git a/js/js.translator/testData/native/cases/vararg.kt b/js/js.translator/testData/native/cases/vararg.kt
index 19ab69421c0..4dd5c5f9268 100644
--- a/js/js.translator/testData/native/cases/vararg.kt
+++ b/js/js.translator/testData/native/cases/vararg.kt
@@ -7,7 +7,7 @@ fun paramCount(vararg a: Int): Int = noImpl
 fun anotherParamCount(vararg a: Int): Int = noImpl
 
 @native("paramCount")
-fun genericParamCount<T>(vararg a: T): Int = noImpl
+fun <T> genericParamCount(vararg a: T): Int = noImpl
 
 // test spread operator
 fun count(vararg a: Int) = paramCount(*a)
@@ -66,7 +66,7 @@ fun sumOfParameters(x: Int, y: Int, vararg a: Int): Int = noImpl
 fun sumFunValuesOnParameters(x: Int, y: Int, vararg a: Int, f: (Int) -> Int): Int = noImpl
 
 @native
-fun idArrayVarArg<T>(vararg a: Array<T>): Array<T> = noImpl
+fun <T> idArrayVarArg(vararg a: Array<T>): Array<T> = noImpl
 
 fun box(): String {
     if (paramCount() != 0)
diff --git a/js/js.translator/testData/propertyAccess/cases/enumerable.kt b/js/js.translator/testData/propertyAccess/cases/enumerable.kt
index 6e13b4e3abd..c586c598134 100644
--- a/js/js.translator/testData/propertyAccess/cases/enumerable.kt
+++ b/js/js.translator/testData/propertyAccess/cases/enumerable.kt
@@ -4,7 +4,7 @@ package foo
 fun <T> _enumerate(o: T): T = noImpl
 
 @native
-fun _findFirst<T>(o: Any): T = noImpl
+fun <T> _findFirst(o: Any): T = noImpl
 
 class Test() {
     val a: Int = 100
diff --git a/js/js.translator/testData/reified/cases/callChain.kt b/js/js.translator/testData/reified/cases/callChain.kt
index 48a298d9bc4..cfe7b315460 100644
--- a/js/js.translator/testData/reified/cases/callChain.kt
+++ b/js/js.translator/testData/reified/cases/callChain.kt
@@ -6,9 +6,9 @@ package foo
 class A
 class B
 
-inline fun test<reified T>(x: Any): Boolean = test1<T>(x)
+inline fun <reified T> test(x: Any): Boolean = test1<T>(x)
 
-inline fun test1<reified R>(x: Any): Boolean = x is R
+inline fun <reified R> test1(x: Any): Boolean = x is R
 
 fun box(): String {
     assertEquals(true, test<A>(A()), "test<A>(A())")
diff --git a/js/js.translator/testData/reified/cases/extensionFun.kt b/js/js.translator/testData/reified/cases/extensionFun.kt
index 473d2af3893..6c36ce9f772 100644
--- a/js/js.translator/testData/reified/cases/extensionFun.kt
+++ b/js/js.translator/testData/reified/cases/extensionFun.kt
@@ -6,7 +6,7 @@ open class A
 class B
 class C : A()
 
-inline fun Any.canBeCastedTo<reified T>(): Boolean = this is T
+inline fun <reified T> Any.canBeCastedTo(): Boolean = this is T
 
 fun box(): String {
     assertEquals(true, A().canBeCastedTo<A>(), "A().canBeCastedTo<A>()")
diff --git a/js/js.translator/testData/reified/cases/extensionLambda.kt b/js/js.translator/testData/reified/cases/extensionLambda.kt
index 493a1031c17..aa518fc502a 100644
--- a/js/js.translator/testData/reified/cases/extensionLambda.kt
+++ b/js/js.translator/testData/reified/cases/extensionLambda.kt
@@ -3,9 +3,9 @@ package foo
 class A
 class B
 
-fun apply<T, R>(x: T, fn: T.()->R): R = x.fn()
+fun <T, R> apply(x: T, fn: T.()->R): R = x.fn()
 
-inline fun test<reified T, reified R>(x: Any, y: Any): Boolean =
+inline fun <reified T, reified R> test(x: Any, y: Any): Boolean =
         x is T && apply(y) { this is R }
 
 fun box(): String {
diff --git a/js/js.translator/testData/reified/cases/extensionMethod.kt b/js/js.translator/testData/reified/cases/extensionMethod.kt
index 6024ef9ad84..a4f85b34362 100644
--- a/js/js.translator/testData/reified/cases/extensionMethod.kt
+++ b/js/js.translator/testData/reified/cases/extensionMethod.kt
@@ -4,11 +4,9 @@ package foo
 // CHECK_NOT_CALLED: fn
 
 class A(val x: Any? = null) {
-    inline
-    fun test<reified T, reified R>(b: B) = b.fn<T, R>()
+    inline fun <reified T, reified R> test(b: B) = b.fn<T, R>()
 
-    inline
-    fun B.fn<reified T, reified R>() = x is T && y is R
+    inline fun <reified T, reified R> B.fn() = x is T && y is R
 }
 
 class B(val y: Any? = null)
diff --git a/js/js.translator/testData/reified/cases/innerObject.kt b/js/js.translator/testData/reified/cases/innerObject.kt
index 0d4d2cb9910..bef73871a96 100644
--- a/js/js.translator/testData/reified/cases/innerObject.kt
+++ b/js/js.translator/testData/reified/cases/innerObject.kt
@@ -9,10 +9,10 @@ class B
 class C : A()
 
 interface TypePredicate {
-    fun invoke(x: Any): Boolean
+    operator fun invoke(x: Any): Boolean
 }
 
-inline fun typePredicate<reified T>(): TypePredicate =
+inline fun <reified T> typePredicate(): TypePredicate =
         object : TypePredicate {
             override fun invoke(x: Any): Boolean = x is T
         }
diff --git a/js/js.translator/testData/reified/cases/lambda.kt b/js/js.translator/testData/reified/cases/lambda.kt
index 8516db4ede7..064c9ae8b6f 100644
--- a/js/js.translator/testData/reified/cases/lambda.kt
+++ b/js/js.translator/testData/reified/cases/lambda.kt
@@ -25,7 +25,7 @@ fun <T> Array<T>.doFilter(fn: (T)->Boolean): List<T> {
     return filtered
 }
 
-inline fun<reified T> filterIsInstance(arrayOfAnys: Array<Any>): List<T> {
+inline fun <reified T> filterIsInstance(arrayOfAnys: Array<Any>): List<T> {
     return arrayOfAnys.doFilter { it is T }.map { it as T }
 }
 
diff --git a/js/js.translator/testData/reified/cases/lambdaNameClash.kt b/js/js.translator/testData/reified/cases/lambdaNameClash.kt
index 905d07e2df6..12f529d883b 100644
--- a/js/js.translator/testData/reified/cases/lambdaNameClash.kt
+++ b/js/js.translator/testData/reified/cases/lambdaNameClash.kt
@@ -6,9 +6,9 @@ package foo
 class X
 class Y
 
-fun doRun<R>(fn: ()->R): R = fn()
+fun <R> doRun(fn: ()->R): R = fn()
 
-inline fun test<reified A, reified B>(x: Any, y: Any): Boolean =
+inline fun <reified A, reified B> test(x: Any, y: Any): Boolean =
         doRun {
             val isA = null
             x is A
diff --git a/js/js.translator/testData/reified/cases/method.kt b/js/js.translator/testData/reified/cases/method.kt
index 41bb3363031..f240ea9bc9e 100644
--- a/js/js.translator/testData/reified/cases/method.kt
+++ b/js/js.translator/testData/reified/cases/method.kt
@@ -3,8 +3,7 @@ package foo
 // CHECK_NOT_CALLED: test
 
 class A(val x: Any? = null) {
-    inline
-    fun test<reified T>() = x is T
+    inline fun <reified T> test() = x is T
 }
 
 class B
diff --git a/js/js.translator/testData/reified/cases/multipleTypeParameters.kt b/js/js.translator/testData/reified/cases/multipleTypeParameters.kt
index aef387f85cd..b8c21207c90 100644
--- a/js/js.translator/testData/reified/cases/multipleTypeParameters.kt
+++ b/js/js.translator/testData/reified/cases/multipleTypeParameters.kt
@@ -4,7 +4,7 @@ class X
 class Y
 class Z
 
-inline fun test<reified A, B, reified C>(x: Any): String =
+inline fun <reified A, B, reified C> test(x: Any): String =
         when (x) {
             is A -> "A"
             is C -> "C"
diff --git a/js/js.translator/testData/reified/cases/noValueParameters.kt b/js/js.translator/testData/reified/cases/noValueParameters.kt
index a0b424c0f02..1e99f7c4669 100644
--- a/js/js.translator/testData/reified/cases/noValueParameters.kt
+++ b/js/js.translator/testData/reified/cases/noValueParameters.kt
@@ -4,7 +4,7 @@ package foo
 
 class A
 
-inline fun test<reified T>(): String {
+inline fun <reified T> test(): String {
     val a: Any = A()
 
     return if (a is T) "A" else "Unknown"
diff --git a/js/js.translator/testData/reified/cases/parameterSwap.kt b/js/js.translator/testData/reified/cases/parameterSwap.kt
index f90628a66f6..689823cdd52 100644
--- a/js/js.translator/testData/reified/cases/parameterSwap.kt
+++ b/js/js.translator/testData/reified/cases/parameterSwap.kt
@@ -4,9 +4,9 @@ class A
 class B
 class C
 
-inline fun test<reified T, reified R>(x: Any): String = test1<R, T>(x)
+inline fun <reified T, reified R> test(x: Any): String = test1<R, T>(x)
 
-inline fun test1<reified R, reified T>(x: Any): String =
+inline fun <reified R, reified T> test1(x: Any): String =
     when (x) {
         is R -> "R"
         is T -> "T"
diff --git a/js/js.translator/testData/reified/cases/vararg.kt b/js/js.translator/testData/reified/cases/vararg.kt
index 2c63b96a39c..9076823ccc9 100644
--- a/js/js.translator/testData/reified/cases/vararg.kt
+++ b/js/js.translator/testData/reified/cases/vararg.kt
@@ -5,8 +5,7 @@ package foo
 class A(val x: Int)
 class B(val x: Int)
 
-inline
-fun test<reified T>(vararg xs: Any): List<T> {
+inline fun <reified T> test(vararg xs: Any): List<T> {
     val ts = arrayListOf<T>()
 
     for (x in xs) {
diff --git a/js/js.translator/testData/webDemoExamples2/cases/builder.kt b/js/js.translator/testData/webDemoExamples2/cases/builder.kt
index 682a5732f64..c2c13d72a4e 100644
--- a/js/js.translator/testData/webDemoExamples2/cases/builder.kt
+++ b/js/js.translator/testData/webDemoExamples2/cases/builder.kt
@@ -65,7 +65,7 @@ abstract class Tag(val name: String) : Element() {
     val children = ArrayList<Element>()
     val attributes = HashMap<String, String>()
 
-    protected fun initTag<T : Element>(tag: T, init: T.() -> Unit): T {
+    protected fun <T : Element> initTag(tag: T, init: T.() -> Unit): T {
         tag.init()
         children.add(tag)
         return tag
@@ -89,7 +89,7 @@ abstract class Tag(val name: String) : Element() {
 }
 
 abstract class TagWithText(name: String) : Tag(name) {
-    fun String.plus() {
+    operator fun String.unaryPlus() {
         children.add(TextElement(this))
     }
 }
diff --git a/libraries/stdlib/test/collections/ArraysTest.kt b/libraries/stdlib/test/collections/ArraysTest.kt
index ac30edcbe21..4b7c33afdad 100644
--- a/libraries/stdlib/test/collections/ArraysTest.kt
+++ b/libraries/stdlib/test/collections/ArraysTest.kt
@@ -945,7 +945,7 @@ class ArraysTest {
 
     @test fun sortedWith() {
         val comparator = compareBy { it: Int -> it % 3 }.thenByDescending { it }
-        fun arrayData<A, T>(array: A, comparator: Comparator<T>) = ArraySortedChecker<A, T>(array, comparator)
+        fun <A, T> arrayData(array: A, comparator: Comparator<T>) = ArraySortedChecker<A, T>(array, comparator)
 
         arrayData(intArrayOf(0, 1, 2, 3, 4, 5), comparator)
                 .checkSorted<List<Int>>( { sortedWith(comparator) }, { sortedWith(comparator.reversed()) }, { iterator() })