Update existing test data depending on diagnostic parameter rendering

idea/testData/quickfix/autoImports/delegateExtensionBoth.test

@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Missing 'getValue(testing.BigTest, kotlin.reflect.KProperty<*>)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
-// ERROR: Missing 'setValue(testing.BigTest, kotlin.reflect.KProperty<*>, [ERROR : Type from delegate])' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'getValue(BigTest, KProperty<*>)' method on delegate of type 'DelegateImpl<Int>'
+// ERROR: Missing 'setValue(BigTest, KProperty<*>, [ERROR : Type from delegate])' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 
@@ -27,8 +27,8 @@ public operator fun <T> DelegateImpl<T>.setValue(thisRef: Any, property: KProper
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Missing 'getValue(testing.BigTest, kotlin.reflect.KProperty<*>)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
-// ERROR: Missing 'setValue(testing.BigTest, kotlin.reflect.KProperty<*>, [ERROR : Type from delegate])' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'getValue(BigTest, KProperty<*>)' method on delegate of type 'DelegateImpl<Int>'
+// ERROR: Missing 'setValue(BigTest, KProperty<*>, [ERROR : Type from delegate])' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 

idea/testData/quickfix/autoImports/delegateExtensionGet.test

@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Missing 'getValue(testing.BigTest, kotlin.reflect.KProperty<*>)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'getValue(BigTest, KProperty<*>)' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 
@@ -27,7 +27,7 @@ public operator fun <T> DelegateImpl<T>.getValue(thisRef: Any?, property: KPrope
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Missing 'getValue(testing.BigTest, kotlin.reflect.KProperty<*>)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'getValue(BigTest, KProperty<*>)' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 

idea/testData/quickfix/autoImports/delegateExtensionSet.test

@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Missing 'setValue(testing.BigTest, kotlin.reflect.KProperty<*>, kotlin.Int)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'setValue(BigTest, KProperty<*>, Int)' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 
@@ -28,7 +28,7 @@ operator fun <T> DelegateImpl<T>.setValue(thisRef: Any, property: KProperty<*>,
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Missing 'setValue(testing.BigTest, kotlin.reflect.KProperty<*>, kotlin.Int)' method on delegate of type 'some.DelegateImpl<kotlin.Int>'
+// ERROR: Missing 'setValue(BigTest, KProperty<*>, Int)' method on delegate of type 'DelegateImpl<Int>'
 
 package testing
 

idea/testData/quickfix/autoImports/delegateNoOperator.test

@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "false"
-// ERROR: Missing 'getValue(kotlin.Nothing?, kotlin.reflect.KProperty<*>)' method on delegate of type 'kotlin.String'
+// ERROR: Missing 'getValue(Nothing?, KProperty<*>)' method on delegate of type 'String'
 
 package b
 

idea/testData/quickfix/autoImports/invokeExtension.test

@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 
 package testing
 
@@ -14,7 +14,7 @@ fun testing() {
 
 // FILE: second.kt
 // "Import" "true"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 
 package some
 
@@ -26,7 +26,7 @@ operator fun Some.invoke(s: String) {}
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 
 package testing
 

idea/testData/quickfix/autoImports/invokeExtensionNoOperator.test

@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "false"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 // ACTION: Create extension function 'invoke'
 // ACTION: Create member function 'invoke'
 
@@ -17,7 +17,7 @@ fun testing() {
 
 // FILE: second.kt
 // "Import" "true"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 
 package some
 
@@ -29,7 +29,7 @@ fun Some.invoke(s: String) {}
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Expression 'Some()' of type 'some.Some' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'Some()' of type 'Some' cannot be invoked as a function. The function invoke() is not found
 // ACTION: Create extension function 'invoke'
 // ACTION: Create member function 'invoke'
 

idea/testData/quickfix/autoImports/minusOperator.after.kt

@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun kotlin.String.minus(i: java.lang.Integer): kotlin.String defined in h<br>public fun kotlin.String.minus(str: kotlin.String): kotlin.String defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun String.minus(i: Integer): String defined in h<br>public fun String.minus(str: String): String defined in h
 
 package h
 

idea/testData/quickfix/autoImports/minusOperator.before.Main.kt

@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun kotlin.String.minus(i: java.lang.Integer): kotlin.String defined in h<br>public fun kotlin.String.minus(str: kotlin.String): kotlin.String defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public fun String.minus(i: Integer): String defined in h<br>public fun String.minus(str: String): String defined in h
 
 package h
 

idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponents.test

@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
@@ -27,8 +27,8 @@ operator fun Some.component2() = 3
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 

idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsMany.test

@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
@@ -36,8 +36,8 @@ operator fun Some.component2() = 3
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 

idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereFull.test

@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
@@ -35,8 +35,8 @@ operator fun Some.component1() = 1
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 

idea/testData/quickfix/autoImports/multiDeclarationExtensionAllComponentsPrefereNotDeprecated.test

@@ -1,7 +1,7 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type aaa.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type aaa.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
@@ -37,8 +37,8 @@ operator fun Some.component2() = 3
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type aaa.Some must have a 'component1()' function
-// ERROR: Destructuring declaration initializer of type aaa.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 

idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent1.test

@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 
 package testing
 
@@ -26,7 +26,7 @@ operator fun Some.component2() = 3
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 
 package testing
 

idea/testData/quickfix/autoImports/multiDeclarationExtensionComponent2.test

@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 
@@ -26,7 +26,7 @@ operator fun Some.component2() = 3
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component2()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component2()' function
 
 package testing
 

idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test

@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "false"
-// ERROR: Destructuring declaration initializer of type some.Some must have a 'component1()' function
+// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
 // ACTION: Create extension function 'component1'
 // ACTION: Create member function 'component1'
 

idea/testData/quickfix/autoImports/operatorAssignPlus.test

@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 
@@ -23,7 +23,7 @@ operator fun Some.plus(i: Int) : Some = this
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 

idea/testData/quickfix/autoImports/operatorAssignPlusAssign.test

@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 
@@ -23,7 +23,7 @@ operator fun Some.plusAssign(i: Int) {}
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 

idea/testData/quickfix/autoImports/operatorAssignPlusTwoVariantsDifferentPackages.test

@@ -1,6 +1,6 @@
 // FILE: first.before.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 
@@ -31,7 +31,7 @@ operator fun Some.plus(i: Int) : Some = this
 
 // FILE: first.after.kt
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package testing
 

idea/testData/quickfix/autoImports/plusOperator.after.kt

@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package h
 

idea/testData/quickfix/autoImports/plusOperator.before.Main.kt

@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun kotlin.String?.plus(other: kotlin.Any?): kotlin.String defined in kotlin
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun String?.plus(other: Any?): String defined in kotlin
 
 package h
 

idea/testData/quickfix/autoImports/unaryPlusOperator.after.kt

@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun h.A.unaryPlus(): kotlin.Int defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun A.unaryPlus(): Int defined in h
 
 package h
 

idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt

@@ -1,5 +1,5 @@
 // "Import" "true"
-// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun h.A.unaryPlus(): kotlin.Int defined in h
+// ERROR: Unresolved reference. None of the following candidates is applicable because of receiver type mismatch: <br>public operator fun A.unaryPlus(): Int defined in h
 
 package h