diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt
index f94917b2aa6..c9eb17294ae 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt
@@ -33,9 +33,9 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.core.KotlinIndicesHelper
 import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
 import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
-import org.jetbrains.kotlin.idea.util.getResolutionScope
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.idea.util.getResolutionScope
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtExpression
 import org.jetbrains.kotlin.psi.KtParameter
@@ -194,7 +194,8 @@ class ParameterNameAndTypeCompletion(
             }
         }
 
-        private val lookupString = parameterName + ": " + delegate.lookupString
+        // we need space before colon in lookupString otherwise completion list is not closed on typing ':' (see KT-9813)
+        private val lookupString = parameterName + " : " + delegate.lookupString
 
         override fun getLookupString() = lookupString
         override fun getAllLookupStrings() = setOf(lookupString)
diff --git a/idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt b/idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt
index c0a57fd79a3..300eb13a41f 100644
--- a/idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt
+++ b/idea/idea-completion/testData/basic/common/override/InConstructorParameters.kt
@@ -18,5 +18,5 @@ class A(overr<caret>) : Base2(), I
 // EXIST: { itemText: "override val someVal: Int", tailText: null, typeText: "I", attributes: "bold" }
 // EXIST: { itemText: "override var someVar: Int", tailText: null, typeText: "I", attributes: "bold" }
 // EXIST: { itemText: "override val fromBase: String", tailText: null, typeText: "Base1", attributes: "" }
-// EXIST_JAVA_ONLY: { lookupString: "override: Override", itemText: "override: Override" }
+// EXIST_JAVA_ONLY: { itemText: "override: Override" }
 // NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt
index 8f8e94c553b..ee0cbd992bd 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ByAbbreviation.kt
@@ -4,4 +4,4 @@ class DeclarationDescriptor
 
 fun f(dd<caret>)
 
-// EXIST: { lookupString: "declarationDescriptor: DeclarationDescriptor", itemText: "declarationDescriptor: DeclarationDescriptor", tailText: " (pack)" }
+// EXIST: { lookupString: "declarationDescriptor : DeclarationDescriptor", itemText: "declarationDescriptor: DeclarationDescriptor", tailText: " (pack)" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt
index 3efb24e9dd7..739361872cf 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NoAutoInsertion.kt
@@ -3,5 +3,5 @@ class FooBaaaaar
 fun f(fooBaaaa<caret>)
 
 // AUTOCOMPLETE_SETTING: true
-// EXIST: fooBaaaaar: FooBaaaaar
+// EXIST: { itemText: "fooBaaaaar: FooBaaaaar" }
 // NUMBER: 1
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt
index 43c005be230..875ec4421b0 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForAnonymousFunction.kt
@@ -6,4 +6,4 @@ fun f() {
     x(fun (b<caret>))
 }
 
-// ABSENT: boo: Boo
+// ABSENT: { itemText: "boo: Boo" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt
index 56707a70f14..1b2cf462dc7 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForCatchParameter.kt
@@ -7,4 +7,4 @@ fun f() {
     }
 }
 
-// ABSENT: "exception: Exception"
+// ABSENT: { itemText: "exception: Exception" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt
index bcd77856be6..2c1ea938720 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForLambdaParameter1.kt
@@ -6,4 +6,4 @@ fun f() {
     val handler = { b<caret> }
 }
 
-// ABSENT: boo: Boo
+// ABSENT: { itemText: "boo: Boo" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt
index 9c161b4a304..210bede7a66 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotForSetterParameter.kt
@@ -4,4 +4,4 @@ var v: Int
     get(){}
     set(v<caret>)
 
-// ABSENT: voo: Voo
+// ABSENT: { itemText: "voo: Voo" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt
index 726ce7fa6ea..a1fd51c577c 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImported.kt
@@ -1,3 +1,3 @@
 fun f(read<caret>)
 
-// EXIST: { lookupString: "readOnlyProperty: ReadOnlyProperty", itemText: "readOnlyProperty: ReadOnlyProperty", tailText: "<R, T> (kotlin.properties)" }
+// EXIST: { itemText: "readOnlyProperty: ReadOnlyProperty", tailText: "<R, T> (kotlin.properties)" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt
index 5b0469e514c..69adac10571 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/NotImportedJava.kt
@@ -1,3 +1,3 @@
 fun f(file<caret>)
 
-// EXIST_JAVA_ONLY: { lookupString: "file: File", itemText: "file: File", tailText: " (java.io)" }
+// EXIST_JAVA_ONLY: { itemText: "file: File", tailText: " (java.io)" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt
index b59186a578e..1b02a3ba958 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFile.kt
@@ -18,11 +18,11 @@ class C(val handler: () -> Unit) {
     }
 }
 
-// EXIST: { lookupString: "strings: List", itemText: "strings: List<String>", tailText: " (kotlin)" }
-// EXIST: { lookupString: "numbers: List", itemText: "numbers: List<Int>", tailText: " (kotlin)" }
-// EXIST: { lookupString: "value: Any", itemText: "value: Any?", tailText: " (kotlin)" }
-// EXIST_JAVA_ONLY: { lookupString: "value: File", itemText: "value: File", tailText: " (java.io)" }
-// EXIST: { lookupString: "handler: (() -> String)?", itemText: "handler: (() -> String)?", tailText: null }
-// EXIST: { lookupString: "handler: () -> Unit", itemText: "handler: () -> Unit", tailText: null }
-// ABSENT: "localParam: String"
-// ABSENT: "file: File"
+// EXIST: { lookupString: "strings : List", itemText: "strings: List<String>", tailText: " (kotlin)" }
+// EXIST: { lookupString: "numbers : List", itemText: "numbers: List<Int>", tailText: " (kotlin)" }
+// EXIST: { lookupString: "value : Any", itemText: "value: Any?", tailText: " (kotlin)" }
+// EXIST_JAVA_ONLY: { lookupString: "value : File", itemText: "value: File", tailText: " (java.io)" }
+// EXIST: { lookupString: "handler : (() -> String)?", itemText: "handler: (() -> String)?", tailText: null }
+// EXIST: { lookupString: "handler : () -> Unit", itemText: "handler: () -> Unit", tailText: null }
+// ABSENT: { itemText: "localParam: String" }
+// ABSENT: { itemText: "file: File" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt
index d765053dc70..97627a70d08 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter1.kt
@@ -6,5 +6,5 @@ class X<T1> {
     fun foo(xxx<caret>)
 }
 
-// EXIST: { lookupString: "xxxValue1: T1", itemText: "xxxValue1: T1", tailText: null }
+// EXIST: { itemText: "xxxValue1: T1", tailText: null }
 // NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt
index 0f3771f3e89..81d950a5e03 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ParametersInFileTypeParameter3.kt
@@ -8,5 +8,5 @@ class X<T1> {
     }
 }
 
-// EXIST: { lookupString: "xxxValue1: T1", itemText: "xxxValue1: T1", tailText: null }
+// EXIST: { itemText: "xxxValue1: T1", tailText: null }
 // NOTHING_ELSE
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt
index 29329ee9303..6f2ac651fd3 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/Simple.kt
@@ -6,6 +6,6 @@ class Boo
 
 fun f(b<caret>)
 
-// EXIST: { lookupString: "bar: FooBar", itemText: "bar: FooBar", tailText: " (pack)" }
-// ABSENT: fooBar: FooBar
-// EXIST: { lookupString: "boo: Boo", itemText: "boo: Boo", tailText: " (pack)" }
+// EXIST: { lookupString: "bar : FooBar", itemText: "bar: FooBar", tailText: " (pack)" }
+// ABSENT: { itemText: "fooBar: FooBar" }
+// EXIST: { lookupString: "boo : Boo", itemText: "boo: Boo", tailText: " (pack)" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt
index 2d38c8075af..38d56b76e98 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/URLConnection.kt
@@ -2,5 +2,5 @@ import java.net.URLConnection
 
 fun foo(url<caret>){}
 
-// EXIST_JAVA_ONLY: { lookupString: "urlConnection: URLConnection", itemText: "urlConnection: URLConnection", tailText: " (java.net)" }
-// ABSENT: urlconnection
+// EXIST_JAVA_ONLY: { itemText: "urlConnection: URLConnection", tailText: " (java.net)" }
+// ABSENT: { itemText: "urlconnection: URLConnection" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt
index 85d045c982f..5f0e153c86e 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix1.kt
@@ -6,6 +6,6 @@ class Boo
 
 fun f(myB<caret>)
 
-// EXIST: { lookupString: "myBar: FooBar", itemText: "myBar: FooBar", tailText: " (pack)" }
-// ABSENT: myBFooBar: FooBar
-// EXIST: { lookupString: "myBoo: Boo", itemText: "myBoo: Boo", tailText: " (pack)" }
+// EXIST: { lookupString: "myBar : FooBar", itemText: "myBar: FooBar", tailText: " (pack)" }
+// ABSENT: { itemText: "myBFooBar: FooBar" }
+// EXIST: { lookupString: "myBoo : Boo", itemText: "myBoo: Boo", tailText: " (pack)" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt
index c13849eba11..df493b25368 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix2.kt
@@ -1,3 +1,3 @@
 fun f(myF<caret>)
 
-// EXIST_JAVA_ONLY: { lookupString: "myFile: File", itemText: "myFile: File", tailText: " (java.io)" }
+// EXIST_JAVA_ONLY: { lookupString: "myFile : File", itemText: "myFile: File", tailText: " (java.io)" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt
index 5153f6d7934..5b1cff330b8 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/UserPrefix3.kt
@@ -6,6 +6,6 @@ class Fuu
 
 fun f(myFooF<caret>)
 
-// EXIST: { lookupString: "myFooFaa: FooFaa", itemText: "myFooFaa: FooFaa", tailText: " (pack)" }
-// EXIST: { lookupString: "myFooFuu: Fuu", itemText: "myFooFuu: Fuu", tailText: " (pack)" }
+// EXIST: { lookupString: "myFooFaa : FooFaa", itemText: "myFooFaa: FooFaa", tailText: " (pack)" }
+// EXIST: { lookupString: "myFooFuu : Fuu", itemText: "myFooFuu: Fuu", tailText: " (pack)" }
 // ABSENT: { itemText: "myFooFooFaa: FooFaa" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt
index 4fda87ca636..e478c4c56bf 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/ValParameter.kt
@@ -6,6 +6,6 @@ class Boo
 
 class C(val b<caret>)
 
-// EXIST: { lookupString: "bar: FooBar", itemText: "bar: FooBar", tailText: " (pack)" }
-// ABSENT: fooBar: FooBar
-// EXIST: { lookupString: "boo: Boo", itemText: "boo: Boo", tailText: " (pack)" }
+// EXIST: { itemText: "bar: FooBar", tailText: " (pack)" }
+// ABSENT: { itemText: "fooBar: FooBar" }
+// EXIST: { itemText: "boo: Boo", tailText: " (pack)" }
diff --git a/idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt b/idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt
index fc2532620de..efbf994b5a4 100644
--- a/idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt
+++ b/idea/idea-completion/testData/basic/common/parameterNameAndType/VarParameter.kt
@@ -6,6 +6,6 @@ class Boo
 
 class C(private var b<caret>)
 
-// EXIST: { lookupString: "bar: FooBar", itemText: "bar: FooBar", tailText: " (pack)" }
-// ABSENT: fooBar: FooBar
-// EXIST: { lookupString: "boo: Boo", itemText: "boo: Boo", tailText: " (pack)" }
+// EXIST: { itemText: "bar: FooBar", tailText: " (pack)" }
+// ABSENT: { itemText: "fooBar: FooBar" }
+// EXIST: { itemText: "boo: Boo", tailText: " (pack)" }
diff --git a/idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/ParameterNameAndTypeNestedClasses.kt b/idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/ParameterNameAndTypeNestedClasses.kt
index c994f23b5c2..05fead6958d 100644
--- a/idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/ParameterNameAndTypeNestedClasses.kt
+++ b/idea/idea-completion/testData/basic/multifile/ParameterNameAndTypeNestedClasses/ParameterNameAndTypeNestedClasses.kt
@@ -3,9 +3,9 @@ fun f(nested: Outer.Nested.NestedNested?){}
 
 fun foo(nest<caret>)
 
-// EXIST: { lookupString: "nested: Nested", itemText: "nested: Outer.Nested?", tailText: " (<root>)" }
-// EXIST: { lookupString: "nested: Nested", itemText: "nested: Outer.Nested", tailText: " (<root>)" }
-// EXIST: { lookupString: "nested: NestedNested", itemText: "nested: Outer.Nested.NestedNested?", tailText: " (<root>)" }
-// EXIST: { lookupString: "nested: NestedNested", itemText: "nested: Outer.Nested.NestedNested", tailText: " (<root>)" }
-// EXIST: { lookupString: "nested: Nested", itemText: "nested: JavaOuter.Nested", tailText: " (<root>)" }
-// EXIST: { lookupString: "nested: NestedNested", itemText: "nested: JavaOuter.Nested.NestedNested", tailText: " (<root>)" }
+// EXIST: { lookupString: "nested : Nested", itemText: "nested: Outer.Nested?", tailText: " (<root>)" }
+// EXIST: { lookupString: "nested : Nested", itemText: "nested: Outer.Nested", tailText: " (<root>)" }
+// EXIST: { lookupString: "nested : NestedNested", itemText: "nested: Outer.Nested.NestedNested?", tailText: " (<root>)" }
+// EXIST: { lookupString: "nested : NestedNested", itemText: "nested: Outer.Nested.NestedNested", tailText: " (<root>)" }
+// EXIST: { lookupString: "nested : Nested", itemText: "nested: JavaOuter.Nested", tailText: " (<root>)" }
+// EXIST: { lookupString: "nested : NestedNested", itemText: "nested: JavaOuter.Nested.NestedNested", tailText: " (<root>)" }
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt
index d51ba5c8290..67f6d2fdb9e 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt
@@ -5,4 +5,4 @@ class FooBar
 
 fun f(b<caret>)
 
-// ELEMENT: bar: FooBar
+// ELEMENT_TEXT: bar: FooBar
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt.after
index 9a8b274d7b2..9338d014e06 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/CodeStyleSettings.kt.after
@@ -5,4 +5,4 @@ class FooBar
 
 fun f(bar :FooBar<caret>)
 
-// ELEMENT: bar: FooBar
+// ELEMENT_TEXT: bar: FooBar
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt
index b5ced56c40f..2b2c7dd5bb5 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt
@@ -2,5 +2,5 @@ class FooBar
 
 fun f(b<caret>)
 
-// ELEMENT: bar: FooBar
+// ELEMENT_TEXT: bar: FooBar
 // CHAR: ','
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt.after
index 47058a51689..5802b66343d 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Comma.kt.after
@@ -2,5 +2,5 @@ class FooBar
 
 fun f(bar: FooBar, <caret>)
 
-// ELEMENT: bar: FooBar
+// ELEMENT_TEXT: bar: FooBar
 // CHAR: ','
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt
index fac489b7a5e..c44f6430b18 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt
@@ -1,3 +1,3 @@
 fun f(file<caret>)
 
-// ELEMENT: "file: File"
+// ELEMENT_TEXT: "file: File"
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt.after
index 5328863b2ed..cf38dafd037 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/InsertImport.kt.after
@@ -2,4 +2,4 @@ import java.io.File
 
 fun f(file: File<caret>)
 
-// ELEMENT: "file: File"
+// ELEMENT_TEXT: "file: File"
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt
index 9e1244ed773..38b501c26fa 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt
@@ -2,4 +2,4 @@ fun foo(xxx: ((java.io.File) -> List<String>)?)
 
 fun bar(x<caret>)
 
-// ELEMENT: xxx: ((File) -> List<String>)?
+// ELEMENT_TEXT: xxx: ((File) -> List<String>)?
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt.after
index 3e9c1816e45..cdcfd82c7a0 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/ParameterInFile.kt.after
@@ -4,4 +4,4 @@ fun foo(xxx: ((java.io.File) -> List<String>)?)
 
 fun bar(xxx: ((File) -> List<String>)?<caret>)
 
-// ELEMENT: xxx: ((File) -> List<String>)?
+// ELEMENT_TEXT: xxx: ((File) -> List<String>)?
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt
index 293571898b9..8b2c766456a 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt
@@ -2,4 +2,4 @@ class FooBar
 
 fun f(b<caret>)
 
-// ELEMENT: bar: FooBar
+// ELEMENT_TEXT: bar: FooBar
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt.after
index 8cfb452c371..23af1d2574d 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/Simple.kt.after
@@ -2,4 +2,4 @@ class FooBar
 
 fun f(bar: FooBar<caret>)
 
-// ELEMENT: bar: FooBar
+// ELEMENT_TEXT: bar: FooBar
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt
index 5bd26eae45d..7e5a15d30a8 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt
@@ -1,3 +1,3 @@
 fun<T> foo(t<caret>)
 
-// ELEMENT: t: T
+// ELEMENT_TEXT: t: T
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt.after
index b811d0b5e66..1d0c4193584 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/TypeParameter.kt.after
@@ -1,3 +1,3 @@
 fun<T> foo(t: T<caret>)
 
-// ELEMENT: t: T
+// ELEMENT_TEXT: t: T
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt
index 4b5abbd5e9d..7a9d280894c 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt
@@ -2,4 +2,4 @@ class FooBar
 
 fun f(myFo<caret>)
 
-// ELEMENT: myFooBar: FooBar
+// ELEMENT_TEXT: myFooBar: FooBar
diff --git a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt.after b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt.after
index 4461c5323a2..142658f682f 100644
--- a/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt.after
+++ b/idea/idea-completion/testData/handlers/basic/parameterNameAndType/UserPrefix.kt.after
@@ -2,4 +2,4 @@ class FooBar
 
 fun f(myFooBar: FooBar<caret>)
 
-// ELEMENT: myFooBar: FooBar
+// ELEMENT_TEXT: myFooBar: FooBar
diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt
index 0b096b4c7ec..e665efb6e37 100644
--- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt
+++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/Deprecated.kt
@@ -4,6 +4,6 @@ class MyClassC
 
 fun foo(myCla<caret>)
 
-// ORDER: myClassA: MyClassA
-// ORDER: myClassC: MyClassC
-// ORDER: myClassB: MyClassB
+// ORDER: myClassA : MyClassA
+// ORDER: myClassC : MyClassC
+// ORDER: myClassB : MyClassB
diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt
index 489a308aa5e..a8ac14bd292 100644
--- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt
+++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/FromCurrentFilePriority.kt
@@ -8,9 +8,9 @@ fun h(myFileX: String)
 
 fun foo(myFi<caret>)
 
-// ORDER: myFileY: Int
-// ORDER: myFileB: MyFileB
-// ORDER: myFileX: Int
-// ORDER: myFileX: String
-// ORDER: myFileA: MyFileA
-// ORDER: myFileC: MyFileC
+// ORDER: myFileY : Int
+// ORDER: myFileB : MyFileB
+// ORDER: myFileX : Int
+// ORDER: myFileX : String
+// ORDER: myFileA : MyFileA
+// ORDER: myFileC : MyFileC
diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt
index 09774bab0ca..523badb08a6 100644
--- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt
+++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt
@@ -2,7 +2,7 @@ import ppp.MyClassB
 
 fun foo(myCla<caret>)
 
-// ORDER: myClassB: MyClassB
-// ORDER: myClassA: MyClassA
-// ORDER: myClassC: MyClassC
-// ORDER: myClaaa: MyClaaa
+// ORDER: myClassB : MyClassB
+// ORDER: myClassA : MyClassA
+// ORDER: myClassC : MyClassC
+// ORDER: myClaaa : MyClaaa
diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt
index 8d6a827cdc3..5e8a806aea9 100644
--- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt
+++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/MoreWordsMatchFirst.kt
@@ -2,5 +2,5 @@ class MyAbsoluteSpecificStream
 
 fun foo(myAbSpeStream<caret>)
 
-// ORDER: myAbsoluteSpecificStream: MyAbsoluteSpecificStream
-// ORDER: myAbSpecificStream: SpecificStream
+// ORDER: myAbsoluteSpecificStream : MyAbsoluteSpecificStream
+// ORDER: myAbSpecificStream : SpecificStream
diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt
index 46c482a9136..c466f17db2f 100644
--- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt
+++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt
@@ -3,5 +3,5 @@ class MyFileStream
 
 fun foo(myFi<caret>)
 
-// ORDER: myFile: MyFile
-// ORDER: myFileStream: MyFileStream
+// ORDER: myFile : MyFile
+// ORDER: myFileStream : MyFileStream
diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt
index c7b471a4b77..c5eb049c506 100644
--- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt
+++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt
@@ -3,5 +3,5 @@ class FaOaOa
 
 fun foo(foo<caret>)
 
-// ORDER: fooBar: FooBar
-// ORDER: faOaOa: FaOaOa
+// ORDER: fooBar : FooBar
+// ORDER: faOaOa : FaOaOa
diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt
index 84a25b1a668..d0f6930c195 100644
--- a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt
+++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/UserPrefix.kt
@@ -6,6 +6,6 @@ class Xaa
 
 fun foo(zzzYyyX<caret>)
 
-// ORDER: zzzYyyXxx: ZzzYyyXxx
-// ORDER: zzzYyyXoo: YyyXoo
-// ORDER: zzzYyyXaa: Xaa
+// ORDER: zzzYyyXxx : ZzzYyyXxx
+// ORDER: zzzYyyXoo : YyyXoo
+// ORDER: zzzYyyXaa : Xaa