Update existing test data depending on diagnostic parameter rendering

j2k/testData/fileOrElement/class/kt-639.kt

@@ -1,5 +1,5 @@
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : kotlin.Any!, V : kotlin.Any!>(p0: kotlin.Int) Please specify it explicitly.
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : kotlin.Any!, V : kotlin.Any!>(p0: kotlin.Int) Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>(p0: Int) Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>(p0: Int) Please specify it explicitly.
 package demo
 
 import java.util.HashMap

j2k/testData/fileOrElement/comments/comments.kt

@@ -1,4 +1,4 @@
-// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun run(): kotlin.Unit defined in java.lang.Runnable
+// ERROR: Class 'A' must be declared abstract or implement abstract member public abstract fun run(): Unit defined in java.lang.Runnable
 package foo
 
 // we use package 'foo'

j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.kt

@@ -1,4 +1,4 @@
-// ERROR: Type mismatch: inferred type is kotlin.String? but kotlin.Any was expected
+// ERROR: Type mismatch: inferred type is String? but Any was expected
 internal class A {
     private val s: String? = null
 

j2k/testData/fileOrElement/function/java8Lambdas.kt

@@ -1,9 +1,9 @@
 // ERROR: 'return' is not allowed here
-// ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Unit was expected
+// ERROR: Type mismatch: inferred type is String but Unit was expected
 // ERROR: 'return' is not allowed here
-// ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Unit was expected
+// ERROR: Type mismatch: inferred type is String but Unit was expected
 // ERROR: 'return' is not allowed here
-// ERROR: Type mismatch: inferred type is kotlin.String but kotlin.Unit was expected
+// ERROR: Type mismatch: inferred type is String but Unit was expected
 class Java8Class {
     fun foo0(r: Function0<String>) {
     }

j2k/testData/fileOrElement/function/java8MRKFunctionExpectedType.kt

@@ -1,4 +1,4 @@
-// ERROR: Type inference failed: Not enough information to infer parameter T in fun <T> emptyList(): kotlin.collections.List<T> Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter T in fun <T> emptyList(): List<T> Please specify it explicitly.
 package test
 
 import java.util.Collections

j2k/testData/fileOrElement/issues/kt-1048.kt

@@ -1,5 +1,5 @@
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : kotlin.Any!, V : kotlin.Any!>() Please specify it explicitly.
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : kotlin.Any!, V : kotlin.Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>() Please specify it explicitly.
 import java.util.HashMap
 
 internal class G<T : String>(t: T)

j2k/testData/fileOrElement/issues/kt-807.kt

@@ -1,5 +1,5 @@
-// ERROR: None of the following functions can be called with the arguments supplied:  public constructor FileInputStream(p0: [ERROR : Unresolved java classifier: FileDescriptor]!) defined in java.io.FileInputStream public constructor FileInputStream(p0: java.io.File!) defined in java.io.FileInputStream public constructor FileInputStream(p0: kotlin.String!) defined in java.io.FileInputStream
-// ERROR: Type mismatch: inferred type is java.io.DataInputStream but java.io.InputStream! was expected
+// ERROR: None of the following functions can be called with the arguments supplied:  public constructor FileInputStream(p0: [ERROR : Unresolved java classifier: FileDescriptor]!) defined in java.io.FileInputStream public constructor FileInputStream(p0: File!) defined in java.io.FileInputStream public constructor FileInputStream(p0: String!) defined in java.io.FileInputStream
+// ERROR: Type mismatch: inferred type is DataInputStream but InputStream! was expected
 // ERROR: Assignments are not expressions, and only expressions are allowed in this context
 // ERROR: Unresolved reference: close
 import java.io.*

j2k/testData/fileOrElement/list/Lists.kt

@@ -1,6 +1,6 @@
 // ERROR: Unresolved reference: LinkedList
-// ERROR: Null can not be a value of a non-null type kotlin.Any
-// ERROR: Null can not be a value of a non-null type kotlin.Any
+// ERROR: Null can not be a value of a non-null type Any
+// ERROR: Null can not be a value of a non-null type Any
 import java.util.*
 
 class Lists {

j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt

@@ -1,5 +1,5 @@
-// ERROR: Null can not be a value of a non-null type kotlin.String
-// ERROR: Null can not be a value of a non-null type kotlin.String
+// ERROR: Null can not be a value of a non-null type String
+// ERROR: Null can not be a value of a non-null type String
 import java.util.*
 
 internal class A {

j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt

@@ -1,4 +1,4 @@
-// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : kotlin.Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : Any!>() Please specify it explicitly.
 package test
 
 internal class User {

j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt

@@ -1,4 +1,4 @@
-// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : kotlin.Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : Any!>() Please specify it explicitly.
 package test
 
 internal class User {

j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt

@@ -1,4 +1,4 @@
-// ERROR: Return type of 'get' is not a subtype of the return type of the overridden member 'public abstract fun get(): kotlin.String defined in Getter'
+// ERROR: Return type of 'get' is not a subtype of the return type of the overridden member 'public abstract fun get(): String defined in Getter'
 internal interface Getter {
     fun get(): String
 }

j2k/testData/fileOrElement/overloads/Annotations.kt

@@ -1,5 +1,5 @@
-// ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected
-// ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected
+// ERROR: Type mismatch: inferred type is Any? but Any was expected
+// ERROR: Type mismatch: inferred type is Any? but Any was expected
 internal class A {
     @JvmOverloads fun foo(s: String? = null): Any {
         println("s = " + s!!)

j2k/testData/fileOrElement/postProcessing/GetOperator.kt

@@ -1,4 +1,4 @@
-// ERROR: Type mismatch: inferred type is kotlin.String? but kotlin.String was expected
+// ERROR: Type mismatch: inferred type is String? but String was expected
 import java.util.HashMap
 import kotlinApi.KotlinClass
 import javaApi.JavaClass

j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt

@@ -1,4 +1,4 @@
-// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : kotlin.Any!, V : kotlin.Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : Any!, V : Any!>() Please specify it explicitly.
 package demo
 
 import java.util.HashMap

j2k/testData/fileOrElement/rawGenerics/kt-540.kt

@@ -1,4 +1,4 @@
-// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : kotlin.Any!>() Please specify it explicitly.
+// ERROR: Type inference failed: Not enough information to infer parameter E in constructor ArrayList<E : Any!>() Please specify it explicitly.
 package demo
 
 import java.util.ArrayList

j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator.kt

@@ -1,5 +1,5 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): Iterator<String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): Iterator<String> defined in kotlin.collections.Iterable'
 package demo
 
 internal class Test : Iterable<String> {

j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator2.kt

@@ -1,5 +1,5 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): Iterator<String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): Iterator<String> defined in kotlin.collections.Iterable'
 package demo
 
 import java.util.*

j2k/testData/fileOrElement/toKotlinClasses/iterableAndIterator3.kt

@@ -1,4 +1,4 @@
-// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): kotlin.collections.Iterator<kotlin.String> defined in kotlin.collections.Iterable'
+// ERROR: Return type of 'iterator' is not a subtype of the return type of the overridden member 'public abstract operator fun iterator(): Iterator<String> defined in kotlin.collections.Iterable'
 package demo
 
 internal class Test : Iterable<String> {

j2k/testData/fileOrElement/typeParameters/rawTypeCast.kt

@@ -1,4 +1,4 @@
-// ERROR: Type inference failed. Expected type mismatch: inferred type is java.util.HashMap<kotlin.Any!, kotlin.Any!> but kotlin.collections.Map<kotlin.String, kotlin.String> was expected
+// ERROR: Type inference failed. Expected type mismatch: inferred type is HashMap<Any!, Any!> but Map<String, String> was expected
 import java.util.*
 
 internal object A {