Fix tests: "Placing function type parameters after the function name" error

idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.kt

@@ -24,9 +24,6 @@ class TypeParams<in T1 : Any, out T2, T3 : (Int) -> Int, T4, T5 : Any?, T6 : T5,
     fun <T1> T1.withOwnParamExtension(p: T1) {
     }
 
-    fun T1.withOwnParamExtensionAfterName<T1>(p: T1) {
-    }
-
     val <G1> G1.withOwnParam: G1
         get() = throw IllegalStateException()
 

idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt

@@ -422,20 +422,3 @@ PsiJetFileStubImpl[package=test]
             USER_TYPE:[isAbsoluteInRootPackage=false]
               REFERENCE_EXPRESSION:[referencedName=kotlin]
             REFERENCE_EXPRESSION:[referencedName=Unit]
-      FUN:[fqName=test.TypeParams.withOwnParamExtensionAfterName, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=true, isExtension=true, isTopLevel=false, name=withOwnParamExtensionAfterName]
-        MODIFIER_LIST:[public final]
-        TYPE_PARAMETER_LIST:
-          TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T1]
-        TYPE_REFERENCE:
-          USER_TYPE:[isAbsoluteInRootPackage=false]
-            REFERENCE_EXPRESSION:[referencedName=T1]
-        VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p]
-            TYPE_REFERENCE:
-              USER_TYPE:[isAbsoluteInRootPackage=false]
-                REFERENCE_EXPRESSION:[referencedName=T1]
-        TYPE_REFERENCE:
-          USER_TYPE:[isAbsoluteInRootPackage=false]
-            USER_TYPE:[isAbsoluteInRootPackage=false]
-              REFERENCE_EXPRESSION:[referencedName=kotlin]
-            REFERENCE_EXPRESSION:[referencedName=Unit]

idea/testData/diagnosticMessage/typeMismatchWithNothing.kt

@@ -5,7 +5,7 @@ package b
 
 interface A<T>
 
-fun infer<T>(a: A<T>) : T {}
+fun <T> infer(a: A<T>) : T {}
 
 fun foo(nothing: Nothing?) {
     val i = infer(nothing)

idea/testData/diagnosticMessage/upperBoundViolated.kt

@@ -4,14 +4,14 @@
 
 package i
 
-fun foo<R, T: List<R>>(r: R, list: T) {}
+fun <R, T: List<R>> foo(r: R, list: T) {}
 
 fun test1(i: Int, collection: Collection<Int>) {
     foo(i, collection) //error
 }
 
 //--------------
-fun bar<V : U, U>(v: V, u: MutableSet<U>) = u
+fun <V : U, U> bar(v: V, u: MutableSet<U>) = u
 
 fun test2(a: Any, s: MutableSet<String>) {
     bar(a, s) //error
@@ -21,7 +21,7 @@ fun test2(a: Any, s: MutableSet<String>) {
 interface A
 class B
 
-fun baz<T: R, R: B>(t: T, r: R) where T: A {
+fun <T: R, R: B> baz(t: T, r: R) where T: A {
 
 }
 

idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt

@@ -1,6 +1,6 @@
 // PSI_ELEMENT: org.jetbrains.kotlin.psi.KtParameter
 // OPTIONS: usages
-fun foo<T>(<caret>t: T): T {
+fun <T> foo(<caret>t: T): T {
     println(t)
     return t
 }

idea/testData/indentationOnNewline/FunctionBlock.after.kt

@@ -1,6 +1,6 @@
 package testing
 
-private fun times<T>(times : Int, body : () -> T) {}
+private fun <T> times(times : Int, body : () -> T) {}
 
 fun main(args: Array<String>) {
     times(3) {

idea/testData/indentationOnNewline/FunctionBlock.kt

@@ -1,6 +1,6 @@
 package testing
 
-private fun times<T>(times : Int, body : () -> T) {}
+private fun <T> times(times : Int, body : () -> T) {}
 
 fun main(args: Array<String>) {
     times(3) {<caret>}

idea/testData/inspections/cleanup/cleanup.kt

@@ -64,7 +64,7 @@ class C {
     fun willBeInfix(i: Int) {}
 }
 
-fun typed<T>() {
+fun <T> typed() {
 }
 
 fun <T : Cloneable> withTypeParameters() where T : Comparable<T> {

idea/testData/intentions/addBraces/addBracesForDoWhile.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>do doSomething("test")

idea/testData/intentions/addBraces/addBracesForDoWhile.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     do {

idea/testData/intentions/addBraces/addBracesForElse.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) doSomething("test")

idea/testData/intentions/addBraces/addBracesForElse.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) doSomething("test")

idea/testData/intentions/addBraces/addBracesForFor.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     for (i in 1..4)

idea/testData/intentions/addBraces/addBracesForFor.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     for (i in 1..4) {

idea/testData/intentions/addBraces/addBracesForIf.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>if (true) doSomething("test") else doSomething("test2")

idea/testData/intentions/addBraces/addBracesForIf.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) {

idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>if (true) doSomething("test")

idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) {

idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>if (true) doSomething("test");

idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     if (true) {

idea/testData/intentions/addBraces/addBracesForWhile.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>while (true)

idea/testData/intentions/addBraces/addBracesForWhile.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     while (true) {

idea/testData/intentions/addBraces/addBracesWithBraces.kt

@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun foo() {
     <caret>if (true) {

idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String = ""

idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String = ""

idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (n == 1) {

idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (n == 1) {

idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>if (n == 1) {

idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>return if (n == 1) {

idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>if (n == 1) {

idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>return if (n == 1) {

idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String = ""

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String = ""

idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (3 > 2) {

idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (3 > 2) {

idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>when (n) {

idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>return when (n) {

idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo: String? = null

idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun maybeFoo(): String? {
     return "foo"

idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun maybeFoo(): String? {
     return "foo"

idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo: String? = null

idea/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo: String? = "abc"

idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt

@@ -2,7 +2,7 @@ fun maybeFoo(): String? {
     return "foo"
 }
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo = maybeFoo()

idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt.after

@@ -2,7 +2,7 @@ fun maybeFoo(): String? {
     return "foo"
 }
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo = maybeFoo()

idea/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val foo: String? = "abc"

idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 class Foo {
     val b: String?

idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 class Foo {
     val b: String?

idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val a: String? = "A"

idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     val a: String? = "A"

idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     var a: String? = "A"

idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun main(args: Array<String>) {
     var a: String? = "A"

idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 val a: String? = "A"
 fun main(args: Array<String>) {

idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 val a: String? = "A"
 fun main(args: Array<String>) {

idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 val a: String?
     get() = ""

idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 val a: String?
     get() = ""

idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String? {
     val res = <caret>if (n == 1) {

idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String? {
     val res: String?

idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String? {
     var res = <caret>if (n == 1) {

idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String? {
     var res: String?

idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     val res<caret> = if (n == 1) {

idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     val res: String

idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res<caret> = if (n == 1) {

idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     val res<caret> = when (n) {

idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     val res: String

idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res<caret> = when (n) {

idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     var res: String

idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (n == 1) {

idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (n == 1) {

idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>return if (n == 1) {

idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>if (n == 1) {

idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (3 > 2) {

idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     if (3 > 2) {

idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>return when(n) {

idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int): String {
     <caret>when(n) {

idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String

idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String

idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String

idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt.after

@@ -1,4 +1,4 @@
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String

idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt

@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 
-fun doSomething<T>(a: T) {}
+fun <T> doSomething(a: T) {}
 
 fun test(n: Int) {
     val res: String