diff --git a/plugins/kotlin/completion/tests/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt b/plugins/kotlin/completion/tests/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt
index 5cb9a27ff29e..ca0574ede4a7 100644
--- a/plugins/kotlin/completion/tests/testData/basic/common/typeArgsOrNot/FunctionTypeArg2.kt
+++ b/plugins/kotlin/completion/tests/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/plugins/kotlin/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/after.kt.template b/plugins/kotlin/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/after.kt.template
index 8701c8a293ff..664aea0983e5 100644
--- a/plugins/kotlin/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/after.kt.template
+++ b/plugins/kotlin/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/plugins/kotlin/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/before.kt.template b/plugins/kotlin/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/before.kt.template
index f869e201a8f2..3e919e0b0976 100644
--- a/plugins/kotlin/idea/resources/intentionDescriptions/InsertExplicitTypeArgumentsIntention/before.kt.template
+++ b/plugins/kotlin/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/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt
index 78245e3cf03a..22283872c4f3 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt
+++ b/plugins/kotlin/idea/tests/test/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/plugins/kotlin/idea/tests/testData/compiler/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt b/plugins/kotlin/idea/tests/testData/compiler/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt
index 9b901d2eede3..9599e3169cba 100644
--- a/plugins/kotlin/idea/tests/testData/compiler/loadJava/compiledKotlin/nested/membersReferenceOuterTP.kt
+++ b/plugins/kotlin/idea/tests/testData/compiler/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/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt b/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt
index ad7681667c30..bdc5b88848dc 100644
--- a/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt b/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
index d6f4ba36af97..db183086b132 100644
--- a/plugins/kotlin/idea/tests/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/diagnosticMessage/typeMismatchWithNothing.kt b/plugins/kotlin/idea/tests/testData/diagnosticMessage/typeMismatchWithNothing.kt
index 2d15094f53be..f6dc03ca3398 100644
--- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/typeMismatchWithNothing.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/diagnosticMessage/upperBoundViolated.kt b/plugins/kotlin/idea/tests/testData/diagnosticMessage/upperBoundViolated.kt
index 911ff178dc6c..1bf033ff2b4d 100644
--- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/upperBoundViolated.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt
index d52013e5f853..2ef2bde3f341 100644
--- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/indentationOnNewline/FunctionBlock.after.kt b/plugins/kotlin/idea/tests/testData/indentationOnNewline/FunctionBlock.after.kt
index f7b57785a174..0791f23c5321 100644
--- a/plugins/kotlin/idea/tests/testData/indentationOnNewline/FunctionBlock.after.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/indentationOnNewline/FunctionBlock.kt b/plugins/kotlin/idea/tests/testData/indentationOnNewline/FunctionBlock.kt
index c65baae700df..d76f1935dae3 100644
--- a/plugins/kotlin/idea/tests/testData/indentationOnNewline/FunctionBlock.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/inspections/cleanup/cleanup.kt b/plugins/kotlin/idea/tests/testData/inspections/cleanup/cleanup.kt
index 6f38337bca0e..201b3b2f8ac8 100644
--- a/plugins/kotlin/idea/tests/testData/inspections/cleanup/cleanup.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForDoWhile.kt b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForDoWhile.kt
index 4900e987b5b8..2317e09b3f1a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForDoWhile.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForDoWhile.kt.after b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForDoWhile.kt.after
index f9971272bd21..b97cbfe36cfa 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForDoWhile.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForElse.kt b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForElse.kt
index 094ca1778129..08e123582631 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForElse.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForElse.kt.after b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForElse.kt.after
index b8e40aac0128..1eaf4670a1de 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForElse.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForFor.kt b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForFor.kt
index 0b50ba21cc76..711b7e4984f6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForFor.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForFor.kt.after b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForFor.kt.after
index 428d0f7e3cff..f5a644a8c86e 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForFor.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIf.kt b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIf.kt
index f93fefd6f7fb..9c96e8fb9bd1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIf.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIf.kt.after b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIf.kt.after
index 5b85659678b6..07b52f924404 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIf.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt
index 4e2ebebcd5dc..46d6893d2fa1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt.after b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt.after
index 7c4ab49c01bf..1e229495f00c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt
index 7963225e1634..417d6ad6c258 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt.after b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt.after
index 7c4ab49c01bf..1e229495f00c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForWhile.kt b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForWhile.kt
index 785b0a2f2509..2fed02b479e6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForWhile.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForWhile.kt.after b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForWhile.kt.after
index 8e27e22383e0..1a7370da25a6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesForWhile.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesWithBraces.kt b/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesWithBraces.kt
index ca5c54a7c888..cff533fef29d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/addBraces/addBracesWithBraces.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt
index 5be1951f3f59..731503af1686 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after
index afff1fab5494..710de7122863 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt
index a527cb919340..8cfeea3c4d9c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after
index e8e65a034fff..73a534a1f13d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt
index ce72b6f06b81..88185ab3d3aa 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt
index fff38dfc1463..9e66b34aa9f5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt
index b6776ac92d41..a5994e9529ba 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt
index 95a81bc5d77f..a25f0f5f14bf 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after
index 91b297361d6f..c9c258f23787 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt
index f666928030fe..930abde10a5f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after
index d14f08b85d28..66348d42ee1e 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt
index f37bcbeededd..a53c3e1b9faa 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after
index 479577c1082f..2438c560ae36 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt
index df895de95672..cf8e5f34e675 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after
index 91fcdde37d27..e3f66801cc99 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt
index 6a9a40a4e3f1..f22f0f51d37e 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after
index 6c7427fe0a62..f63ab8d7fc73 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt
index ccbe6641b908..98e8e4dbab8f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt
index e3613d8de2f1..f37e9167cf04 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt
index e5702c3bbdb4..a9fffea7f172 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt
index d3882bbff042..9cb66cc03293 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after
index 8c966e99e4e6..47fc668f3e5f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt
index 19af196ec037..356f6c134e37 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after
index 76d6c9097222..63b1334375e6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt
index 586ea73522b5..3e463b646dac 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt
index 5d9d5ceec37d..87d787fe9b2d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt.after
index b9051f282fee..7b65e62c5334 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt
index aea116a80c5a..3149eb67e733 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt
index e46f095b4944..aeb301bc42f3 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt
index 728bc651f0d4..b22fa103b290 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt.after
index 1333ac3b9879..a91271abfe41 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt
index 355382ecf922..067df13e6d35 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt
index 9bfdab5a00eb..a219947c0d3f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after
index 83148aeeb5d2..14c9f9bb3446 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt
index 854d092e4b96..23d9d5ce1373 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt.after
index f51978ee6a4f..078377297dde 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt
index e3d5106731e7..fbe44928cb64 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after
index 442b699eb878..ef41055be6e5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt
index cda046018dd5..edfd237342d5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt.after
index 6e492136395a..1c774c3e44a8 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt
index 7993bb0bb8c4..2f0fae7aa8d3 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after
index 7d53cbd7e579..cb4c856afbe9 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt
index afff1fab5494..710de7122863 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after
index 5be1951f3f59..731503af1686 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt
index 57df8cfe368b..aea5a5bda1ae 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after
index 1d1f26b3b72e..589177fd53c0 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt
index e8e65a034fff..73a534a1f13d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after
index a527cb919340..8cfeea3c4d9c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt
index c86fecce7360..49301b4b50c3 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after
index 7fd5d6b64b4e..b185073652a5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt
index 6c7427fe0a62..f63ab8d7fc73 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after
index 6a9a40a4e3f1..f22f0f51d37e 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt
index e2e76858a2ec..c0a704f16c06 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt.after
index 45f7ea817a96..c1a9e0ebbb61 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt
index d0581293898f..b51d4287aae4 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt.after
index 46297e53a93d..7706a4e0dc74 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt
index 78282f4d6768..9fdd50879a6a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after
index ddfcae39357b..f83b9af48e05 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt
index 8b9351efbba1..4e13d00b3405 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after
index 8ddbde32ec9d..59cea0ab1dae 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt
index bab2b2436cae..05c5a8bc1789 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after
index b65b8b621e14..7e52fe89d074 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt
index b69d6d669ab4..7c3ea3bd0b65 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after
index e9df13c30a75..f7702f06d6e6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt
index 91b297361d6f..c9c258f23787 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt.after
index 95a81bc5d77f..a25f0f5f14bf 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt
index d14f08b85d28..66348d42ee1e 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after
index f666928030fe..930abde10a5f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt
index 8c966e99e4e6..47fc668f3e5f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after
index d3882bbff042..9cb66cc03293 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt
index 932ced101afb..4c1c4e3757ca 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after
index e3bd3b965506..63f39fdd8a8e 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt
index 78cf776a7dae..364103d455f7 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt.after
index 952cb7db6a75..1e14b4a8031c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt
index 14b91aa966d8..134ae7246dc6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt.after
index b60336e64105..4815e1ecf548 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt
index ed9dd646a5f4..e4e78d9a4000 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithDeclarations.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithDeclarations.kt
index 5bd53a61ceb9..6928da5636b5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithDeclarations.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithDeclarations.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithDeclarations.kt.after
index 9789f4849dbd..38fdbeb9ad9f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithDeclarations.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt
index 5c1bce29b467..da7769f502b3 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt.after
index bf510850dfc8..f9924f113c69 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt
index cd73245bbfc4..bd4909d52392 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithSubject.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithSubject.kt
index 8a79481ae9de..db7c781adf7d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithSubject.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithSubject.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithSubject.kt.after
index 223c0e1e9d9a..9cec4359dce4 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithSubject.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt
index 004e860f3d06..8ecea672fa88 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt
index dbad7590056a..5126bc323a56 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt
index cd46ac10c630..727794afbbe7 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt
index b6ad4ac53af1..a9643f655c05 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt
index 6415b952bb86..021083974eaf 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt
index db7b74b663c9..f65d41ce69dc 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt
index 4d87fac25244..fa67b9cd54b2 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt
index 44c65ce7b368..509350a24be5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt
index 178730ace8e4..f30762b76f38 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithVarSubject.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithVarSubject.kt
index a13894f4267d..c17d394e7873 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithVarSubject.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithoutSubject.kt b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithoutSubject.kt
index 13c5aaacb34b..e12a1205b9f7 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithoutSubject.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithoutSubject.kt.after b/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithoutSubject.kt.after
index 8eab31f8ca2b..3ee3d8a0472f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/branched/when/merge/mergeWithoutSubject.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt
index c13036ac3922..f0f52f026a27 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceCallWithBinaryOperator/typeArguments.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt
index 9665a4173fa4..beed0bb2509c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt.after b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt.after
index d293e3667137..6a05f6c696d8 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/containsInExpression.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt
index 961e739985aa..17533f219787 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt.after b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt.after
index 363e6849ba04..16b811206581 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/functionLiteralArgumentInExpression.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt
index 39f74eb1e4a4..ca9c2f4b3768 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt.after b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt.after
index 4828a41496d5..4fb335ce5532 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt
index baebf7ce4e68..e7959e6b75d6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt.after b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt.after
index 923166266404..6e14a539cce5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/invokeInExpression.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt
index 63e08dd92124..972de8a215c2 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt.after b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt.after
index 113d946fbffc..4117619dcfba 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeAndValueArgument.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt
index 9df69867bd01..9548fc085457 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt.after b/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt.after
index 0999a897c0d9..4f086e49fff7 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/conventionNameCalls/replaceInvoke/typeArgumentAndFunctionLiteral.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/convertFunctionToProperty/typeArgumentsConflict.kt b/plugins/kotlin/idea/tests/testData/intentions/convertFunctionToProperty/typeArgumentsConflict.kt
index cf42391def9b..55db4ab00a6f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/convertFunctionToProperty/typeArgumentsConflict.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt
index dd69095a2fa5..fc9c469f9d24 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt.after b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt.after
index 86d4f0d8d760..c1ee18f60973 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt
index 0cfadfc44db2..fc870620ca03 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt.after b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt.after
index 0142c812862b..ac6c26ebb881 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableAlreadyTyped.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableAlreadyTyped.kt
index 26147a049d58..cb7917b6a60c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableAlreadyTyped.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable.kt
index 42c5b485a4e1..661c9cc6ffab 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable2.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable2.kt
index f957e1f7e109..ede07bf59e8c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableTypeNotInferred.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableTypeNotInferred.kt
index 9bc2762c86e5..9509863d5e0a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/inapplicableTypeNotInferred.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt
index 94c73859b6fc..53abcb95f9a8 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt.after b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt.after
index 029031a8c263..4591c77a456a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt
index e907215349a4..4074a080db95 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt.after b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt.after
index 5e7b8dfcf7f8..deaef1e68b35 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt
index 4da6ef543dea..2ce53ce16bb3 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after
index 846ca07191a4..e508a818b122 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt
index 96926081ab6d..f5d03bc4e8f6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt.after b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt.after
index e2703a4cb298..c4288a141085 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt
index 8a8a127cdc56..e72357c5c757 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt.after b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt.after
index 9097a01730e3..036d913a1694 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt
index a83d91a36bb3..591a9e79bee0 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt.after b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt.after
index c1753292167e..78e7f23d98e1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt
index 73db0cc5bcbb..c199917d8d5c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after
index 052f9e58f840..93957b340dfc 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt
index de35ce1f3908..5c0412ee2f06 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt.after b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt.after
index 0f2f823020e2..9e54b5848511 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt
index 0219fa09cda4..7ca48d44bd82 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt.after b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt.after
index 7edbe6123d69..abf1b09082df 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt
index 5f8b5de4fa4b..c6a8ac3eacd2 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt.after b/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt.after
index d1686744c406..f732f02a6504 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/inapplicable2.kt b/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/inapplicable2.kt
index c9e444d2a11c..9f9656fee286 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/inapplicable2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt b/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt
index a6b03b8d32ea..45216f242dc8 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt.after b/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt.after
index 81dd0dfcf8e8..f37e69f5b299 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt b/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt
index 0125985af4a5..ee575a4af815 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt.after b/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt.after
index 4e26428259e9..79bf8e0a9ae6 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt b/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt
index 308533a5e93c..6532abc217d1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt.after b/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt.after
index 33af82989f56..c731afa0778b 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/moveLambdaOutsideParentheses/inapplicable2.kt b/plugins/kotlin/idea/tests/testData/intentions/moveLambdaOutsideParentheses/inapplicable2.kt
index c9e444d2a11c..9f9656fee286 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/moveLambdaOutsideParentheses/inapplicable2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/moveLambdaOutsideParentheses/inapplicable3.kt b/plugins/kotlin/idea/tests/testData/intentions/moveLambdaOutsideParentheses/inapplicable3.kt
index dd839bbed95b..8f4cf08e1ca2 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/moveLambdaOutsideParentheses/inapplicable3.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/doWhile.kt b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/doWhile.kt
index 66c2f0b39cc7..26b0368ef058 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/doWhile.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/doWhile.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/doWhile.kt.after
index b0b5c104ad6b..592e1bc80531 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/doWhile.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/doWhileWithTwoStatements.kt b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/doWhileWithTwoStatements.kt
index 32188f51cff1..22afd8b3002a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/doWhileWithTwoStatements.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/else.kt b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/else.kt
index 47c02397c9ea..05abdc6123c1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/else.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/else.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/else.kt.after
index 5b85659678b6..07b52f924404 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/else.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/for.kt b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/for.kt
index 36bb446f12fe..78d78bd92d75 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/for.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/for.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/for.kt.after
index 059301253511..bb89631c0c49 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/for.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/if.kt b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/if.kt
index 1fec3b66c2fb..33385bb6aa9b 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/if.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/if.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/if.kt.after
index e1dd424c9463..b68f4dd50e61 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/if.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithComment.kt b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithComment.kt
index 801f06d30ae3..4ba57395cb21 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithComment.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithComment.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithComment.kt.after
index 538aae35e4fa..0a243781a1c1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithComment.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithSemicolon.kt b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithSemicolon.kt
index b292cdda0270..2922884339ba 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithSemicolon.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithSemicolon.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithSemicolon.kt.after
index e1dd424c9463..b68f4dd50e61 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithSemicolon.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithTwoStatements.kt b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithTwoStatements.kt
index a7f1bb1a9fa3..717c824e0de0 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/ifWithTwoStatements.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/while.kt b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/while.kt
index bfefbdeaca83..cca07cfc9b53 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/while.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/while.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/while.kt.after
index 607d50e60070..77e6064ba7e1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/while.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeBraces/whileWithTwoStatements.kt b/plugins/kotlin/idea/tests/testData/intentions/removeBraces/whileWithTwoStatements.kt
index 8a9aeb861b25..8829f2ed6782 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeBraces/whileWithTwoStatements.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt
index 1d209446456e..bfb0b48bcfd1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt.after
index 16df8e6bf22b..a68c40507b61 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt
index 0c3587295097..8f0a1f4ffb95 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/lambdaType.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/lambdaType.kt
index f0668c8ac988..584bd1bd5692 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/lambdaType.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/lambdaType.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/lambdaType.kt.after
index ab92606d5c7f..9f4e94516622 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/lambdaType.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/literalString.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/literalString.kt
index e457ba564bb3..c3367a42710d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/literalString.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/literalString.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/literalString.kt.after
index ee0866d36e43..725c41346025 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/literalString.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferred.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferred.kt
index 870090562b7f..9604bab7f200 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferred.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt
index 6f073a228c3d..8fc38d2826ac 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt.after
index f81cbd23dc1b..7fa9beaa3005 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString.kt
index 117371cd4b9e..38347aad56ad 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString.kt.after
index d00a006e5c06..bba4e54dc62f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString2.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString2.kt
index d8aaba0eab6f..c9010fb775af 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString2.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString2.kt.after
index 52f8dcca2668..bae78b075071 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableString2.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt
index f6f85d02be8c..f68f85c73bc2 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt.after
index bcb961e48275..ed272cf2ab40 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt
index 411eb4909b86..7d4b9c26fc1f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt.after b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt.after
index 0e4e97d6a64d..18d584d1e5bc 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt b/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt
index d0d3a7c2ff08..e56814e1f430 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt.after b/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt.after
index f976c977dc95..bf37b3e51bc0 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt b/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt
index ee7a7faceba3..0c013532de7a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt.after b/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt.after
index 30e6e65a7158..49cc0247a024 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_alreadyUsesImplicitIt.kt b/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_alreadyUsesImplicitIt.kt
index c85d05dccd73..04bac500530d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_alreadyUsesImplicitIt.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_wrongPosition.kt b/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_wrongPosition.kt
index ca84c7603569..8ceca36868bc 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_wrongPosition.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt b/plugins/kotlin/idea/tests/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt
index e0e27a8cf1be..5f5170cab3cd 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt.after b/plugins/kotlin/idea/tests/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt.after
index 502116cd9df0..ea9289e81e61 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/and.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/and.kt
index dab4ce249c9f..f718d9b78543 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/and.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/and.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/and.kt.after
index 45131d41cf6e..26551f72bdf4 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/and.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/caretOnIf.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/caretOnIf.kt
index 0a65d3bf7d77..52393f9b67b5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/caretOnIf.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/caretOnIf.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/caretOnIf.kt.after
index fd252316578e..a3c074b080d0 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/caretOnIf.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndOr.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndOr.kt
index acdcc69e467d..af83273704bd 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndOr.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndOrWithBraces.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndOrWithBraces.kt
index 44c1b6e93f57..83d747548d43 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndOrWithBraces.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndOrWithBraces.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndOrWithBraces.kt.after
index df9fd318d5da..4cfcac95abba 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndOrWithBraces.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndWithBraces.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndWithBraces.kt
index 97c2d46967e1..8db0f85170bf 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndWithBraces.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndWithBraces.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndWithBraces.kt.after
index 85257391c652..6c1bb9033c17 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifAndWithBraces.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifWithElse.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifWithElse.kt
index 0e47c4c01801..b378b4359ea3 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifWithElse.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifWithElse.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifWithElse.kt.after
index 77d455c651fd..1d4ea68cafd2 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/ifWithElse.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/twoOperators.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/twoOperators.kt
index 1aea329656c6..7a521458ef4b 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/twoOperators.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/twoOperators.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/twoOperators.kt.after
index 64a9dfdd54de..e5cd57f4852c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/twoOperators.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withAnd.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withAnd.kt
index 79db15473db9..dab603833d1f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withAnd.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withAnd.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withAnd.kt.after
index a1b166a8dfd5..3b37fa126107 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withAnd.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withOR.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withOR.kt
index 94e3ef22f0e4..bb1b3b75b4fe 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withOR.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withOR.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withOR.kt.after
index 6655bfe7554d..209733af1114 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/keepComments/withOR.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/localFunction.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/localFunction.kt
index dde44982d65f..00937d48f65d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/localFunction.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/localFunction.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/localFunction.kt.after
index 8c178396aea5..5632358b5183 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/localFunction.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIf.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIf.kt
index c2d296ea0d8d..23177c697c7c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIf.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIf.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIf.kt.after
index ef1618e58749..0ced6156313c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIf.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIfNotApplicable.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIfNotApplicable.kt
index ba68cd50cf5c..8df379e1f986 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIfNotApplicable.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIfOutside.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIfOutside.kt
index 487857e33da1..d52f797de7ba 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIfOutside.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIfOutside.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIfOutside.kt.after
index a5301be50cab..69d8deffad55 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedIfOutside.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedInside.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedInside.kt
index b2bcc2361a81..4baf0adfef94 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedInside.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedInside.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedInside.kt.after
index 4d8ee82c7468..deb1aa4ff169 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/nestedInside.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/notIf.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/notIf.kt
index c8a6aef59542..ba50b58dfc31 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/notIf.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/onIfWithOr.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/onIfWithOr.kt
index 3c9a241f2a9c..262707e1079a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/onIfWithOr.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/onIfWithOr.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/onIfWithOr.kt.after
index 77bc8da7498d..b41f644e6162 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/onIfWithOr.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/operatorAsFunctionParam.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/operatorAsFunctionParam.kt
index 8d56c463f7a4..ed6caa6c1843 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/operatorAsFunctionParam.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/orAnd.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/orAnd.kt
index 65860b46f9a6..4a09638be709 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/orAnd.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/orAnd.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/orAnd.kt.after
index 1dffa0d23a7b..44aa6d03bff5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/orAnd.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/orWithBraces.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/orWithBraces.kt
index dc7b5168b83d..45832de9cbab 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/orWithBraces.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/orWithBraces.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/orWithBraces.kt.after
index 6519bba8ef62..3e2731d34d1a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/orWithBraces.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsFirst.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsFirst.kt
index 08250fc0f117..aa6028358cae 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsFirst.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsFirst.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsFirst.kt.after
index 7dd2477a21b5..5cdc9051de99 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsFirst.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsSecond.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsSecond.kt
index 95c87ea75c43..3958b2e86b85 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsSecond.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsSecond.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsSecond.kt.after
index 89d63a30f0cf..ac9c0fb39bfd 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/twoOperatorsSecond.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/withNotOperator.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/withNotOperator.kt
index f0d833be6d92..055f87fa1bae 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/withNotOperator.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/withNotOperatorGood.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/withNotOperatorGood.kt
index 732f5ed667a7..fc18dab10c33 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/withNotOperatorGood.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/withNotOperatorGood.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/withNotOperatorGood.kt.after
index 03b3bd93052b..693dad7b99d0 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/withNotOperatorGood.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/withOR.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/withOR.kt
index e5254cceebfa..20072b6f7147 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/withOR.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/withOR.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/withOR.kt.after
index 1714ad7a482a..b3e5b3ed1e0c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/withOR.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/withORElse.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/withORElse.kt
index 791f5a1e0751..7cc23b79043b 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/withORElse.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/withORElse.kt.after b/plugins/kotlin/idea/tests/testData/intentions/splitIf/withORElse.kt.after
index 013622f68a92..324874589a0b 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/withORElse.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/splitIf/wrongCaretLocation.kt b/plugins/kotlin/idea/tests/testData/intentions/splitIf/wrongCaretLocation.kt
index fa8bda2a447d..b97f9284f820 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/splitIf/wrongCaretLocation.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/in.kt b/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/in.kt
index 9cc11021d8b8..43332278f706 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/in.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/is.kt b/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/is.kt
index b10f9235e3bd..4752f2d22dc4 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/is.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/nonBinaryExpr.kt b/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/nonBinaryExpr.kt
index 55a8f7e86d54..9c7f0942f32a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/nonBinaryExpr.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/notIn.kt b/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/notIn.kt
index c151152da0cd..907b3898e712 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/notIn.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/notIs.kt b/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/notIs.kt
index a90e09efb920..f0009995018d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/swapBinaryExpression/notIs.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt b/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt
index 9f58562a0bfe..aa8fd1722754 100644
--- a/plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/JvmOverloadsFunctions.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt
index ae6baeccdf9c..3dc1b27934da 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after
index ae6baeccdf9c..3dc1b27934da 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/addStarProjections/javaClass/fooOfC2.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt
index accd066cf1f5..389b38ee0b91 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt.after
index 2e85934058b4..29a5a20b0434 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callInLambda.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.after.kt
index 78a9c9da881a..664f751c922f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.after.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.Main.kt
index a42b78522080..f3693e904d2b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericJavaReceiver.before.Main.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt
index 097d588c95a4..d57cb6610263 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt.after
index af2d70f686a0..8f08d4a0957e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createClass/callExpression/callWithGenericReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt
index c497191d6ad7..38c0565681b1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
index df90572e0635..e70ecc18b135 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt
index 3f6de74e7b33..2cc630cc9984 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
index baf44dc4a2c8..a377ae1309c5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt
index aaafee40bfd5..adb2b0f1251c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
index 866cf2a002eb..885f9043da0e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt
index 41f2668ea8f5..2a0f05f9f196 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
index c8cc9441f926..fc56c7101155 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt
index fec12102f473..433ff038cd87 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
index 1c737b4a6355..33ececf9fc5f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt
index 53739f728097..01f4e70144c1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt.after
index a42704bc485b..3fac93bee986 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInClass.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt
index bf1af0d47542..9c43c4d8a410 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt.after
index 3c6b6e394f6d..3253b9858b6c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/parameter/inGenFunInGenClass.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt
index f7f29f66db03..63dfb149e73e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after
index c20284cf6e83..e47fab7d2495 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnUserTypeWithTypeParams.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
index 55b12a520be5..65a9f06d3c87 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
index 9c7196dc3867..0c3c9b5a2bcd 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnType.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
index cd4342cced8e..014434ffcc7c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
index 32333dbbcd4f..477b804e7957 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeAddition/publicValWithoutReturnTypeCaretOnPublic.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeImports/hasThisImport.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeImports/hasThisImport.kt
index 891f584aa1fe..ae6ca45d928f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeImports/hasThisImport.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeImports/hasThisImport.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeImports/hasThisImport.kt.after
index 86f8eec70513..2aca92b0d689 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeImports/hasThisImport.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeImports/toImport1.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeImports/toImport1.kt
index 64a4fb36ba34..19b9725c688c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeImports/toImport1.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeImports/toImport1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeImports/toImport1.kt.after
index b51ac42f8173..639423f5d099 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeImports/toImport1.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/resolvableTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/resolvableTypeParams.kt
index 7d13d0a25586..4b9345cafbd9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/resolvableTypeParams.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/resolvableTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/resolvableTypeParams.kt.after
index 6a133cbca8b3..dd6fdccb1e5e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/resolvableTypeParams.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/unresolvableTypeParams.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/unresolvableTypeParams.kt
index 228a661c210a..c324ccac8cc6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/unresolvableTypeParams.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/unresolvableTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/unresolvableTypeParams.kt.after
index dd6e8a72fce1..d96fbb7e64e8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/unresolvableTypeParams.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt
index 8f45686d3d8e..f1ab8642a724 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after
index 9c334dfde6d4..c040ad6d78c3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/projectionOnNonClassTypeArgument1.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt
index fde203cebcf5..4e83c7e04d30 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt.after
index f78228ccd66d..2bf512c5f5d0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeProjection/removeVariance.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericFunctionsAfter.kt b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericFunctionsAfter.kt
index 2e4f7d2f2a0d..6aa03f0fab49 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericFunctionsAfter.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericFunctionsBefore.kt b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericFunctionsBefore.kt
index a537b2620e33..c2dda3fbbf5f 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericFunctionsBefore.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericsWithOverridesAfter.kt b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericsWithOverridesAfter.kt
index fb3fb80ac38c..ab96ec19cf1a 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericsWithOverridesAfter.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericsWithOverridesBefore.kt b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericsWithOverridesBefore.kt
index a6adba21e93f..91bcc3994d40 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/GenericsWithOverridesBefore.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersAfter.kt b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersAfter.kt
index 21e5850452aa..15994bf27c4b 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersAfter.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersBefore.kt b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersBefore.kt
index f7708096a745..224c4c0a2c38 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/OverrideInAnonymousObjectWithTypeParametersBefore.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt
index 72a809933509..b5cd0559e41a 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after
index 668f719a5d7a..78711621b2ca 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/genericPair.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/localClassInBound.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/localClassInBound.kt
index 0d299f151ce4..3de61ce89422 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/localClassInBound.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/localClassInTypeConstraint.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/localClassInTypeConstraint.kt
index b70d918ef344..de09a858f904 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/localClassInTypeConstraint.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt
index 923c22caff6e..a96c4b37826c 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after
index 1bb6ac53bbb7..2780fbb593e8 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt
index feb5de1e85a4..9a65725f8be5 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after
index 6c34363ad4b7..9cdd5ab9442c 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt
index 3eb3e5e0806c..e19576c08171 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt.after
index 4a83ac6716ec..af96506b9f6b 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRef.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt
index e12202196e18..65a26fa47c53 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt.after
index 062cee227644..93891a3a8364 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParameterRefCanOmit.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt
index 3c36bb644fd1..36534f1bdff1 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
index 4cbe0f2f219d..044316a52600 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt
index 4a5923086dfe..50c3aa2a5f82 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after
index 57a6f57a147c..3cdd61e08d2d 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt
index cfd591774e09..8547fb407f8e 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after
index 58a34cf4dc66..5db708dbd770 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt
index 32ce5bd3004c..85f11eeaafe2 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
index 81f0d1fc6b0f..fb2dd4e20a15 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt
index 46f331dc2c99..731462bf7e74 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after
index cc41b3afe352..c2f6bc9440f3 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt
index c2fcc37073f8..3dffc8297e17 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after
index 0ff43a3d75fe..553eae059511 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt
index 5445c2118bf7..0553f79ed3c0 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
index 5faae6015fa7..fcf88c261b1d 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt b/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt
index 0e735e241dba..6b7e5bea1518 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt.after
index 4a64013a1561..b26204b4ce4f 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2j/fromClassToClassWithGenerics.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt b/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt
index 8891cdc09605..b42f59241099 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt.after
index 81a7e071b756..ac2efb4d6cb9 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/pullUp/k2k/fromClassToClassWithGenerics.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt b/plugins/kotlin/idea/tests/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt
index 7fd9445f5a81..b563463564a9 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt.after
index b8ddd79f29c2..db2466372b11 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/pushDown/pushClassMembersWithGenerics.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamer/after/lib.kt b/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamer/after/lib.kt
index f738e66d130b..7c2d535bbdae 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamer/after/lib.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamer/before/lib.kt b/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamer/before/lib.kt
index f738e66d130b..7c2d535bbdae 100644
--- a/plugins/kotlin/idea/tests/testData/refactoring/rename/automaticRenamer/before/lib.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt
index 325c97bce442..4dc71c2d245c 100644
--- a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt
index 40c23733c3f4..5d5287edac68 100644
--- a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after
index 4a8974a37bb8..8214b99cc905 100644
--- a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt.after
@@ -1,5 +1,5 @@
 class A<X> {
-    fun foo<Z>() {
+    fun <Z> foo() {
 
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt
index 6290ec9452f6..7209cde6dc9c 100644
--- a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after
index 8e5042316a41..14e3dac7c97a 100644
--- a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after
+++ b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt.after
@@ -1,5 +1,5 @@
 class A<X> {
-    fun foo<Y>() {
+    fun <Y> foo() {
 
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt
index fec914237a2d..18020b00e413 100644
--- a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt
index b16dedb33431..bfe3adcf49b8 100644
--- a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after
index 8b5f91e83bee..4c6326eda677 100644
--- a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt
index abc255f3b133..4db1da350b8a 100644
--- a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after b/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after
index 92bb08f20f83..b881e3132296 100644
--- a/plugins/kotlin/idea/tests/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt.after
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt b/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt
index 6384fdfebc8f..9bedf65a2ebb 100644
--- a/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt.match b/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt.match
index c653c13cb058..dbdf1d734a20 100644
--- a/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localExtensionFunctions.kt.match
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt b/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt
index 70eff644c7d8..1f3b20900a5b 100644
--- a/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt.match b/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt.match
index 8727d647e10c..2bfc4c3622db 100644
--- a/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/localCallables/localFunctions.kt.match
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt b/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt
index f48e39c1c6a2..846413e35266 100644
--- a/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt.match b/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt.match
index 4102f194c9b0..bd7abf56b1c9 100644
--- a/plugins/kotlin/idea/tests/testData/unifier/equivalence/declarations/typeParameters/boundsAndConstraints.kt.match
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/idea/tests/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt b/plugins/kotlin/idea/tests/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt
index ba54690bf35d..752a6e23f5ee 100644
--- a/plugins/kotlin/idea/tests/testData/unifier/equivalence/expressions/calls/callTypeArgumentsRuntime.kt
+++ b/plugins/kotlin/idea/tests/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/plugins/kotlin/j2k/old/tests/testData/KotlinApi.kt b/plugins/kotlin/j2k/old/tests/testData/KotlinApi.kt
index 3b28da1a69e5..2297aa8f5184 100644
--- a/plugins/kotlin/j2k/old/tests/testData/KotlinApi.kt
+++ b/plugins/kotlin/j2k/old/tests/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()