Update existing test data depending on diagnostic parameter rendering

idea/testData/intentions/addNameToArgument/ambiguousCall.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun foo(s: kotlin.String, b: kotlin.Boolean, c: kotlin.Char): kotlin.Unit defined in root package<br>public fun foo(s: kotlin.String, b: kotlin.Boolean, p: kotlin.Int): kotlin.Unit defined in root package
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun foo(s: String, b: Boolean, c: Char): Unit defined in root package<br>public fun foo(s: String, b: Boolean, p: Int): Unit defined in root package
 fun foo(s: String, b: Boolean, p: Int){}
 fun foo(s: String, b: Boolean, c: Char){}
 

idea/testData/intentions/branched/ifThenToDoubleBang/conditionNotBinaryExpr.kt

@@ -1,7 +1,7 @@
 // WITH_RUNTIME
 // IS_APPLICABLE: false
-// ERROR: Type mismatch: inferred type is kotlin.Int but kotlin.Boolean was expected
-// ERROR: Condition must be of type kotlin.Boolean, but is of type kotlin.Int
+// ERROR: Type mismatch: inferred type is Int but Boolean was expected
+// ERROR: Condition must be of type Boolean, but is of type Int
 // ERROR: Infix call corresponds to a dot-qualified call 'foo.times(10)' which is not allowed on a nullable receiver 'foo'. Use ?.-qualified call instead
 
 fun String?.times(a: Int): Boolean = a == 0

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

@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
-// ERROR: Type mismatch: inferred type is kotlin.Int but kotlin.Boolean was expected
-// ERROR: Condition must be of type kotlin.Boolean, but is of type kotlin.Int
+// ERROR: Type mismatch: inferred type is Int but Boolean was expected
+// ERROR: Condition must be of type Boolean, but is of type Int
 // ERROR: Infix call corresponds to a dot-qualified call 'foo.times(10)' which is not allowed on a nullable receiver 'foo'. Use ?.-qualified call instead
 
 fun main(args: Array<String>) {

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

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
+// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
 fun main(args: Array<String>) {
     val foo: String? = "foo"
     if<caret> {

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

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String?
+// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
 fun main(args: Array<String>) {
     val foo: String? = "foo"
     if (foo == null<caret>) {

idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt

@@ -1,5 +1,5 @@
-// ERROR: Expected condition of type kotlin.Boolean
-// ERROR: Expected condition of type kotlin.Boolean
+// ERROR: Expected condition of type Boolean
+// ERROR: Expected condition of type Boolean
 // SKIP_ERRORS_AFTER
 
 fun test(n: Int): String {

idea/testData/intentions/branched/ifWhen/whenToIf/wrongIsAndInNoSubject.kt.after

@@ -1,5 +1,5 @@
-// ERROR: Expected condition of type kotlin.Boolean
-// ERROR: Expected condition of type kotlin.Boolean
+// ERROR: Expected condition of type Boolean
+// ERROR: Expected condition of type Boolean
 // SKIP_ERRORS_AFTER
 
 fun test(n: Int): String {

idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt

@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 // WITH_RUNTIME
-// ERROR: None of the following functions can be called with the arguments supplied: <br>@kotlin.internal.InlineOnly public inline fun assert(value: kotlin.Boolean): kotlin.Unit defined in kotlin<br>@kotlin.internal.InlineOnly public inline fun assert(value: kotlin.Boolean, lazyMessage: () -> kotlin.Any): kotlin.Unit defined in kotlin
+// ERROR: None of the following functions can be called with the arguments supplied: <br>@InlineOnly public inline fun assert(value: Boolean): Unit defined in kotlin<br>@InlineOnly public inline fun assert(value: Boolean, lazyMessage: () -> Any): Unit defined in kotlin
 
 fun foo() {
     <caret>assert()

idea/testData/intentions/convertFunctionToProperty/extraArgumentsConflict.kt

@@ -1,4 +1,4 @@
-// ERROR: Too many arguments for public final fun foo(): kotlin.Boolean defined in A
+// ERROR: Too many arguments for public final fun foo(): Boolean defined in A
 // SHOULD_FAIL_WITH: Call with arguments will be skipped: foo(2)
 class A(val n: Int) {
     fun <caret>foo(): Boolean = n > 1

idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableOperator.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// 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
 fun foo(a: Boolean, b: Boolean) : Boolean {
     return !<caret>(!a + b)
 }

idea/testData/intentions/implementAbstractMember/function/noDirectOverridesNeeded.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract fun foo(): kotlin.Int defined in B
+// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract fun foo(): Int defined in B
 interface A {
     fun <caret>foo(): Int
 }

idea/testData/intentions/implementAbstractMember/property/noDirectOverridesNeeded.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: kotlin.Int defined in B
+// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: Int defined in B
 interface A {
     val <caret>foo: Int
 }

idea/testData/intentions/implementAsConstructorParameter/noDirectOverridesNeeded.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: kotlin.Int defined in B
+// ERROR: Class 'C' must be declared abstract or implement abstract base class member public abstract val foo: Int defined in B
 interface A {
     val <caret>foo: Int
 }

idea/testData/intentions/importAllMembers/AmbiguousCalls.kt

@@ -1,7 +1,7 @@
 // INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
 // WITH_RUNTIME
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: java.awt.Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: java.awt.Component!, p1: kotlin.Int, p2: kotlin.Int, p3: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: java.awt.Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: java.awt.Component!, p1: kotlin.Int, p2: kotlin.Int, p3: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: Component!, p1: Int, p2: Int, p3: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: Component!, p1: Int, p2: Int, p3: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
 // ERROR: Unresolved reference: unresolved
 
 import javax.swing.SwingUtilities

idea/testData/intentions/importAllMembers/AmbiguousCalls.kt.after

@@ -1,7 +1,7 @@
 // INTENTION_TEXT: "Import members from 'javax.swing.SwingUtilities'"
 // WITH_RUNTIME
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: java.awt.Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: java.awt.Component!, p1: kotlin.Int, p2: kotlin.Int, p3: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: java.awt.Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: java.awt.Component!, p1: kotlin.Int, p2: kotlin.Int, p3: java.awt.Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: Component!, p1: Int, p2: Int, p3: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public open fun convertPoint(p0: Component!, p1: [ERROR : Unresolved java classifier: Point]!, p2: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities<br>public open fun convertPoint(p0: Component!, p1: Int, p2: Int, p3: Component!): [ERROR : Unresolved java classifier: Point]! defined in javax.swing.SwingUtilities
 // ERROR: Unresolved reference: unresolved
 
 import javax.swing.SwingUtilities

idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt

@@ -1,5 +1,5 @@
 // IS_AVAILABLE: true
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: kotlin.Int = ..., f: (kotlin.Int) -> kotlin.Int): kotlin.Unit defined in root package<br>public fun bar(a: kotlin.Int, b: kotlin.Int, f: (kotlin.Int) -> kotlin.Int): kotlin.Unit defined in root package
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: Int = ..., f: (Int) -> Int): Unit defined in root package<br>public fun bar(a: Int, b: Int, f: (Int) -> Int): Unit defined in root package
 // ERROR: Unresolved reference: it
 // SKIP_ERRORS_AFTER
 

idea/testData/intentions/moveLambdaOutsideParentheses/ambigousOverload.kt.after

@@ -1,5 +1,5 @@
 // IS_AVAILABLE: true
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: kotlin.Int = ..., f: (kotlin.Int) -> kotlin.Int): kotlin.Unit defined in root package<br>public fun bar(a: kotlin.Int, b: kotlin.Int, f: (kotlin.Int) -> kotlin.Int): kotlin.Unit defined in root package
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public fun bar(a: Int = ..., f: (Int) -> Int): Unit defined in root package<br>public fun bar(a: Int, b: Int, f: (Int) -> Int): Unit defined in root package
 // ERROR: Unresolved reference: it
 // SKIP_ERRORS_AFTER
 

idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: true
-// ERROR: Type mismatch: inferred type is () -> ??? but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is () -> ??? but Int was expected
 // ERROR: No value passed for parameter b
 // ERROR: Unresolved reference: it
 // SKIP_ERRORS_AFTER

idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt.after

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: true
-// ERROR: Type mismatch: inferred type is () -> ??? but kotlin.Int was expected
+// ERROR: Type mismatch: inferred type is () -> ??? but Int was expected
 // ERROR: No value passed for parameter b
 // ERROR: Unresolved reference: it
 // SKIP_ERRORS_AFTER

idea/testData/intentions/removeExplicitSuperQualifier/IncompleteCallAmbiguous.kt

@@ -1,5 +1,5 @@
 // IS_APPLICABLE: false
-// ERROR: None of the following functions can be called with the arguments supplied: <br>public final fun foo(p: kotlin.Int): kotlin.Unit defined in B<br>public open fun foo(p: kotlin.String): kotlin.Unit defined in B
+// ERROR: None of the following functions can be called with the arguments supplied: <br>public final fun foo(p: Int): Unit defined in B<br>public open fun foo(p: String): Unit defined in B
 
 open class B {
     open fun foo(p: String){}

idea/testData/intentions/specifyTypeExplicitly/publicMember.kt

@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 // WITH_RUNTIME
-// 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 A {
     public fun <caret>foo() {

idea/testData/intentions/swapBinaryExpression/is.kt

@@ -1,6 +1,6 @@
 // IS_APPLICABLE: false
 // ERROR: 'if' must have both main and 'else' branches if used as an expression
-// ERROR: Expression 'if "test" is String' of type 'kotlin.Unit' cannot be invoked as a function. The function invoke() is not found
+// ERROR: Expression 'if "test" is String' of type 'Unit' cannot be invoked as a function. The function invoke() is not found
 
 fun <T> doSomething(a: T) {}