[Tests] Update test data after changes to FIR diagnostic messages

2023-08-11 11:00:37 +02:00
parent de1c92a32f
commit d0cc86f52c
101 changed files with 675 additions and 227 deletions
@@ -82,4 +82,4 @@ KtErrorCallInfo:
          callableIdIfNonLocal = null)
      }
  ]
-  diagnostic = ERROR<NONE_APPLICABLE: None of the following functions are applicable: [fun function(a: Char): Unit, fun function(b: Boolean): Unit, fun function(c: String): Unit]>
+  diagnostic = ERROR<NONE_APPLICABLE: None of the following functions is applicable: [fun function(a: Char): Unit, fun function(b: Boolean): Unit, fun function(c: String): Unit]>
@@ -47,4 +47,4 @@ KtErrorCallInfo:
      typeArgumentsMapping = {}
      argumentMapping = {}
  ]
-  diagnostic = ERROR<NONE_APPLICABLE: None of the following functions are applicable: [fun Int.invoke(a: String): Unit, fun Int.invoke(b: Boolean): Unit]>
+  diagnostic = ERROR<NONE_APPLICABLE: None of the following functions is applicable: [fun Int.invoke(a: String): Unit, fun Int.invoke(b: Boolean): Unit]>
@@ -106,4 +106,4 @@ KtErrorCallInfo:
          callableIdIfNonLocal = null)
      }
  ]
-  diagnostic = ERROR<NONE_APPLICABLE: None of the following functions are applicable: [fun <T> function(t: T, a: Char): Unit, fun <U> function(u: U, b: Boolean): Unit, fun <V> function(v: V, c: String): Unit]>
+  diagnostic = ERROR<NONE_APPLICABLE: None of the following functions is applicable: [fun <T> function(t: T, a: Char): Unit, fun <U> function(u: U, b: Boolean): Unit, fun <V> function(v: V, c: String): Unit]>
@@ -100,4 +100,4 @@ KtErrorCallInfo:
          callableIdIfNonLocal = null)
      }
  ]
-  diagnostic = ERROR<NONE_APPLICABLE: None of the following functions are applicable: [fun <T> function(t: T, a: Char): Unit, fun <U> function(u: U, b: Boolean): Unit, fun <V> function(v: V, c: String): Unit]>
+  diagnostic = ERROR<NONE_APPLICABLE: None of the following functions is applicable: [fun <T> function(t: T, a: Char): Unit, fun <U> function(u: U, b: Boolean): Unit, fun <V> function(v: V, c: String): Unit]>
@@ -28,4 +28,4 @@ KtErrorCallInfo:
          callableIdIfNonLocal = null)
      }
  ]
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/String' but 'kotlin/Int' was expected>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/String', but 'kotlin/Int' was expected.>
@@ -47,4 +47,4 @@ KtErrorCallInfo:
      typeArgumentsMapping = {}
      argumentMapping = {}
  ]
-  diagnostic = ERROR<NONE_APPLICABLE: None of the following functions are applicable: [constructor(p: Int): Sub, constructor(i: Int, j: Int): Sub]>
+  diagnostic = ERROR<NONE_APPLICABLE: None of the following functions is applicable: [constructor(p: Int): Sub, constructor(i: Int, j: Int): Sub]>
@@ -1,3 +1,3 @@
 KtErrorCallInfo:
  candidateCalls = []
-  diagnostic = ERROR<UNRESOLVED_REFERENCE: Unresolved reference: Obj>
+  diagnostic = ERROR<UNRESOLVED_REFERENCE: Unresolved reference 'Obj'.>
@@ -0,0 +1,3 @@
+KtErrorCallInfo:
+  candidateCalls = []
+  diagnostic = ERROR<UNRESOLVED_REFERENCE: Unresolved reference: a>
@@ -1,3 +1,3 @@
 KtErrorCallInfo:
  candidateCalls = []
-  diagnostic = ERROR<UNRESOLVED_REFERENCE: Unresolved reference: a>
+  diagnostic = ERROR<UNRESOLVED_REFERENCE: Unresolved reference 'a'.>
@@ -0,0 +1,40 @@
+KtErrorCallInfo:
+  candidateCalls = [
+    KtSimpleFunctionCall:
+      isImplicitInvoke = false
+      partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+        dispatchReceiver = KtExplicitReceiverValue:
+          expression = c
+          isSafeNavigation = false
+          type = C
+        extensionReceiver = null
+        signature = KtFunctionLikeSignature:
+          receiverType = null
+          returnType = kotlin.Boolean
+          symbol = /C.get(<dispatch receiver>: C, a: kotlin.Int, b: kotlin.String): kotlin.Boolean
+          valueParameters = [
+            KtVariableLikeSignature:
+              name = a
+              receiverType = null
+              returnType = kotlin.Int
+              symbol = a: kotlin.Int
+              callableIdIfNonLocal = null,
+            KtVariableLikeSignature:
+              name = b
+              receiverType = null
+              returnType = kotlin.String
+              symbol = b: kotlin.String
+              callableIdIfNonLocal = null
+          ]
+          callableIdIfNonLocal = /C.get
+      typeArgumentsMapping = {}
+      argumentMapping = {
+        1 -> (KtVariableLikeSignature:
+          name = a
+          receiverType = null
+          returnType = kotlin.Int
+          symbol = a: kotlin.Int
+          callableIdIfNonLocal = null)
+      }
+  ]
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
@@ -37,4 +37,4 @@ KtErrorCallInfo:
          callableIdIfNonLocal = null)
      }
  ]
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'.>
@@ -43,4 +43,4 @@ KtErrorCallInfo:
          callableIdIfNonLocal = null)
      }
  ]
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.get(a: kotlin/Int, b: kotlin/String): kotlin/Boolean>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for 'public final operator fun /C.get(a: kotlin/Int, b: kotlin/String): kotlin/Boolean'.>
@@ -0,0 +1,52 @@
+KtErrorCallInfo:
+  candidateCalls = [
+    KtSimpleFunctionCall:
+      isImplicitInvoke = false
+      partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+        dispatchReceiver = KtExplicitReceiverValue:
+          expression = c
+          isSafeNavigation = false
+          type = C
+        extensionReceiver = null
+        signature = KtFunctionLikeSignature:
+          receiverType = null
+          returnType = kotlin.Unit
+          symbol = /C.set(<dispatch receiver>: C, a: kotlin.Int, b: kotlin.String, value: kotlin.Boolean): kotlin.Unit
+          valueParameters = [
+            KtVariableLikeSignature:
+              name = a
+              receiverType = null
+              returnType = kotlin.Int
+              symbol = a: kotlin.Int
+              callableIdIfNonLocal = null,
+            KtVariableLikeSignature:
+              name = b
+              receiverType = null
+              returnType = kotlin.String
+              symbol = b: kotlin.String
+              callableIdIfNonLocal = null,
+            KtVariableLikeSignature:
+              name = value
+              receiverType = null
+              returnType = kotlin.Boolean
+              symbol = value: kotlin.Boolean
+              callableIdIfNonLocal = null
+          ]
+          callableIdIfNonLocal = /C.set
+      typeArgumentsMapping = {}
+      argumentMapping = {
+        1 -> (KtVariableLikeSignature:
+          name = a
+          receiverType = null
+          returnType = kotlin.Int
+          symbol = a: kotlin.Int
+          callableIdIfNonLocal = null),
+        false -> (KtVariableLikeSignature:
+          name = value
+          receiverType = null
+          returnType = kotlin.Boolean
+          symbol = value: kotlin.Boolean
+          callableIdIfNonLocal = null)
+      }
+  ]
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
@@ -49,4 +49,4 @@ KtErrorCallInfo:
          callableIdIfNonLocal = null)
      }
  ]
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'.>
@@ -55,4 +55,4 @@ KtErrorCallInfo:
          callableIdIfNonLocal = null)
      }
  ]
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.set(a: kotlin/Int, b: kotlin/String, value: kotlin/Boolean): kotlin/Unit>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for 'public final operator fun /C.set(a: kotlin/Int, b: kotlin/String, value: kotlin/Boolean): kotlin/Unit'.>
@@ -1,3 +1,3 @@
 KtErrorCallInfo:
  candidateCalls = []
-  diagnostic = ERROR<UNRESOLVED_REFERENCE: Unresolved reference: divAssign>
+  diagnostic = ERROR<UNRESOLVED_REFERENCE: Unresolved reference 'divAssign'.>
@@ -1,3 +1,3 @@
 KtErrorCallInfo:
  candidateCalls = []
-  diagnostic = ERROR<UNRESOLVED_REFERENCE: Unresolved reference: get>
+  diagnostic = ERROR<UNRESOLVED_REFERENCE: Unresolved reference 'get'.>
@@ -17,4 +17,4 @@ KtErrorCallInfo:
      typeArgumentsMapping = {}
      argumentMapping = {}
  ]
-  diagnostic = ERROR<INVISIBLE_REFERENCE: Cannot access 'fun foo(): Unit': it is private in '/A'>
+  diagnostic = ERROR<INVISIBLE_REFERENCE: Cannot access 'fun foo(): Unit': it is private in '/A'.>
@@ -14,4 +14,4 @@ KtErrorCallInfo:
      typeArgumentsMapping = {}
      argumentMapping = {}
  ]
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final fun /foo(): kotlin/Unit>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for 'public final fun /foo(): kotlin/Unit'.>
@@ -1,3 +1,3 @@
 KtErrorCallInfo:
  candidateCalls = []
-  diagnostic = ERROR<UNRESOLVED_REFERENCE: Unresolved reference: function>
+  diagnostic = ERROR<UNRESOLVED_REFERENCE: Unresolved reference 'function'.>
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int' but 'kotlin/Char' was expected>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int', but 'kotlin/Char' was expected.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -30,7 +30,7 @@ KtInapplicableCallCandidateInfo:
  isInBestCandidates = true

 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int' but 'kotlin/Boolean' was expected>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int', but 'kotlin/Boolean' was expected.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -61,7 +61,7 @@ KtInapplicableCallCandidateInfo:
  isInBestCandidates = true

 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int' but 'kotlin/String' was expected>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int', but 'kotlin/String' was expected.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -89,4 +89,4 @@ KtInapplicableCallCandidateInfo:
        symbol = c: kotlin.String
        callableIdIfNonLocal = null)
    }
-  isInBestCandidates = true
+  isInBestCandidates = true
@@ -0,0 +1,77 @@
+KtInapplicableCallCandidateInfo:
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'a'>
+  candidate = KtSimpleFunctionCall:
+    isImplicitInvoke = true
+    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+      dispatchReceiver = null
+      extensionReceiver = KtExplicitReceiverValue:
+        expression = x
+        isSafeNavigation = false
+        type = kotlin.Int
+      signature = KtFunctionLikeSignature:
+        receiverType = kotlin.Int
+        returnType = kotlin.Unit
+        symbol = invoke(<extension receiver>: kotlin.Int, a: kotlin.String): kotlin.Unit
+        valueParameters = [
+          KtVariableLikeSignature:
+            name = a
+            receiverType = null
+            returnType = kotlin.String
+            symbol = a: kotlin.String
+            callableIdIfNonLocal = null
+        ]
+        callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
+    argumentMapping = {}
+  isInBestCandidates = true
+
+KtInapplicableCallCandidateInfo:
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
+  candidate = KtSimpleFunctionCall:
+    isImplicitInvoke = true
+    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+      dispatchReceiver = null
+      extensionReceiver = KtExplicitReceiverValue:
+        expression = x
+        isSafeNavigation = false
+        type = kotlin.Int
+      signature = KtFunctionLikeSignature:
+        receiverType = kotlin.Int
+        returnType = kotlin.Unit
+        symbol = invoke(<extension receiver>: kotlin.Int, b: kotlin.Boolean): kotlin.Unit
+        valueParameters = [
+          KtVariableLikeSignature:
+            name = b
+            receiverType = null
+            returnType = kotlin.Boolean
+            symbol = b: kotlin.Boolean
+            callableIdIfNonLocal = null
+        ]
+        callableIdIfNonLocal = null
+    typeArgumentsMapping = {}
+    argumentMapping = {}
+  isInBestCandidates = true
+
+KtInapplicableCallCandidateInfo:
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'c'>
+  candidate = KtSimpleFunctionCall:
+    isImplicitInvoke = false
+    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+      dispatchReceiver = null
+      extensionReceiver = null
+      signature = KtFunctionLikeSignature:
+        receiverType = null
+        returnType = kotlin.Unit
+        symbol = /x(c: kotlin.Char): kotlin.Unit
+        valueParameters = [
+          KtVariableLikeSignature:
+            name = c
+            receiverType = null
+            returnType = kotlin.Char
+            symbol = c: kotlin.Char
+            callableIdIfNonLocal = null
+        ]
+        callableIdIfNonLocal = /x
+    typeArgumentsMapping = {}
+    argumentMapping = {}
+  isInBestCandidates = false
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'a'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'a'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = true
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -26,7 +26,7 @@ KtInapplicableCallCandidateInfo:
  isInBestCandidates = true

 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = true
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -53,7 +53,7 @@ KtInapplicableCallCandidateInfo:
  isInBestCandidates = true

 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'c'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'c'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -74,4 +74,4 @@ KtInapplicableCallCandidateInfo:
        callableIdIfNonLocal = /x
    typeArgumentsMapping = {}
    argumentMapping = {}
-  isInBestCandidates = false
+  isInBestCandidates = false
@@ -0,0 +1,116 @@
+KtInapplicableCallCandidateInfo:
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'a'>
+  candidate = KtSimpleFunctionCall:
+    isImplicitInvoke = false
+    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+      dispatchReceiver = null
+      extensionReceiver = null
+      signature = KtFunctionLikeSignature:
+        receiverType = null
+        returnType = kotlin.Unit
+        symbol = /function(t: T, a: kotlin.Char): kotlin.Unit
+        valueParameters = [
+          KtVariableLikeSignature:
+            name = t
+            receiverType = null
+            returnType = kotlin.Int
+            symbol = t: T
+            callableIdIfNonLocal = null,
+          KtVariableLikeSignature:
+            name = a
+            receiverType = null
+            returnType = kotlin.Char
+            symbol = a: kotlin.Char
+            callableIdIfNonLocal = null
+        ]
+        callableIdIfNonLocal = /function
+    typeArgumentsMapping = {
+      T -> (kotlin.Int)
+    }
+    argumentMapping = {
+      1 -> (KtVariableLikeSignature:
+        name = t
+        receiverType = null
+        returnType = kotlin.Int
+        symbol = t: T
+        callableIdIfNonLocal = null)
+    }
+  isInBestCandidates = true
+
+KtInapplicableCallCandidateInfo:
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
+  candidate = KtSimpleFunctionCall:
+    isImplicitInvoke = false
+    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+      dispatchReceiver = null
+      extensionReceiver = null
+      signature = KtFunctionLikeSignature:
+        receiverType = null
+        returnType = kotlin.Unit
+        symbol = /function(u: U, b: kotlin.Boolean): kotlin.Unit
+        valueParameters = [
+          KtVariableLikeSignature:
+            name = u
+            receiverType = null
+            returnType = kotlin.Int
+            symbol = u: U
+            callableIdIfNonLocal = null,
+          KtVariableLikeSignature:
+            name = b
+            receiverType = null
+            returnType = kotlin.Boolean
+            symbol = b: kotlin.Boolean
+            callableIdIfNonLocal = null
+        ]
+        callableIdIfNonLocal = /function
+    typeArgumentsMapping = {
+      U -> (kotlin.Int)
+    }
+    argumentMapping = {
+      1 -> (KtVariableLikeSignature:
+        name = u
+        receiverType = null
+        returnType = kotlin.Int
+        symbol = u: U
+        callableIdIfNonLocal = null)
+    }
+  isInBestCandidates = true
+
+KtInapplicableCallCandidateInfo:
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'c'>
+  candidate = KtSimpleFunctionCall:
+    isImplicitInvoke = false
+    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+      dispatchReceiver = null
+      extensionReceiver = null
+      signature = KtFunctionLikeSignature:
+        receiverType = null
+        returnType = kotlin.Unit
+        symbol = /function(v: V, c: kotlin.String): kotlin.Unit
+        valueParameters = [
+          KtVariableLikeSignature:
+            name = v
+            receiverType = null
+            returnType = kotlin.Int
+            symbol = v: V
+            callableIdIfNonLocal = null,
+          KtVariableLikeSignature:
+            name = c
+            receiverType = null
+            returnType = kotlin.String
+            symbol = c: kotlin.String
+            callableIdIfNonLocal = null
+        ]
+        callableIdIfNonLocal = /function
+    typeArgumentsMapping = {
+      V -> (kotlin.Int)
+    }
+    argumentMapping = {
+      1 -> (KtVariableLikeSignature:
+        name = v
+        receiverType = null
+        returnType = kotlin.Int
+        symbol = v: V
+        callableIdIfNonLocal = null)
+    }
+  isInBestCandidates = true
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'a'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'a'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -38,7 +38,7 @@ KtInapplicableCallCandidateInfo:
  isInBestCandidates = true

 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -77,7 +77,7 @@ KtInapplicableCallCandidateInfo:
  isInBestCandidates = true

 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'c'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'c'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -113,4 +113,4 @@ KtInapplicableCallCandidateInfo:
        symbol = v: V
        callableIdIfNonLocal = null)
    }
-  isInBestCandidates = true
+  isInBestCandidates = true
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'a'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'a'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -36,7 +36,7 @@ KtInapplicableCallCandidateInfo:
  isInBestCandidates = true

 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -73,7 +73,7 @@ KtInapplicableCallCandidateInfo:
  isInBestCandidates = true

 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'c'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'c'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -107,4 +107,4 @@ KtInapplicableCallCandidateInfo:
        symbol = v: V
        callableIdIfNonLocal = null)
    }
-  isInBestCandidates = true
+  isInBestCandidates = true
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for protected constructor(): A>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for 'protected constructor(): A'.>
  candidate = KtDelegatedConstructorCall:
    kind = SUPER_CALL
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -16,7 +16,7 @@ KtInapplicableCallCandidateInfo:
  isInBestCandidates = false

 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<INVISIBLE_REFERENCE: Cannot access 'constructor(p: String): A': it is private in '/A'>
+  diagnostic = ERROR<INVISIBLE_REFERENCE: Cannot access 'constructor(p: String): A': it is private in '/A'.>
  candidate = KtDelegatedConstructorCall:
    kind = SUPER_CALL
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -48,7 +48,7 @@ KtApplicableCallCandidateInfo:
  isInBestCandidates = true

 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final inline fun <T, K> kotlin/collections/Iterable<T>.kotlin/collections/groupBy(keySelector: (T) -> K): kotlin/collections/Map<K, kotlin/collections/List<T>>>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for 'public final inline fun <T, K> kotlin/collections/Iterable<T>.kotlin/collections/groupBy(keySelector: (T) -> K): kotlin/collections/Map<K, kotlin/collections/List<T>>'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -130,4 +130,4 @@ KtInapplicableCallCandidateInfo:
        symbol = valueTransform: kotlin.Function1<kotlin.Pair<kotlin.Int, kotlin.Int>, kotlin.Int>
        callableIdIfNonLocal = null)
    }
-  isInBestCandidates = false
+  isInBestCandidates = false
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Boolean' but 'kotlin/Int' was expected>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Boolean', but 'kotlin/Int' was expected.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = true
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -33,7 +33,7 @@ KtInapplicableCallCandidateInfo:
  isInBestCandidates = false

 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Boolean' but 'kotlin/Char' was expected>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Boolean', but 'kotlin/Char' was expected.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -91,4 +91,4 @@ KtApplicableCallCandidateInfo:
        symbol = b: kotlin.Boolean
        callableIdIfNonLocal = null)
    }
-  isInBestCandidates = true
+  isInBestCandidates = true
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int' but 'kotlin/Boolean' was expected>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int', but 'kotlin/Boolean' was expected.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int' but 'kotlin/String' was expected>
+  diagnostic = ERROR<ARGUMENT_TYPE_MISMATCH: Argument type mismatch: actual type is 'kotlin/Int', but 'kotlin/String' was expected.>
  candidate = KtDelegatedConstructorCall:
    kind = SUPER_CALL
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public constructor(): A>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for 'public constructor(): A'.>
  candidate = KtDelegatedConstructorCall:
    kind = SUPER_CALL
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -0,0 +1,39 @@
+KtInapplicableCallCandidateInfo:
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
+  candidate = KtSimpleFunctionCall:
+    isImplicitInvoke = false
+    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+      dispatchReceiver = KtExplicitReceiverValue:
+        expression = c
+        isSafeNavigation = false
+        type = C
+      extensionReceiver = null
+      signature = KtFunctionLikeSignature:
+        receiverType = null
+        returnType = kotlin.Boolean
+        symbol = /C.get(<dispatch receiver>: C, a: kotlin.Int, b: kotlin.String): kotlin.Boolean
+        valueParameters = [
+          KtVariableLikeSignature:
+            name = a
+            receiverType = null
+            returnType = kotlin.Int
+            symbol = a: kotlin.Int
+            callableIdIfNonLocal = null,
+          KtVariableLikeSignature:
+            name = b
+            receiverType = null
+            returnType = kotlin.String
+            symbol = b: kotlin.String
+            callableIdIfNonLocal = null
+        ]
+        callableIdIfNonLocal = /C.get
+    typeArgumentsMapping = {}
+    argumentMapping = {
+      1 -> (KtVariableLikeSignature:
+        name = a
+        receiverType = null
+        returnType = kotlin.Int
+        symbol = a: kotlin.Int
+        callableIdIfNonLocal = null)
+    }
+  isInBestCandidates = true
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -36,4 +36,4 @@ KtInapplicableCallCandidateInfo:
        symbol = a: kotlin.Int
        callableIdIfNonLocal = null)
    }
-  isInBestCandidates = true
+  isInBestCandidates = true
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.get(a: kotlin/Int, b: kotlin/String): kotlin/Boolean>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for 'public final operator fun /C.get(a: kotlin/Int, b: kotlin/String): kotlin/Boolean'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -42,4 +42,4 @@ KtInapplicableCallCandidateInfo:
        symbol = b: kotlin.String
        callableIdIfNonLocal = null)
    }
-  isInBestCandidates = true
+  isInBestCandidates = true
@@ -0,0 +1,51 @@
+KtInapplicableCallCandidateInfo:
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
+  candidate = KtSimpleFunctionCall:
+    isImplicitInvoke = false
+    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
+      dispatchReceiver = KtExplicitReceiverValue:
+        expression = c
+        isSafeNavigation = false
+        type = C
+      extensionReceiver = null
+      signature = KtFunctionLikeSignature:
+        receiverType = null
+        returnType = kotlin.Unit
+        symbol = /C.set(<dispatch receiver>: C, a: kotlin.Int, b: kotlin.String, value: kotlin.Boolean): kotlin.Unit
+        valueParameters = [
+          KtVariableLikeSignature:
+            name = a
+            receiverType = null
+            returnType = kotlin.Int
+            symbol = a: kotlin.Int
+            callableIdIfNonLocal = null,
+          KtVariableLikeSignature:
+            name = b
+            receiverType = null
+            returnType = kotlin.String
+            symbol = b: kotlin.String
+            callableIdIfNonLocal = null,
+          KtVariableLikeSignature:
+            name = value
+            receiverType = null
+            returnType = kotlin.Boolean
+            symbol = value: kotlin.Boolean
+            callableIdIfNonLocal = null
+        ]
+        callableIdIfNonLocal = /C.set
+    typeArgumentsMapping = {}
+    argumentMapping = {
+      1 -> (KtVariableLikeSignature:
+        name = a
+        receiverType = null
+        returnType = kotlin.Int
+        symbol = a: kotlin.Int
+        callableIdIfNonLocal = null),
+      false -> (KtVariableLikeSignature:
+        name = value
+        receiverType = null
+        returnType = kotlin.Boolean
+        symbol = value: kotlin.Boolean
+        callableIdIfNonLocal = null)
+    }
+  isInBestCandidates = true
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'>
+  diagnostic = ERROR<NO_VALUE_FOR_PARAMETER: No value passed for parameter 'b'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -48,4 +48,4 @@ KtInapplicableCallCandidateInfo:
        symbol = value: kotlin.Boolean
        callableIdIfNonLocal = null)
    }
-  isInBestCandidates = true
+  isInBestCandidates = true
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final operator fun /C.set(a: kotlin/Int, b: kotlin/String, value: kotlin/Boolean): kotlin/Unit>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for 'public final operator fun /C.set(a: kotlin/Int, b: kotlin/String, value: kotlin/Boolean): kotlin/Unit'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -54,4 +54,4 @@ KtInapplicableCallCandidateInfo:
        symbol = value: kotlin.Boolean
        callableIdIfNonLocal = null)
    }
-  isInBestCandidates = true
+  isInBestCandidates = true
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<INVISIBLE_REFERENCE: Cannot access 'fun foo(): Unit': it is private in '/A'>
+  diagnostic = ERROR<INVISIBLE_REFERENCE: Cannot access 'fun foo(): Unit': it is private in '/A'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -16,4 +16,4 @@ KtInapplicableCallCandidateInfo:
        callableIdIfNonLocal = /A.foo
    typeArgumentsMapping = {}
    argumentMapping = {}
-  isInBestCandidates = true
+  isInBestCandidates = true
@@ -1,5 +1,5 @@
 KtInapplicableCallCandidateInfo:
-  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for public final fun /foo(): kotlin/Unit>
+  diagnostic = ERROR<TOO_MANY_ARGUMENTS: Too many arguments for 'public final fun /foo(): kotlin/Unit'.>
  candidate = KtSimpleFunctionCall:
    isImplicitInvoke = false
    partiallyAppliedSymbol = KtPartiallyAppliedSymbol:
@@ -13,4 +13,4 @@ KtInapplicableCallCandidateInfo:
        callableIdIfNonLocal = /foo
    typeArgumentsMapping = {}
    argumentMapping = {}
-  isInBestCandidates = true
+  isInBestCandidates = true
@@ -1,17 +1,17 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/conflictingProjection.kt:10:19: error: projection is conflicting with variance of the corresponding type parameter of 'Out<in kotlin/Int>'. Remove the projection or replace it with '*'
+compiler/testData/cli/jvm/conflictingProjection.kt:10:19: error: projection is conflicting with variance of the corresponding type parameter of 'Out<in kotlin/Int>'. Remove the projection or replace it with '*'.
 fun a8(value: Out<in Int>) {}
                  ^
-compiler/testData/cli/jvm/conflictingProjection.kt:17:15: error: variance annotations are only allowed for type parameters of classes and interfaces
+compiler/testData/cli/jvm/conflictingProjection.kt:17:15: error: variance annotations are only allowed for type parameters of classes and interfaces.
 typealias A13<in K> = In<K>
              ^
-compiler/testData/cli/jvm/conflictingProjection.kt:18:15: error: variance annotations are only allowed for type parameters of classes and interfaces
+compiler/testData/cli/jvm/conflictingProjection.kt:18:15: error: variance annotations are only allowed for type parameters of classes and interfaces.
 typealias A14<in K> = In<in K>
              ^
-compiler/testData/cli/jvm/conflictingProjection.kt:19:15: error: variance annotations are only allowed for type parameters of classes and interfaces
+compiler/testData/cli/jvm/conflictingProjection.kt:19:15: error: variance annotations are only allowed for type parameters of classes and interfaces.
 typealias A15<in K> = In<out K>
              ^
-compiler/testData/cli/jvm/conflictingProjection.kt:19:26: error: projection is conflicting with variance of the corresponding type parameter of 'In<out K>'. Remove the projection or replace it with '*'
+compiler/testData/cli/jvm/conflictingProjection.kt:19:26: error: projection is conflicting with variance of the corresponding type parameter of 'In<out K>'. Remove the projection or replace it with '*'.
 typealias A15<in K> = In<out K>
                         ^
 COMPILATION_ERROR
@@ -1,5 +1,5 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/extendedCheckers.kt:2:12: warning: redundant explicit type
+compiler/testData/cli/jvm/extendedCheckers.kt:2:12: warning: redundant explicit type.
    val i: Int = 1
           ^
 OK
@@ -1,11 +1,11 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/firDeprecationJava.kt:3:12: warning: '@Deprecated(...) fun stop(): Unit' is deprecated. Deprecated in Java
+compiler/testData/cli/jvm/firDeprecationJava.kt:3:12: warning: '@Deprecated(...) fun stop(): Unit' is deprecated. Deprecated in Java.
    thread.stop()
           ^
-compiler/testData/cli/jvm/firDeprecationJava.kt:4:17: warning: '@Deprecated(...) fun bar(a: String!, b: Int, c: Double): String!' is deprecated. Deprecated in Java
+compiler/testData/cli/jvm/firDeprecationJava.kt:4:17: warning: '@Deprecated(...) fun bar(a: String!, b: Int, c: Double): String!' is deprecated. Deprecated in Java.
    JavaClass().bar("", 1, 2.0)
                ^
-compiler/testData/cli/jvm/firDeprecationJava.kt:5:27: warning: '@Deprecated(...) field baz: List!' is deprecated. Deprecated in Java
+compiler/testData/cli/jvm/firDeprecationJava.kt:5:27: warning: '@Deprecated(...) field baz: List!' is deprecated. Deprecated in Java.
    val baz = JavaClass().baz
                          ^
 OK
@@ -1,20 +1,20 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/firError.kt:1:13: error: 'val' on function parameter is not allowed
+compiler/testData/cli/jvm/firError.kt:1:13: error: 'val' on function parameter is prohibited.
 fun println(val x: Int) {}
            ^
-compiler/testData/cli/jvm/firError.kt:5:13: error: variable 'x' must be initialized
+compiler/testData/cli/jvm/firError.kt:5:13: error: variable 'x' must be initialized.
    println(x)
            ^
-compiler/testData/cli/jvm/firError.kt:10:16: error: public subclass exposes its private-in-file supertype 'Private'
+compiler/testData/cli/jvm/firError.kt:10:16: error: subclass 'public' exposes its 'private-in-file' supertype 'Private'.
 class Public : Private() {
               ^
-compiler/testData/cli/jvm/firError.kt:10:16: error: this type is final, so it cannot be inherited from
+compiler/testData/cli/jvm/firError.kt:10:16: error: this type is final, so it cannot be extended.
 class Public : Private() {
               ^
-compiler/testData/cli/jvm/firError.kt:11:5: error: property must be initialized or be abstract
+compiler/testData/cli/jvm/firError.kt:11:5: error: property must be initialized or be abstract.
    val x: Private
    ^
-compiler/testData/cli/jvm/firError.kt:11:9: error: public property exposes its private-in-file type 'Private'
+compiler/testData/cli/jvm/firError.kt:11:9: error: property 'public' exposes its 'private-in-file' type 'Private'.
    val x: Private
        ^
 COMPILATION_ERROR
@@ -1,8 +1,8 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/firErrorOnLastLine.kt:1:9: error: 'this' is not defined in this context
+compiler/testData/cli/jvm/firErrorOnLastLine.kt:1:9: error: 'this' is not defined in this context.
 val x = this
        ^
-compiler/testData/cli/jvm/firErrorOnLastLine.kt:2:9: error: 'this' is not defined in this context
+compiler/testData/cli/jvm/firErrorOnLastLine.kt:2:9: error: 'this' is not defined in this context.
 val y = this // EOL AFTER THIS LINE!
        ^
 COMPILATION_ERROR
@@ -1,8 +1,8 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/firErrorOnLastLineNoEol.kt:1:9: error: 'this' is not defined in this context
+compiler/testData/cli/jvm/firErrorOnLastLineNoEol.kt:1:9: error: 'this' is not defined in this context.
 val x = this
        ^
-compiler/testData/cli/jvm/firErrorOnLastLineNoEol.kt:2:9: error: 'this' is not defined in this context
+compiler/testData/cli/jvm/firErrorOnLastLineNoEol.kt:2:9: error: 'this' is not defined in this context.
 val y = this // *NO* EOL AFTER THIS LINE!
        ^
 COMPILATION_ERROR
@@ -1,8 +1,8 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.kt:2:11: error: unresolved reference: NullPointerException
+compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.kt:2:11: error: unresolved reference 'NullPointerException'.
    throw NullPointerException()
          ^
-compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.kt:2:11: error: type mismatch: inferred type is 'ERROR CLASS: Unresolved name: NullPointerException' but 'kotlin/Throwable' was expected
+compiler/testData/cli/jvm/firFriendlyErrorIfNoJdkOptionIsSet.kt:2:11: error: type mismatch: inferred type is 'ERROR CLASS: Unresolved name: NullPointerException', but 'kotlin/Throwable' was expected.
    throw NullPointerException()
          ^
 COMPILATION_ERROR
@@ -1,14 +1,14 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/firLightTree.kt:2:5: error: variable expected
+compiler/testData/cli/jvm/firLightTree.kt:2:5: error: variable expected.
    this += "Alpha"
    ^
-compiler/testData/cli/jvm/firLightTree.kt:3:15: error: classifier 'class System : Any' does not have a companion object, and thus must be initialized here
+compiler/testData/cli/jvm/firLightTree.kt:3:15: error: classifier 'class System : Any' does not have a companion object, so it cannot be used as an expression.
    java.lang.System = null
              ^
-compiler/testData/cli/jvm/firLightTree.kt:3:15: error: variable expected
+compiler/testData/cli/jvm/firLightTree.kt:3:15: error: variable expected.
    java.lang.System = null
              ^
-compiler/testData/cli/jvm/firLightTree.kt:3:24: error: null can not be a value of a non-null type 'kotlin/Unit'
+compiler/testData/cli/jvm/firLightTree.kt:3:24: error: null cannot be a value of a non-null type 'kotlin/Unit'.
    java.lang.System = null
                       ^
 COMPILATION_ERROR
@@ -1,14 +1,14 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/firLightTree.kt:2:5: error: variable expected
+compiler/testData/cli/jvm/firLightTree.kt:2:5: error: variable expected.
    this += "Alpha"
    ^
-compiler/testData/cli/jvm/firLightTree.kt:3:15: error: classifier 'class System : Any' does not have a companion object, and thus must be initialized here
+compiler/testData/cli/jvm/firLightTree.kt:3:15: error: classifier 'class System : Any' does not have a companion object, so it cannot be used as an expression.
    java.lang.System = null
              ^
-compiler/testData/cli/jvm/firLightTree.kt:3:15: error: variable expected
+compiler/testData/cli/jvm/firLightTree.kt:3:15: error: variable expected.
    java.lang.System = null
              ^
-compiler/testData/cli/jvm/firLightTree.kt:3:24: error: null can not be a value of a non-null type 'kotlin/Unit'
+compiler/testData/cli/jvm/firLightTree.kt:3:24: error: null cannot be a value of a non-null type 'kotlin/Unit'.
    java.lang.System = null
                       ^
 COMPILATION_ERROR
@@ -1,5 +1,5 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/firSyntaxError.kt:1:10: error: syntax error: Expecting '}'
+compiler/testData/cli/jvm/firSyntaxError.kt:1:10: error: syntax error: Expecting '}'.
 fun a() {
         ^
 COMPILATION_ERROR
@@ -1,29 +1,29 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:6:1: error: 'lateinit' modifier is not allowed on delegated properties
+compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:6:1: error: 'lateinit' modifier 'is not allowed on delegated properties'.
 lateinit var kest by Delegate
 ^
-compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:9:5: error: 'lateinit' modifier is allowed only on mutable properties
+compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:9:5: error: 'lateinit' modifier 'is allowed only on mutable properties'.
    lateinit val fest = "10"
    ^
-compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:9:5: error: 'lateinit' modifier is not allowed on properties with initializer
+compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:9:5: error: 'lateinit' modifier 'is not allowed on properties with initializer'.
    lateinit val fest = "10"
    ^
-compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:11:5: error: 'lateinit' modifier is not allowed on properties of a type with nullable upper bound
+compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:11:5: error: 'lateinit' modifier 'is not allowed on properties of a type with nullable upper bound'.
    lateinit var xest: String?
    ^
-compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:12:5: error: 'lateinit' modifier is not allowed on properties of primitive types
+compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:12:5: error: 'lateinit' modifier 'is not allowed on properties of primitive types'.
    lateinit var nest: Int
    ^
-compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:13:5: error: 'lateinit' modifier is allowed only on mutable properties
+compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:13:5: error: 'lateinit' modifier 'is allowed only on mutable properties'.
    lateinit val dest: String
    ^
-compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:13:5: error: 'lateinit' modifier is not allowed on properties with a custom getter or setter
+compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:13:5: error: 'lateinit' modifier 'is not allowed on properties with a custom getter or setter'.
    lateinit val dest: String
    ^
-compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:18:5: error: 'lateinit' modifier is not allowed on properties of a type with nullable upper bound
+compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:18:5: error: 'lateinit' modifier 'is not allowed on properties of a type with nullable upper bound'.
    lateinit var best: T
    ^
-compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:23:5: error: 'lateinit' modifier is not allowed on local variables with initializer
+compiler/testData/cli/jvm/inapplicableLateinitModifier.kt:23:5: error: 'lateinit' modifier 'is not allowed on local variables with initializer'.
    lateinit var b: B<String> = B()
    ^
 COMPILATION_ERROR
@@ -1,20 +1,20 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:2:26: error: cannot access '<this>' before the instance has been initialized
+compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:2:26: error: cannot access '<this>' before the instance has been initialized.
    constructor(x: Int = getSomeInt(), other: A = this, header: String = keker) {}
                         ^
-compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:2:51: error: cannot access '<this>' before the instance has been initialized
+compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:2:51: error: cannot access '<this>' before the instance has been initialized.
    constructor(x: Int = getSomeInt(), other: A = this, header: String = keker) {}
                                                  ^
-compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:2:74: error: cannot access '<this>' before the instance has been initialized
+compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:2:74: error: cannot access '<this>' before the instance has been initialized.
    constructor(x: Int = getSomeInt(), other: A = this, header: String = keker) {}
                                                                         ^
-compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:7:20: error: 'this' is not defined in this context
+compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:7:20: error: 'this' is not defined in this context.
 class B(other: B = this)
                   ^
-compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:10:32: error: argument type mismatch: actual type is 'kotlin/Function0<ERROR CLASS: Unknown return lambda parameter type>' but 'kotlin/Int' was expected
+compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:10:32: error: argument type mismatch: actual type is 'kotlin/Function0<ERROR CLASS: Unknown return lambda parameter type>', but 'kotlin/Int' was expected.
    constructor(x: Int) : this({
                               ^
-compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:12:9: error: cannot access '<this>' before the instance has been initialized
+compiler/testData/cli/jvm/instanceAccessBeforeSuperCall.kt:12:9: error: cannot access '<this>' before the instance has been initialized.
        this
        ^
 COMPILATION_ERROR
@@ -1,8 +1,8 @@
 warning: language version 2.0 is experimental, there are no backwards compatibility guarantees for new language and library features
-compiler/testData/cli/jvm/twoDiagnosticsOnSingleElement.kt:11:1: error: class C is not abstract and does not implement abstract member foo
+compiler/testData/cli/jvm/twoDiagnosticsOnSingleElement.kt:11:1: error: 'Class C' is not abstract and does not implement abstract member 'foo'.
 class C : I1, I2
 ^
-compiler/testData/cli/jvm/twoDiagnosticsOnSingleElement.kt:11:1: error: c inherits conflicting members: foo, foo
+compiler/testData/cli/jvm/twoDiagnosticsOnSingleElement.kt:11:1: error: 'C' inherits conflicting members: foo, foo.
 class C : I1, I2
 ^
 COMPILATION_ERROR
@@ -1,10 +1,10 @@
-compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadata/anonymousObjectTypeMetadata.kt:11:10: error: cannot access 'val o3: Any': it is private in file
+compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadata/anonymousObjectTypeMetadata.kt:11:10: error: cannot access 'val o3: Any': it is private in file.
 val e1 = o3
         ^
-compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadata/anonymousObjectTypeMetadata.kt:12:12: error: cannot access 'val o7: Any': it is private in 'lib/W'
+compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadata/anonymousObjectTypeMetadata.kt:12:12: error: cannot access 'val o7: Any': it is private in 'lib/W'.
 val e2 = w.o7
           ^
-compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadata/anonymousObjectTypeMetadata.kt:13:12: error: cannot access 'val o10: Any': it is private in 'lib/O'
+compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadata/anonymousObjectTypeMetadata.kt:13:12: error: cannot access 'val o10: Any': it is private in 'lib/O'.
 val e3 = O.o10
           ^
 COMPILATION_ERROR
@@ -1,10 +1,10 @@
-compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadataKlib/anonymousObjectTypeMetadata.kt:11:10: error: cannot access 'val o3: Any': it is private in file
+compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadataKlib/anonymousObjectTypeMetadata.kt:11:10: error: cannot access 'val o3: Any': it is private in file.
 val e1 = o3
         ^
-compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadataKlib/anonymousObjectTypeMetadata.kt:12:12: error: cannot access 'val o7: Any': it is private in 'lib/W'
+compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadataKlib/anonymousObjectTypeMetadata.kt:12:12: error: cannot access 'val o7: Any': it is private in 'lib/W'.
 val e2 = w.o7
           ^
-compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadataKlib/anonymousObjectTypeMetadata.kt:13:12: error: cannot access 'val o10: Any': it is private in 'lib/O'
+compiler/testData/compileKotlinAgainstCustomBinaries/anonymousObjectTypeMetadataKlib/anonymousObjectTypeMetadata.kt:13:12: error: cannot access 'val o10: Any': it is private in 'lib/O'.
 val e3 = O.o10
           ^
 COMPILATION_ERROR
@@ -0,0 +1,4 @@
+compiler/testData/compileKotlinAgainstCustomBinaries/classFromJdkInLibrary/source.kt:4:10: error: unresolved reference 'methodWhichDoesNotExistInJdk'.
+    Date.methodWhichDoesNotExistInJdk()
+         ^
+COMPILATION_ERROR
@@ -0,0 +1,16 @@
+compiler/testData/compileKotlinAgainstCustomBinaries/contextualDeclarationUse/contextualDeclarationUse.kt:6:9: error: to use contextual declarations, specify the '-Xcontext-receivers' compiler option.
+        f()
+        ^
+compiler/testData/compileKotlinAgainstCustomBinaries/contextualDeclarationUse/contextualDeclarationUse.kt:7:17: error: to use contextual declarations, specify the '-Xcontext-receivers' compiler option.
+        val a = A()
+                ^
+compiler/testData/compileKotlinAgainstCustomBinaries/contextualDeclarationUse/contextualDeclarationUse.kt:8:11: error: to use contextual declarations, specify the '-Xcontext-receivers' compiler option.
+        a.p
+          ^
+compiler/testData/compileKotlinAgainstCustomBinaries/contextualDeclarationUse/contextualDeclarationUse.kt:9:11: error: to use contextual declarations, specify the '-Xcontext-receivers' compiler option.
+        a.m()
+          ^
+compiler/testData/compileKotlinAgainstCustomBinaries/contextualDeclarationUse/contextualDeclarationUse.kt:10:9: error: to use contextual declarations, specify the '-Xcontext-receivers' compiler option.
+        p
+        ^
+COMPILATION_ERROR
@@ -1,19 +1,19 @@
-compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:3:21: error: cannot access 'interface InternalInterface : Any': it is internal in file
+compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:3:21: error: cannot access 'interface InternalInterface : Any': it is internal in file.
 private fun test(i: InternalInterface): InternalTypealias {
                    ^
-compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:3:41: error: cannot access 'typealias InternalTypealias = InternalInterface': it is internal in file
+compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:3:41: error: cannot access 'typealias InternalTypealias = InternalInterface': it is internal in file.
 private fun test(i: InternalInterface): InternalTypealias {
                                        ^
-compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:4:19: error: cannot access 'fun internalMemberFun(): Unit': it is internal in 'a/PublicClass'
+compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:4:19: error: cannot access 'fun internalMemberFun(): Unit': it is internal in 'a/PublicClass'.
    PublicClass().internalMemberFun()
                  ^
-compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:5:17: error: cannot access 'companion object Companion : Any': it is internal in 'a/PublicClass'
+compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:5:17: error: cannot access 'companion object Companion : Any': it is internal in 'a/PublicClass'.
    PublicClass.Companion
                ^
-compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:7:5: error: cannot access 'fun internalFun(s: String): String': it is internal in file
+compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:7:5: error: cannot access 'fun internalFun(s: String): String': it is internal in file.
    internalFun(internalVal)
    ^
-compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:7:17: error: cannot access 'val internalVal: String': it is internal in file
+compiler/testData/compileKotlinAgainstCustomBinaries/internalFromForeignModule/source.kt:7:17: error: cannot access 'val internalVal: String': it is internal in file.
    internalFun(internalVal)
                ^
 COMPILATION_ERROR
@@ -0,0 +1,4 @@
+compiler/testData/compileKotlinAgainstCustomBinaries/jvmDefaultNonDefaultInheritanceSuperCall/source.kt:5:22: error: interfaces can only call JVM-default members via super within JVM-default members. Please use '-Xjvm-default=all/all-compatibility' modes for such calls.
+        return super.evaluate()
+                     ^
+COMPILATION_ERROR
@@ -1,7 +1,7 @@
-compiler/testData/compileKotlinAgainstCustomBinaries/prohibitNestedClassesByDollarName/main.kt:6:10: error: unresolved reference: Outer$Nested
+compiler/testData/compileKotlinAgainstCustomBinaries/prohibitNestedClassesByDollarName/main.kt:6:10: error: unresolved reference 'Outer$Nested'.
    test.`Outer$Nested`()
         ^
-compiler/testData/compileKotlinAgainstCustomBinaries/prohibitNestedClassesByDollarName/main.kt:9:10: error: unresolved reference: JavaOuter$JavaNested
+compiler/testData/compileKotlinAgainstCustomBinaries/prohibitNestedClassesByDollarName/main.kt:9:10: error: unresolved reference 'JavaOuter$JavaNested'.
    test.`JavaOuter$JavaNested`()
         ^
 COMPILATION_ERROR
@@ -0,0 +1,17 @@
+warning: ATTENTION!
+This build uses unsafe internal compiler arguments:
+
+-XXLanguage:+AllowSealedInheritorsInDifferentFilesOfSamePackage
+-XXLanguage:+SealedInterfaces
+
+This mode is not recommended for production use,
+as no stability/compatibility guarantees are given on
+compiler or generated code. Use it at your own risk!
+
+compiler/testData/compileKotlinAgainstCustomBinaries/sealedInheritorInDifferentModule/main.kt:5:11: error: extending sealed classes or interfaces from a different module is prohibited.
+class B : Base(), IBase
+          ^
+compiler/testData/compileKotlinAgainstCustomBinaries/sealedInheritorInDifferentModule/main.kt:5:19: error: extending sealed classes or interfaces from a different module is prohibited.
+class B : Base(), IBase
+                  ^
+COMPILATION_ERROR
@@ -1,27 +1,27 @@
-/b.kt:(96,97): error: Cannot access 'class B : Any': it is private in file
+/b.kt:(96,97): error: Cannot access 'class B : Any': it is private in file.

-/b.kt:(107,108): error: Cannot access 'class B : Any': it is private in file
+/b.kt:(107,108): error: Cannot access 'class B : Any': it is private in file.

-/b.kt:(145,154): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'
+/b.kt:(145,154): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'.

-/b.kt:(168,169): error: Cannot access 'class D : Any': it is private in file
+/b.kt:(168,169): error: Cannot access 'class D : Any': it is private in file.

-/b.kt:(179,180): error: Cannot access 'class D : Any': it is private in file
+/b.kt:(179,180): error: Cannot access 'class D : Any': it is private in file.

-/b.kt:(181,190): error: Cannot access 'companion object Companion : Any': it is private in 'a/D'
+/b.kt:(181,190): error: Cannot access 'companion object Companion : Any': it is private in 'a/D'.

-/b.kt:(225,226): error: Cannot access 'class B : Any': it is private in file
+/b.kt:(225,226): error: Cannot access 'class B : Any': it is private in file.

-/b.kt:(243,244): error: Cannot access 'class D : Any': it is private in file
+/b.kt:(243,244): error: Cannot access 'class D : Any': it is private in file.

-/b.kt:(263,264): error: Cannot access 'class B : Any': it is private in file
+/b.kt:(263,264): error: Cannot access 'class B : Any': it is private in file.

-/b.kt:(265,268): error: Cannot access 'class B : Any': it is private in file
+/b.kt:(265,268): error: Cannot access 'class B : Any': it is private in file.

-/b.kt:(277,280): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'
+/b.kt:(277,280): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'.

-/b.kt:(287,288): error: Cannot access 'class D : Any': it is private in file
+/b.kt:(287,288): error: Cannot access 'class D : Any': it is private in file.

-/b.kt:(289,293): error: Cannot access 'companion object Companion : Any': it is private in 'a/D'
+/b.kt:(289,293): error: Cannot access 'companion object Companion : Any': it is private in 'a/D'.

-/b.kt:(319,322): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'
+/b.kt:(319,322): error: Cannot access 'companion object Companion : Any': it is private in 'a/C'.
@@ -1 +1 @@
-/kt47986Default.fir.kt:(175,183): error: Not enough information to infer type variable K
+/kt47986Default.fir.kt:(175,183): error: Not enough information to infer type argument for 'K'.
@@ -1 +1 @@
-/kt47986Disabled.fir.kt:(249,257): error: Not enough information to infer type variable K
+/kt47986Disabled.fir.kt:(249,257): error: Not enough information to infer type argument for 'K'.
@@ -1 +1 @@
-/kt47986_2.fir.kt:(187,195): error: Not enough information to infer type variable K
+/kt47986_2.fir.kt:(187,195): error: Not enough information to infer type argument for 'K'.
@@ -1 +1 @@
-/kt47986_3.fir.kt:(181,189): error: Not enough information to infer type variable K
+/kt47986_3.fir.kt:(181,189): error: Not enough information to infer type argument for 'K'.
@@ -1 +1 @@
-/kt51464.fir.kt:(298,307): error: Not enough information to infer type variable R
+/kt51464.fir.kt:(298,307): error: Not enough information to infer type argument for 'R'.
@@ -1 +1 @@
-/kt45461.kt:(245,252): warning: Type argument for a type parameter S can't be inferred because it has incompatible upper bounds: kotlin/String, kotlin/Int (multiple incompatible classes). This will become an error in Kotlin 2.0
+/kt45461.kt:(245,252): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, kotlin/Int (multiple incompatible classes). This will become an error in Kotlin 2.0.
@@ -1 +1 @@
-/kt45461_12.kt:(296,303): warning: Type argument for a type parameter S can't be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0
+/kt45461_12.kt:(296,303): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0.
@@ -1,3 +1,3 @@
-/kt45461_2.kt:(198,201): warning: 'kotlin/Int' is a final type, and thus a value of the type parameter is predetermined
+/kt45461_2.kt:(198,201): warning: Type 'kotlin/Int' is final, so the value of the type parameter is predetermined.

-/kt45461_2.kt:(253,260): warning: Type argument for a type parameter S can't be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Int). This will become an error in Kotlin 2.0
+/kt45461_2.kt:(253,260): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Int). This will become an error in Kotlin 2.0.
@@ -1,5 +1,5 @@
-/kt45461_25.fir.kt:(176,180): warning: Unchecked cast: 'kotlin/Nothing?' to 'S'
+/kt45461_25.fir.kt:(176,180): warning: Unchecked cast of 'kotlin/Nothing?' to 'S'.

-/kt45461_25.fir.kt:(206,209): warning: 'kotlin/Int' is a final type, and thus a value of the type parameter is predetermined
+/kt45461_25.fir.kt:(206,209): warning: Type 'kotlin/Int' is final, so the value of the type parameter is predetermined.

-/kt45461_25.fir.kt:(276,283): error: Type argument for a type parameter S can't be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Int)
+/kt45461_25.fir.kt:(276,283): error: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Int).
@@ -1,3 +1,3 @@
-/kt45461_26.fir.kt:(176,180): warning: Unchecked cast: 'kotlin/Nothing?' to 'S'
+/kt45461_26.fir.kt:(176,180): warning: Unchecked cast of 'kotlin/Nothing?' to 'S'.

-/kt45461_26.fir.kt:(224,232): warning: 'Out<kotlin/Int>' is a final type, and thus a value of the type parameter is predetermined
+/kt45461_26.fir.kt:(224,232): warning: Type 'Out<kotlin/Int>' is final, so the value of the type parameter is predetermined.
@@ -1 +1 @@
-/kt45461_5.kt:(269,276): warning: Type argument for a type parameter S can't be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0
+/kt45461_5.kt:(269,276): warning: Type argument for type parameter 'S' cannot be inferred because it has incompatible upper bounds: kotlin/String, K (multiple incompatible classes: kotlin/String, kotlin/Number). This will become an error in Kotlin 2.0.
@@ -1,5 +1,5 @@
-/kt48765.kt:(282,285): warning: Type argument for a type parameter T can't be inferred because it has incompatible upper bounds: kotlin/String, kotlin/Number (multiple incompatible classes). This will become an error in Kotlin 2.0
+/kt48765.kt:(282,285): warning: Type argument for type parameter 'T' cannot be inferred because it has incompatible upper bounds: kotlin/String, kotlin/Number (multiple incompatible classes). This will become an error in Kotlin 2.0.

-/kt48765.kt:(345,351): warning: 'kotlin/String' is a final type, and thus a value of the type parameter is predetermined
+/kt48765.kt:(345,351): warning: Type 'kotlin/String' is final, so the value of the type parameter is predetermined.

-/kt48765.kt:(379,383): warning: Unchecked cast: 'kotlin/String' to 'T'
+/kt48765.kt:(379,383): warning: Unchecked cast of 'kotlin/String' to 'T'.
@@ -1 +1 @@
-/kt48935.kt:(240,262): warning: Type argument for a type parameter T has possible incompatible upper bounds: Base, DoesNotImplementBase (final class and interface)
+/kt48935.kt:(240,262): warning: Type argument for type parameter 'T' has possible incompatible upper bounds: Base, DoesNotImplementBase (final class and interface).
@@ -1 +1 @@
-/kt49661.fir.kt:(243,244): warning: Type argument for a type parameter T can't be inferred because it has incompatible upper bounds: Foo, kotlin/Int (multiple incompatible classes). This will become an error in Kotlin 2.0
+/kt49661.fir.kt:(243,244): warning: Type argument for type parameter 'T' cannot be inferred because it has incompatible upper bounds: Foo, kotlin/Int (multiple incompatible classes). This will become an error in Kotlin 2.0.
@@ -1 +1 @@
-/selectFromCovariantAndContravariantTypes.kt:(335,344): warning: Type argument for a type parameter V can't be inferred because it has incompatible upper bounds: A, B (multiple incompatible classes). This will become an error in Kotlin 2.0
+/selectFromCovariantAndContravariantTypes.kt:(335,344): warning: Type argument for type parameter 'V' cannot be inferred because it has incompatible upper bounds: A, B (multiple incompatible classes). This will become an error in Kotlin 2.0.
@@ -1,7 +1,7 @@
-/kt55179.fir.kt:(217,223): warning: Expected performance impact from inlining is insignificant. Inlining works best for functions with parameters of functional types
+/kt55179.fir.kt:(217,223): warning: Expected performance impact from inlining is insignificant. Inlining works best for functions with parameters of function types.

-/kt55179.fir.kt:(240,243): error: Non-private inline function 'fun foo(): Unit' cannot access members of private classes: 'constructor(): Foo'
+/kt55179.fir.kt:(240,243): error: Non-private inline function 'fun foo(): Unit' cannot access members of private class 'constructor(): Foo'.

-/kt55179.fir.kt:(254,263): error: Non-private inline function 'fun foo(): Unit' cannot access members of private classes: 'companion object Companion : Any'
+/kt55179.fir.kt:(254,263): error: Non-private inline function 'fun foo(): Unit' cannot access members of private class 'companion object Companion : Any'.

-/kt55179.fir.kt:(272,280): error: Non-private inline function 'fun foo(): Unit' cannot access members of private classes: 'fun buildFoo(): Foo'
+/kt55179.fir.kt:(272,280): error: Non-private inline function 'fun foo(): Unit' cannot access members of private class 'fun buildFoo(): Foo'.
@@ -1,7 +1,7 @@
-/main.kt:(98,103): error: Argument type mismatch: actual type is 'V' but '@EnhancedNullability V & Any' was expected
+/main.kt:(98,103): error: Argument type mismatch: actual type is 'V', but '@EnhancedNullability V & Any' was expected.

-/main.kt:(119,120): error: Argument type mismatch: actual type is 'kotlin/collections/List<V>' but 'ft<@EnhancedNullability kotlin/collections/MutableList<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|()  V & Any>, @EnhancedNullability kotlin/collections/List<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|()  V & Any>>' was expected
+/main.kt:(119,120): error: Argument type mismatch: actual type is 'kotlin/collections/List<V>', but 'ft<@EnhancedNullability kotlin/collections/MutableList<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|()  V & Any>, @EnhancedNullability kotlin/collections/List<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|()  V & Any>>' was expected.

-/main.kt:(133,138): error: Argument type mismatch: actual type is 'V' but '@EnhancedNullability E & Any' was expected
+/main.kt:(133,138): error: Argument type mismatch: actual type is 'V', but '@EnhancedNullability E & Any' was expected.

-/main.kt:(154,155): error: Argument type mismatch: actual type is 'kotlin/collections/List<V>' but 'ft<@EnhancedNullability kotlin/collections/MutableList<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|()  E & Any>, @EnhancedNullability kotlin/collections/List<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|()  E & Any>>' was expected
+/main.kt:(154,155): error: Argument type mismatch: actual type is 'kotlin/collections/List<V>', but 'ft<@EnhancedNullability kotlin/collections/MutableList<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|()  E & Any>, @EnhancedNullability kotlin/collections/List<@EnhancedNullability @R|org/jetbrains/annotations/NotNull|()  E & Any>>' was expected.
@@ -1,3 +1,3 @@
-/main.kt:(72,80): error: 'takeV' overrides nothing
+/main.kt:(72,80): error: 'takeV' overrides nothing.

-/main.kt:(137,145): error: 'takeVList' overrides nothing
+/main.kt:(137,145): error: 'takeVList' overrides nothing.
@@ -1,11 +1,11 @@
 /jvm.kt:(86,93): warning: Annotation `@Ann()` is missing on actual declaration.
-All annotations from expect `class OnClass : Any` must be present with the same arguments on actual `class OnClass : Any`, otherwise they might behave incorrectly.
+All annotations from expect 'class OnClass : Any' must be present with the same arguments on actual 'class OnClass : Any', otherwise they might behave incorrectly.

 /jvm.kt:(134,142): warning: Annotation `@Ann()` is missing on actual declaration.
-All annotations from expect `fun onMember(): Unit` must be present with the same arguments on actual `fun onMember(): Unit`, otherwise they might behave incorrectly.
+All annotations from expect 'fun onMember(): Unit' must be present with the same arguments on actual 'fun onMember(): Unit', otherwise they might behave incorrectly.

 /jvm.kt:(213,225): warning: Annotation `@Ann()` is missing on actual declaration.
-All annotations from expect `class ViaTypealias : Any` must be present with the same arguments on actual `class ViaTypealiasImpl : Any`, otherwise they might behave incorrectly.
+All annotations from expect 'class ViaTypealias : Any' must be present with the same arguments on actual 'class ViaTypealiasImpl : Any', otherwise they might behave incorrectly.

 /jvm.kt:(279,295): warning: Annotation `@WithArg(s = String(str))` has different arguments on actual declaration: `@WithArg(s = String(other str))`.
-All annotations from expect `fun withDifferentArg(): Unit` must be present with the same arguments on actual `fun withDifferentArg(): Unit`, otherwise they might behave incorrectly.
+All annotations from expect 'fun withDifferentArg(): Unit' must be present with the same arguments on actual 'fun withDifferentArg(): Unit', otherwise they might behave incorrectly.
@@ -1 +1 @@
-/complexExpression.fir.kt:(75,121): warning: Condition is always 'false'
+/complexExpression.fir.kt:(75,121): warning: Condition is always 'false'.
@@ -1,3 +1,3 @@
-/B.kt:(133,134): error: Smart cast to 'kotlin/String' is impossible, because 'x' is a public API property declared in different module
+/B.kt:(133,134): error: Smart cast to 'kotlin/String' is impossible, because 'x' is a public API property declared in different module.

-/B.kt:(265,268): error: Smart cast to 'kotlin/String' is impossible, because 'x' is a public API property declared in different module
+/B.kt:(265,268): error: Smart cast to 'kotlin/String' is impossible, because 'x' is a public API property declared in different module.
@@ -7,7 +7,7 @@ import kotlin.contracts.*

 fun foo(y: Boolean) {
    val x: Int = 42
-    <!CONTRACT_NOT_ALLOWED("Contract should be the first statement")!>contract<!> {
+    <!CONTRACT_NOT_ALLOWED("Contract should be the first statement.")!>contract<!> {
        returns() implies y
    }
 }
@@ -23,14 +23,14 @@ inline fun case1(block: () -> Unit) {
    block()
 }

-inline fun case_2(block: () -> Unit) = <!CONTRACT_NOT_ALLOWED("Contracts are only allowed in function body blocks")!>contract<!> {
+inline fun case_2(block: () -> Unit) = <!CONTRACT_NOT_ALLOWED("Contracts are only allowed in function body blocks.")!>contract<!> {
    callsInPlace(<!USAGE_IS_NOT_INLINABLE!>block<!>, InvocationKind.EXACTLY_ONCE)
 }

 fun case_3(block: () -> Unit) {
    class Class {
        fun innerFun(block2: () -> Unit) {
-            <!CONTRACT_NOT_ALLOWED("Contracts are not allowed for local functions")!>contract<!> {
+            <!CONTRACT_NOT_ALLOWED("Contracts are not allowed for local functions.")!>contract<!> {
                callsInPlace(block2, InvocationKind.EXACTLY_ONCE)
            }
            block2()
@@ -1,7 +1,7 @@
-/labelClashes.fir.kt:(84,87): error: Unresolved reference: inc
+/labelClashes.fir.kt:(84,87): error: Unresolved reference 'inc'.

-/labelClashes.fir.kt:(151,154): error: Unresolved reference: inc
+/labelClashes.fir.kt:(151,154): error: Unresolved reference 'inc'.

-/labelClashes.fir.kt:(268,271): error: Unresolved reference: foo
+/labelClashes.fir.kt:(268,271): error: Unresolved reference 'foo'.

-/labelClashes.fir.kt:(331,334): error: Unresolved reference: foo
+/labelClashes.fir.kt:(331,334): error: Unresolved reference 'foo'.
@@ -1 +1 @@
-/upperBoundViolated2.fir.kt:(111,123): error: Type argument is not within its bounds: should be subtype of 'kotlin/collections/List<kotlin/CharSequence>'
+/upperBoundViolated2.fir.kt:(111,123): error: Type argument is not within its bounds: should be subtype of 'kotlin/collections/List<kotlin/CharSequence>'.
@@ -1,4 +1,4 @@
-compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt:11:12: error: unresolved reference: javax.swing.JFrame
+compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt:11:12: error: unresolved reference 'javax.swing.JFrame'.
    val s: javax.swing.JFrame? = null
           ^
 compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt:12:5: error: overload resolution ambiguity between candidates: [@InlineOnly() fun println(message: Any?): Unit, @InlineOnly() fun println(message: Boolean): Unit, @InlineOnly() fun println(message: Byte): Unit, ...]
@@ -1,4 +1,4 @@
-compiler/testData/javaModules/releaseFlag/moduleSwing/foo/Foo.kt:5:12: error: unresolved reference: javax.swing.JFrame
+compiler/testData/javaModules/releaseFlag/moduleSwing/foo/Foo.kt:5:12: error: unresolved reference 'javax.swing.JFrame'.
    val z: javax.swing.JFrame? = null
           ^
 COMPILATION_ERROR
@@ -0,0 +1,11 @@
+$TMP_DIR$/dependency2.jar: warning: the root is ignored because a module with the same name 'dependency' has been found earlier on the module path at: $TMP_DIR$/dependency1.jar
+compiler/testData/javaModules/severalModulesWithTheSameName/main/usage.kt:2:8: error: unresolved reference 'bar'.
+import bar.Bar
+       ^
+compiler/testData/javaModules/severalModulesWithTheSameName/main/usage.kt:6:12: error: unresolved reference 'Bar'.
+    val b: Bar = Bar()
+           ^
+compiler/testData/javaModules/severalModulesWithTheSameName/main/usage.kt:6:18: error: unresolved reference 'Bar'.
+    val b: Bar = Bar()
+                 ^
+COMPILATION_ERROR
@@ -0,0 +1,7 @@
+compiler/testData/javaModules/unnamedDoesNotReadNotAdded/moduleB/usage.kt:1:8: error: unresolved reference 'foo'.
+import foo.Foo
+       ^
+compiler/testData/javaModules/unnamedDoesNotReadNotAdded/moduleB/usage.kt:4:5: error: unresolved reference 'Foo'.
+    Foo()
+    ^
+COMPILATION_ERROR
@@ -468,7 +468,8 @@ class ScriptingHostTest : TestCase() {
            compilerOptions("-no-stdlib")
        }
        assertTrue(res1 is ResultWithDiagnostics.Failure)
-        res1.reports.find { it.message.startsWith("Unresolved reference: println") }
+        val regex = "Unresolved reference\\W+println".toRegex()
+        res1.reports.find { it.message.contains(regex) }
            ?: fail("Expected unresolved reference report. Reported:\n  ${res1.reports.joinToString("\n  ") { it.message }}")

        val res2 = evalScriptWithConfiguration(script) {
@@ -27,8 +27,8 @@ class EnumEntriesWithOutdatedStdlibTest : KGPBaseTest() {
            buildGradleKts.replaceText("\"1.9\" // <language-version>", "\"2.0\" // <language-version>")

            buildAndFail(":compileKotlin") {
-                assertOutputContains("Main.kt:13:20 Unresolved reference: entries")
-                assertOutputContains("Main.kt:14:30 Unresolved reference: entries")
+                assertOutputContains("Main.kt:13:20 Unresolved reference 'entries'.")
+                assertOutputContains("Main.kt:14:30 Unresolved reference 'entries'.")
            }
        }
    }
@@ -72,7 +72,7 @@ class MainKtsTest {
        val resErr = evalFile(File("$TEST_DATA_ROOT/resolve-error-hamcrest-via-junit.main.kts"))
        Assert.assertTrue(
            resErr is ResultWithDiagnostics.Failure &&
-                    resErr.reports.any { it.message == "Unresolved reference: hamcrest" }
+                    resErr.reports.any { it.message.contains("Unresolved reference") && it.message.contains("hamcrest") }
        )
    }

@@ -299,10 +299,15 @@ class MainKtsTest {
            "test failed - expecting a failure$expected but received " +
                    (if (res is ResultWithDiagnostics.Failure) "failure" else "success") +
                    ":\n  ${reports.joinToString("\n  ")}",
-            res is ResultWithDiagnostics.Failure && reports.any { report -> expectedErrors.any { report.contains(it) } }
+            res is ResultWithDiagnostics.Failure && reports.any { report -> expectedErrors.any { report.containsIgnoringPunctuation(it) } }
        )
    }

+    private val regexNonWord = "\\W".toRegex()
+    private fun String.containsIgnoringPunctuation(it: String): Boolean {
+        return this.replace(regexNonWord, "").contains(it.replace(regexNonWord, ""))
+    }
+
    private fun evalSuccessWithOut(scriptFile: File, cacheDir: File? = null): List<String> =
        captureOut {
            val res = evalFile(scriptFile, cacheDir)
@@ -5,12 +5,17 @@ assertBuildLogHasNoLineThatContains("AutoCloseable");

 int line1 = findBuildLogLineThatContains("Unresolved reference: stream");
 int line2 = findBuildLogLineThatContains("Unresolved reference: java.util.stream.Stream");
+int line1K2 = findBuildLogLineThatContains("Unresolved reference 'stream'");
+int line2K2 = findBuildLogLineThatContains("Unresolved reference 'java.util.stream.Stream'");

 if (line1 >= 0) {
    print("Expected content \"Unresolved reference: stream\" was found at line " + (line1+1) + " of build log: \"" + buildLog[line1] + "\"");
-
 } else if (line2 >= 0) {
    print("Expected content \"Unresolved reference: java.util.stream.Stream\" was found at line " + (line2+1) + " of build log: \"" + buildLog[line2] + "\"");
+} else if (line1K2 >= 0) {
+    print("Expected content \"Unresolved reference 'stream'\" was found at line " + (line1K2+1) + " of build log: \"" + buildLog[line1K2] + "\"");
+} else if (line2K2 >= 0) {
+    print("Expected content \"Unresolved reference 'java.util.stream.Stream'\" was found at line " + (line2K2+1) + " of build log: \"" + buildLog[line2K2] + "\"");
 } else {
    throw new Exception("Expected build log to contain: \"Unresolved reference: stream\" or \"Unresolved reference: java.util.stream.Stream\"");
 }
@@ -1,7 +1,7 @@
-/incorrectUsage.fir.kt:(390,395): error: None of the following functions are applicable: [fun assign(v: String): Unit, fun assign(v: StringProperty): Unit]
+/incorrectUsage.fir.kt:(390,395): error: None of the following functions is applicable: [fun assign(v: String): Unit, fun assign(v: StringProperty): Unit]

 /incorrectUsage.fir.kt:(396,397): error:

-/incorrectUsage.fir.kt:(536,541): error: None of the following functions are applicable: [fun assign(v: String): Unit, fun assign(v: StringProperty): Unit]
+/incorrectUsage.fir.kt:(536,541): error: None of the following functions is applicable: [fun assign(v: String): Unit, fun assign(v: StringProperty): Unit]

 /incorrectUsage.fir.kt:(542,543): error:
@@ -1,13 +1,13 @@
-/localVariables.fir.kt:(401,409): error: Val cannot be reassigned
+/localVariables.fir.kt:(401,409): error: 'val' cannot be reassigned.

-/localVariables.fir.kt:(412,418): error: Assignment type mismatch: actual type is 'kotlin/String' but 'StringProperty' was expected
+/localVariables.fir.kt:(412,418): error: Assignment type mismatch: actual type is 'kotlin/String', but 'StringProperty' was expected.

-/localVariables.fir.kt:(521,529): error: Val cannot be reassigned
+/localVariables.fir.kt:(521,529): error: 'val' cannot be reassigned.

-/localVariables.fir.kt:(673,679): error: Assignment type mismatch: actual type is 'kotlin/String' but 'StringProperty' was expected
+/localVariables.fir.kt:(673,679): error: Assignment type mismatch: actual type is 'kotlin/String', but 'StringProperty' was expected.

-/localVariables.fir.kt:(917,925): error: Val cannot be reassigned
+/localVariables.fir.kt:(917,925): error: 'val' cannot be reassigned.

-/localVariables.fir.kt:(928,934): error: Assignment type mismatch: actual type is 'kotlin/String' but 'StringProperty' was expected
+/localVariables.fir.kt:(928,934): error: Assignment type mismatch: actual type is 'kotlin/String', but 'StringProperty' was expected.

-/localVariables.fir.kt:(995,1003): error: Val cannot be reassigned
+/localVariables.fir.kt:(995,1003): error: 'val' cannot be reassigned.
@@ -8,6 +8,6 @@

 /methodDeclaration.fir.kt:(594,595): error:

-/methodDeclaration.fir.kt:(870,875): error: Val cannot be reassigned
+/methodDeclaration.fir.kt:(870,875): error: 'val' cannot be reassigned.

-/methodDeclaration.fir.kt:(878,880): error: Assignment type mismatch: actual type is 'kotlin/Int' but '<local>/IntProperty' was expected
+/methodDeclaration.fir.kt:(878,880): error: Assignment type mismatch: actual type is 'kotlin/Int', but '<local>/IntProperty' was expected.
@@ -1,19 +1,19 @@
-/noAnnotation.fir.kt:(424,429): error: Val cannot be reassigned
+/noAnnotation.fir.kt:(424,429): error: 'val' cannot be reassigned.

-/noAnnotation.fir.kt:(432,436): error: Assignment type mismatch: actual type is 'kotlin/String' but 'StringProperty' was expected
+/noAnnotation.fir.kt:(432,436): error: Assignment type mismatch: actual type is 'kotlin/String', but 'StringProperty' was expected.

-/noAnnotation.fir.kt:(446,451): error: Val cannot be reassigned
+/noAnnotation.fir.kt:(446,451): error: 'val' cannot be reassigned.

-/noAnnotation.fir.kt:(500,505): error: Val cannot be reassigned
+/noAnnotation.fir.kt:(500,505): error: 'val' cannot be reassigned.

-/noAnnotation.fir.kt:(508,512): error: Assignment type mismatch: actual type is 'kotlin/String' but 'StringProperty' was expected
+/noAnnotation.fir.kt:(508,512): error: Assignment type mismatch: actual type is 'kotlin/String', but 'StringProperty' was expected.

-/noAnnotation.fir.kt:(544,549): error: Val cannot be reassigned
+/noAnnotation.fir.kt:(544,549): error: 'val' cannot be reassigned.

-/noAnnotation.fir.kt:(588,593): error: Val cannot be reassigned
+/noAnnotation.fir.kt:(588,593): error: 'val' cannot be reassigned.

-/noAnnotation.fir.kt:(596,598): error: Assignment type mismatch: actual type is 'kotlin/Int' but 'StringProperty' was expected
+/noAnnotation.fir.kt:(596,598): error: Assignment type mismatch: actual type is 'kotlin/Int', but 'StringProperty' was expected.

-/noAnnotation.fir.kt:(624,629): error: Val cannot be reassigned
+/noAnnotation.fir.kt:(624,629): error: 'val' cannot be reassigned.

-/noAnnotation.fir.kt:(632,634): error: Assignment type mismatch: actual type is 'kotlin/Int' but 'StringProperty' was expected
+/noAnnotation.fir.kt:(632,634): error: Assignment type mismatch: actual type is 'kotlin/Int', but 'StringProperty' was expected.
@@ -1,37 +1,37 @@
-/otherOperators.fir.kt:(456,458): error: Unresolved reference: plusAssign
+/otherOperators.fir.kt:(456,458): error: Unresolved reference 'plusAssign'.

-/otherOperators.fir.kt:(502,504): error: Unresolved reference: plusAssign
+/otherOperators.fir.kt:(502,504): error: Unresolved reference 'plusAssign'.

-/otherOperators.fir.kt:(560,562): error: Unresolved reference: compareTo
+/otherOperators.fir.kt:(560,562): error: Unresolved reference 'compareTo'.

-/otherOperators.fir.kt:(606,608): error: Unresolved reference: compareTo
+/otherOperators.fir.kt:(606,608): error: Unresolved reference 'compareTo'.

-/otherOperators.fir.kt:(664,666): error: Unresolved reference: compareTo
+/otherOperators.fir.kt:(664,666): error: Unresolved reference 'compareTo'.

-/otherOperators.fir.kt:(710,712): error: Unresolved reference: compareTo
+/otherOperators.fir.kt:(710,712): error: Unresolved reference 'compareTo'.

-/otherOperators.fir.kt:(769,772): error: No set method providing array access
+/otherOperators.fir.kt:(769,772): error: No 'set' operator method providing array access.

-/otherOperators.fir.kt:(817,820): error: No set method providing array access
+/otherOperators.fir.kt:(817,820): error: No 'set' operator method providing array access.

-/otherOperators.fir.kt:(882,888): error: No set method providing array access
+/otherOperators.fir.kt:(882,888): error: No 'set' operator method providing array access.

-/otherOperators.fir.kt:(933,939): error: No set method providing array access
+/otherOperators.fir.kt:(933,939): error: No 'set' operator method providing array access.

-/otherOperators.fir.kt:(1003,1012): error: No set method providing array access
+/otherOperators.fir.kt:(1003,1012): error: No 'set' operator method providing array access.

-/otherOperators.fir.kt:(1057,1066): error: No set method providing array access
+/otherOperators.fir.kt:(1057,1066): error: No 'set' operator method providing array access.

-/otherOperators.fir.kt:(1128,1129): error: Too many arguments for public final fun /StringProperty.get(): kotlin/String
+/otherOperators.fir.kt:(1128,1129): error: Too many arguments for 'public final fun /StringProperty.get(): kotlin/String'.

-/otherOperators.fir.kt:(1131,1133): error: Unresolved reference: +=
+/otherOperators.fir.kt:(1131,1133): error: Unresolved reference '+='.

-/otherOperators.fir.kt:(1177,1178): error: Too many arguments for public final fun /StringProperty.get(): kotlin/String
+/otherOperators.fir.kt:(1177,1178): error: Too many arguments for 'public final fun /StringProperty.get(): kotlin/String'.

-/otherOperators.fir.kt:(1180,1182): error: Unresolved reference: +=
+/otherOperators.fir.kt:(1180,1182): error: Unresolved reference '+='.

-/otherOperators.fir.kt:(1325,1328): error: No set method providing array access
+/otherOperators.fir.kt:(1325,1328): error: No 'set' operator method providing array access.

-/otherOperators.fir.kt:(1431,1437): error: Variable expected
+/otherOperators.fir.kt:(1431,1437): error: Variable expected.

-/otherOperators.fir.kt:(1477,1483): error: Variable expected
+/otherOperators.fir.kt:(1477,1483): error: Variable expected.
@@ -1,5 +1,5 @@
-/plusAssignPrecedence.fir.kt:(2202,2204): error: Unresolved reference: plusAssign
+/plusAssignPrecedence.fir.kt:(2202,2204): error: Unresolved reference 'plusAssign'.

-/plusAssignPrecedence.fir.kt:(2227,2229): error: Unresolved reference: plusAssign
+/plusAssignPrecedence.fir.kt:(2227,2229): error: Unresolved reference 'plusAssign'.

 /plusAssignPrecedence.fir.kt:(2308,2310): error: Ambiguity between assign operator candidates: [fun plus(v: String): StringPropertyWithPlusAndPlusAssign, fun plusAssign(v: String): Unit]
--- a/Show More
+++ b/Show More