diff --git a/idea/testData/intentions/specifyType/afterLoopParameter.kt b/idea/testData/intentions/specifyType/afterLoopParameter.kt
index 3156dfbacc3..e44e6887d14 100644
--- a/idea/testData/intentions/specifyType/afterLoopParameter.kt
+++ b/idea/testData/intentions/specifyType/afterLoopParameter.kt
@@ -2,7 +2,7 @@
 import java.util.HashMap
 
 fun foo(map : HashMap<String, Int>) {
-    for (<caret>entry : MutableMap.MutableEntry<String, Int> in map.entrySet()) {
+    for (entry : MutableMap.MutableEntry<String, Int><caret> in map.entrySet()) {
 
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyWIthInitializer3.kt b/idea/testData/quickfix/abstract/afterAbstractPropertyWIthInitializer3.kt
index 29b466e7e23..29135db44b4 100644
--- a/idea/testData/quickfix/abstract/afterAbstractPropertyWIthInitializer3.kt
+++ b/idea/testData/quickfix/abstract/afterAbstractPropertyWIthInitializer3.kt
@@ -1,4 +1,4 @@
 // "Remove initializer from property" "true"
 abstract class A {
-    abstract var i<caret>: Int
+    abstract var i: Int<caret>
 }
diff --git a/idea/testData/quickfix/abstract/afterAbstractPropertyWithGetter2.kt b/idea/testData/quickfix/abstract/afterAbstractPropertyWithGetter2.kt
index b77934ae601..1269746cdab 100644
--- a/idea/testData/quickfix/abstract/afterAbstractPropertyWithGetter2.kt
+++ b/idea/testData/quickfix/abstract/afterAbstractPropertyWithGetter2.kt
@@ -1,4 +1,5 @@
 // "Remove getter and initializer from property" "true"
 abstract class B {
-    abstract val i<caret>: Int
+    abstract val i: Int<caret>
+
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeAddition/afterProtectedFunWithoutReturnType.kt b/idea/testData/quickfix/typeAddition/afterProtectedFunWithoutReturnType.kt
index a2b2dfe064e..56cd55a12c1 100644
--- a/idea/testData/quickfix/typeAddition/afterProtectedFunWithoutReturnType.kt
+++ b/idea/testData/quickfix/typeAddition/afterProtectedFunWithoutReturnType.kt
@@ -2,5 +2,5 @@
 package a
 
 class A() {
-    protected fun <caret>foo(): Int = 1
+    protected fun foo(): Int<caret> = 1
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnType.kt b/idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnType.kt
index aef79d992bf..1194688a4ed 100644
--- a/idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnType.kt
+++ b/idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnType.kt
@@ -2,5 +2,5 @@
 package a
 
 class A() {
-    public fun <caret>foo(): String = "a"
+    public fun foo(): String<caret> = "a"
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnTypeCaretOnParameter.kt b/idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnTypeCaretOnParameter.kt
index 157c5ea6d0a..1e8a5890184 100644
--- a/idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnTypeCaretOnParameter.kt
+++ b/idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnTypeCaretOnParameter.kt
@@ -2,5 +2,5 @@
 package a
 
 class A() {
-    public fun foo(<caret>p: String): String = "a"
+    public fun foo(p: String): String<caret> = "a"
 }
diff --git a/idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnType.kt b/idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnType.kt
index d7eb878f3e9..a495563212b 100644
--- a/idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnType.kt
+++ b/idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnType.kt
@@ -1,4 +1,4 @@
 // "Specify type explicitly" "true"
 package a
 
-public val <caret>l: List<Int> = java.util.Collections.emptyList<Int>()
\ No newline at end of file
+public val l: List<Int><caret> = java.util.Collections.emptyList<Int>()
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnTypeCaretOnPublic.kt b/idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnTypeCaretOnPublic.kt
index ee05c5e0b8f..8959c88affa 100644
--- a/idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnTypeCaretOnPublic.kt
+++ b/idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnTypeCaretOnPublic.kt
@@ -1,4 +1,4 @@
 // "Specify type explicitly" "true"
 package a
 
-<caret>public val l: List<Int> = java.util.Collections.emptyList<Int>()
+public val l: List<Int><caret> = java.util.Collections.emptyList<Int>()
diff --git a/idea/testData/quickfix/typeImports/afterHasThisImport.kt b/idea/testData/quickfix/typeImports/afterHasThisImport.kt
index d7073c8e881..dc3fad4764a 100644
--- a/idea/testData/quickfix/typeImports/afterHasThisImport.kt
+++ b/idea/testData/quickfix/typeImports/afterHasThisImport.kt
@@ -9,7 +9,7 @@ import java.util.List
 
 class M {
     trait A {
-        val l<caret>: jet.List<Int>
+        val l: jet.List<Int><caret>
     }
 }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeImports/afterNoImportFromTheSameFile.kt b/idea/testData/quickfix/typeImports/afterNoImportFromTheSameFile.kt
index 64d9bdefe74..8903fecd00a 100644
--- a/idea/testData/quickfix/typeImports/afterNoImportFromTheSameFile.kt
+++ b/idea/testData/quickfix/typeImports/afterNoImportFromTheSameFile.kt
@@ -3,5 +3,5 @@
 class A() {}
 
 class B() {
-    public val <caret>a: A = A()
+    public val a: A<caret> = A()
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeImports/afterNoImportJavaLang.kt b/idea/testData/quickfix/typeImports/afterNoImportJavaLang.kt
index 6d768d6fcb1..29a15e76f12 100644
--- a/idea/testData/quickfix/typeImports/afterNoImportJavaLang.kt
+++ b/idea/testData/quickfix/typeImports/afterNoImportJavaLang.kt
@@ -3,6 +3,6 @@ package a
 
 class M {
     trait A {
-        abstract val e<caret>: Exception
+        abstract val e: Exception<caret>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeImports/afterNoImportJetStandard.kt b/idea/testData/quickfix/typeImports/afterNoImportJetStandard.kt
index 4d1ed09cd67..385835f6bed 100644
--- a/idea/testData/quickfix/typeImports/afterNoImportJetStandard.kt
+++ b/idea/testData/quickfix/typeImports/afterNoImportJetStandard.kt
@@ -3,6 +3,6 @@ package a
 
 class M {
     trait A {
-        abstract val i<caret>: Int
+        abstract val i: Int<caret>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeImports/afterToImport1.kt b/idea/testData/quickfix/typeImports/afterToImport1.kt
index e5b8fbbe6d1..f3340895408 100644
--- a/idea/testData/quickfix/typeImports/afterToImport1.kt
+++ b/idea/testData/quickfix/typeImports/afterToImport1.kt
@@ -5,6 +5,6 @@ import java.util.Collections
 
 class M {
     trait A {
-        abstract val l<caret>: List<Int>
+        abstract val l: List<Int><caret>
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeImports/importFromAnotherFile.after.kt b/idea/testData/quickfix/typeImports/importFromAnotherFile.after.kt
index efae01e6375..14b056cf354 100644
--- a/idea/testData/quickfix/typeImports/importFromAnotherFile.after.kt
+++ b/idea/testData/quickfix/typeImports/importFromAnotherFile.after.kt
@@ -6,5 +6,5 @@ package a
 import b.B
 
 class A() {
-    public val <caret>a: B = b.foo()
+    public val a: B<caret> = b.foo()
 }
\ No newline at end of file