diff --git a/compiler/fir/analysis-tests/testData/resolve/F.txt b/compiler/fir/analysis-tests/testData/resolve/F.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/F.txt
rename to compiler/fir/analysis-tests/testData/resolve/F.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/NestedOfAliasedType.txt b/compiler/fir/analysis-tests/testData/resolve/NestedOfAliasedType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/NestedOfAliasedType.txt
rename to compiler/fir/analysis-tests/testData/resolve/NestedOfAliasedType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/NestedSuperType.txt b/compiler/fir/analysis-tests/testData/resolve/NestedSuperType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/NestedSuperType.txt
rename to compiler/fir/analysis-tests/testData/resolve/NestedSuperType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/TwoDeclarationsInSameFile.txt b/compiler/fir/analysis-tests/testData/resolve/TwoDeclarationsInSameFile.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/TwoDeclarationsInSameFile.txt
rename to compiler/fir/analysis-tests/testData/resolve/TwoDeclarationsInSameFile.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/ambiguityOnJavaOverride.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/ambiguityOnJavaOverride.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/ambiguityOnJavaOverride.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/ambiguityOnJavaOverride.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfAnnotations.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfAnnotations.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfAnnotations.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfAnnotations.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfJavaAnnotation.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfJavaAnnotation.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfJavaAnnotation.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/argumentsOfJavaAnnotation.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/default.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/default.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/default.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/default.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/defaultFromOverrides.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/definetelyNotNullForTypeParameter.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/definetelyNotNullForTypeParameter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/definetelyNotNullForTypeParameter.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/definetelyNotNullForTypeParameter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/extensionLambdaInDefaultArgument.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/fieldPlusAssign.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/fieldPlusAssign.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/fieldPlusAssign.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/fieldPlusAssign.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/incorrectFunctionalType.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/incorrectFunctionalType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/incorrectFunctionalType.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/incorrectFunctionalType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/integerLiteralTypes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/invoke.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/invoke.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/invoke.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/invoke.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/javaAnnotationsWithArrayValue.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/javaAnnotationsWithArrayValue.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/javaAnnotationsWithArrayValue.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/javaAnnotationsWithArrayValue.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/javaArrayVariance.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/kt41940.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/lambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/lambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/lambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInLambda2.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInUnresolvedCall.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInUnresolvedCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInUnresolvedCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/lambdaInUnresolvedCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/namedArrayInAnnotation.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/namedArrayInAnnotation.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/namedArrayInAnnotation.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/namedArrayInAnnotation.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/operatorsOverLiterals.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/overloadByReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/overloadByReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/overloadByReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/overloadByReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/overloadWithDefault.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/overloadWithDefault.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/overloadWithDefault.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/overloadWithDefault.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/simple.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/simple.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/simple.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/simple.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/stringTemplates.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/stringTemplates.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/stringTemplates.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/stringTemplates.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/tryInLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/untouchedReturnInIf.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/untouchedReturnInIf.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/untouchedReturnInIf.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/untouchedReturnInIf.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/vararg.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/vararg.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/vararg.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/varargOfLambdasWithReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/varargOfLambdasWithReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/varargOfLambdasWithReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/varargOfLambdasWithReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arguments/varargProjection.txt b/compiler/fir/analysis-tests/testData/resolve/arguments/varargProjection.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arguments/varargProjection.txt
rename to compiler/fir/analysis-tests/testData/resolve/arguments/varargProjection.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.txt b/compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.txt
rename to compiler/fir/analysis-tests/testData/resolve/arrays/arraySet.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.txt b/compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.txt
rename to compiler/fir/analysis-tests/testData/resolve/arrays/arraySetWithOperation.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/asImports.txt b/compiler/fir/analysis-tests/testData/resolve/asImports.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/asImports.txt
rename to compiler/fir/analysis-tests/testData/resolve/asImports.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/bareTypes.txt b/compiler/fir/analysis-tests/testData/resolve/bareTypes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/bareTypes.txt
rename to compiler/fir/analysis-tests/testData/resolve/bareTypes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/builtins/lists.txt b/compiler/fir/analysis-tests/testData/resolve/builtins/lists.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/builtins/lists.txt
rename to compiler/fir/analysis-tests/testData/resolve/builtins/lists.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/companionInvoke.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/companionInvoke.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/companionInvoke.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/companionInvoke.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/companionVsSuperStatic.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/companionVsSuperStatic.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/companionVsSuperStatic.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/companionVsSuperStatic.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/debugExpressionType.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/debugExpressionType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/debugExpressionType.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/debugExpressionType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/debugInfoCall.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/debugInfoCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/debugInfoCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/debugInfoCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/errorCandidates.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/extensionInvokeAfterSafeCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeAmbiguity.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeAmbiguity.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/invokeAmbiguity.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/invokeAmbiguity.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/invokeWithReceiverAndArgument.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/lambdaAsReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/objectInvoke.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/objectInvoke.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/objectInvoke.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/objectInvoke.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/superAny.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/superAny.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/superAny.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/superAny.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.fir.txt
similarity index 61%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.fir.txt
index d8831061cc2..29851d47d67 100644
--- a/compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.fir.txt
@@ -17,17 +17,3 @@ FILE: main.kt
         }
         )
     }
-FILE: CHECK_TYPE.kt
-    public final fun <T> checkSubtype(t: R|T|): R|T| {
-        ^checkSubtype R|<local>/t|
-    }
-    public final class CheckTypeInv<T> : R|kotlin/Any| {
-        public constructor<T>(): R|CheckTypeInv<T>| {
-            super<R|kotlin/Any|>()
-        }
-
-    }
-    public final fun <E> R|CheckTypeInv<E>|._(): R|kotlin/Unit| {
-    }
-    public final infix fun <T> R|T|.checkType(f: R|CheckTypeInv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
-    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/typeAliasWithNotNullBound.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/typeAliasWithNotNullBound.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/typeAliasWithNotNullBound.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/typeAliasWithNotNullBound.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/callResolution/uselessMultipleBounds.txt b/compiler/fir/analysis-tests/testData/resolve/callResolution/uselessMultipleBounds.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/callResolution/uselessMultipleBounds.txt
rename to compiler/fir/analysis-tests/testData/resolve/callResolution/uselessMultipleBounds.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cast.txt b/compiler/fir/analysis-tests/testData/resolve/cast.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cast.txt
rename to compiler/fir/analysis-tests/testData/resolve/cast.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/annotatedLocalClass.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/annotatedLocalClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/annotatedLocalClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/annotatedLocalClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/binaryOperations.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/binaryOperations.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/binaryOperations.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/binaryOperations.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/booleanOperatorsWithConsts.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/booleanOperatorsWithConsts.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/booleanOperatorsWithConsts.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/booleanOperatorsWithConsts.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/complex.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/complex.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/complex.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/complex.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/defaultArguments.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/emptyWhen.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/emptyWhen.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/emptyWhen.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/emptyWhen.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/flowFromInplaceLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/initBlock.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/initBlock.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/initBlock.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/initBlock.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/initBlockAndInPlaceLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/innerClassInAnonymousObject.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/innerClassInAnonymousObject.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/innerClassInAnonymousObject.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/innerClassInAnonymousObject.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/inplaceLambdaInControlFlowExpressions.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/jumps.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/jumps.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/jumps.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/lambdaAsReturnOfLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaReturningObject.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdaReturningObject.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/lambdaReturningObject.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/lambdaReturningObject.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/lambdas.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/localClassesWithImplicit.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/loops.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/loops.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/loops.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/loops.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdaInConstructor.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdas.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdas.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdas.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/postponedLambdas.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/propertiesAndInitBlocks.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/returnValuesFromLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/safeCalls.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/safeCalls.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/safeCalls.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/safeCalls.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/simple.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/simple.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/simple.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/simple.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/tryCatch.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/cfg/when.txt b/compiler/fir/analysis-tests/testData/resolve/cfg/when.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/cfg/when.txt
rename to compiler/fir/analysis-tests/testData/resolve/cfg/when.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/companion.txt b/compiler/fir/analysis-tests/testData/resolve/companion.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/companion.txt
rename to compiler/fir/analysis-tests/testData/resolve/companion.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.txt b/compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.txt
rename to compiler/fir/analysis-tests/testData/resolve/companionAccessInEnum.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/companionObjectCall.txt b/compiler/fir/analysis-tests/testData/resolve/companionObjectCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/companionObjectCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/companionObjectCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/companionUsesNested.txt b/compiler/fir/analysis-tests/testData/resolve/companionUsesNested.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/companionUsesNested.txt
rename to compiler/fir/analysis-tests/testData/resolve/companionUsesNested.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/constantValues.txt b/compiler/fir/analysis-tests/testData/resolve/constantValues.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/constantValues.txt
rename to compiler/fir/analysis-tests/testData/resolve/constantValues.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/constructors/noSuperCallInSupertypes.txt b/compiler/fir/analysis-tests/testData/resolve/constructors/noSuperCallInSupertypes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/constructors/noSuperCallInSupertypes.txt
rename to compiler/fir/analysis-tests/testData/resolve/constructors/noSuperCallInSupertypes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/copy.txt b/compiler/fir/analysis-tests/testData/resolve/copy.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/copy.txt
rename to compiler/fir/analysis-tests/testData/resolve/copy.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/covariantArrayAsReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/covariantArrayAsReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/covariantArrayAsReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/covariantArrayAsReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/defaultJavaImportHiding.txt b/compiler/fir/analysis-tests/testData/resolve/defaultJavaImportHiding.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/defaultJavaImportHiding.txt
rename to compiler/fir/analysis-tests/testData/resolve/defaultJavaImportHiding.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.txt b/compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.txt
rename to compiler/fir/analysis-tests/testData/resolve/defaultParametersInheritedToJava.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/definitelyNotNullAmbiguity.txt b/compiler/fir/analysis-tests/testData/resolve/definitelyNotNullAmbiguity.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/definitelyNotNullAmbiguity.txt
rename to compiler/fir/analysis-tests/testData/resolve/definitelyNotNullAmbiguity.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegatedSuperType.txt b/compiler/fir/analysis-tests/testData/resolve/delegatedSuperType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/delegatedSuperType.txt
rename to compiler/fir/analysis-tests/testData/resolve/delegatedSuperType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.txt
rename to compiler/fir/analysis-tests/testData/resolve/delegates/delegateInference.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/delegates/delegateWithLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.txt
rename to compiler/fir/analysis-tests/testData/resolve/delegates/extensionGenericGetValue.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/delegates/extensionGetValueWithTypeVariableAsReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.txt
rename to compiler/fir/analysis-tests/testData/resolve/delegates/kt41982.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.txt b/compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.txt
rename to compiler/fir/analysis-tests/testData/resolve/delegates/provideDelegate.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegatingConstructorCall.txt b/compiler/fir/analysis-tests/testData/resolve/delegatingConstructorCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/delegatingConstructorCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/delegatingConstructorCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/delegatingConstructorsAndTypeAliases.txt b/compiler/fir/analysis-tests/testData/resolve/delegatingConstructorsAndTypeAliases.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/delegatingConstructorsAndTypeAliases.txt
rename to compiler/fir/analysis-tests/testData/resolve/delegatingConstructorsAndTypeAliases.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/derivedClass.txt b/compiler/fir/analysis-tests/testData/resolve/derivedClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/derivedClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/derivedClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/abstractSuperCall.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/abstractSuperCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/abstractSuperCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/abstractSuperCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/abstractSuperCallInPresenseOfNonAbstractMethodInParent.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/abstractSuperCallInPresenseOfNonAbstractMethodInParent.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/abstractSuperCallInPresenseOfNonAbstractMethodInParent.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/abstractSuperCallInPresenseOfNonAbstractMethodInParent.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentKClassLiteralTypeError.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentKClassLiteralTypeError.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentKClassLiteralTypeError.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentKClassLiteralTypeError.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeConst.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeConst.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeConst.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeConst.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeEnumConst.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeEnumConst.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeEnumConst.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeEnumConst.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeKClassLiteral.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeKClassLiteral.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeKClassLiteral.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationArgumentMustBeKClassLiteral.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationClassMember.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationClassMember.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationClassMember.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/annotationClassMember.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/anonymousObjectByDelegate.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/anonymousObjectByDelegate.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/anonymousObjectByDelegate.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/anonymousObjectByDelegate.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/classInSupertypeForEnum.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/classInSupertypeForEnum.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/classInSupertypeForEnum.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/classInSupertypeForEnum.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingOverloads.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingOverloads.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingOverloads.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingOverloads.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/conflictingProjection.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/constructorInInterface.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/constructorInInterface.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/constructorInInterface.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/constructorInInterface.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/cyclicConstructorDelegationCall.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/cyclicConstructorDelegationCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/cyclicConstructorDelegationCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/cyclicConstructorDelegationCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationInInterface.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationInInterface.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationInInterface.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationInInterface.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationSuperCallInEnumConstructor.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationSuperCallInEnumConstructor.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationSuperCallInEnumConstructor.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/delegationSuperCallInEnumConstructor.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/explicitDelegationCallRequired.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/explicitDelegationCallRequired.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/explicitDelegationCallRequired.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/explicitDelegationCallRequired.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/inapplicableLateinitModifier.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/inapplicableLateinitModifier.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/inapplicableLateinitModifier.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/inapplicableLateinitModifier.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/incompatibleModifiers.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/incompatibleModifiers.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/incompatibleModifiers.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/incompatibleModifiers.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/infixFunctions.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/infixFunctions.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/infixFunctions.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/infixFunctions.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/instanceAccessBeforeSuperCall.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/instanceAccessBeforeSuperCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/instanceAccessBeforeSuperCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/instanceAccessBeforeSuperCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/interfaceWithSuperclass.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/interfaceWithSuperclass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/interfaceWithSuperclass.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/interfaceWithSuperclass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/localAnnotationClass.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/localAnnotationClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/localAnnotationClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/localAnnotationClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/localEntitytNotAllowed.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/localEntitytNotAllowed.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/localEntitytNotAllowed.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/localEntitytNotAllowed.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/manyCompanionObjects.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/manyCompanionObjects.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/manyCompanionObjects.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/manyCompanionObjects.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/methodOfAnyImplementedInInterface.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/methodOfAnyImplementedInInterface.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/methodOfAnyImplementedInInterface.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/methodOfAnyImplementedInInterface.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/nonConstValInAnnotationArgument.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/nonConstValInAnnotationArgument.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/nonConstValInAnnotationArgument.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/nonConstValInAnnotationArgument.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/notASupertype.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/notASupertype.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/notASupertype.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/notASupertype.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/primaryConstructorRequiredForDataClass.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/primaryConstructorRequiredForDataClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/primaryConstructorRequiredForDataClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/primaryConstructorRequiredForDataClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/projectionsOnNonClassTypeArguments.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/projectionsOnNonClassTypeArguments.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/projectionsOnNonClassTypeArguments.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/projectionsOnNonClassTypeArguments.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/propertyTypeMismatchOnOverride.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/propertyTypeMismatchOnOverride.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/propertyTypeMismatchOnOverride.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/propertyTypeMismatchOnOverride.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/qualifiedSupertypeExtendedByOtherSupertype.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/qualifiedSupertypeExtendedByOtherSupertype.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/qualifiedSupertypeExtendedByOtherSupertype.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/qualifiedSupertypeExtendedByOtherSupertype.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/redundantModifier.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/redundantModifier.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/redundantModifier.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/redundantModifier.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/repeatedModifier.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/returnTypeMismatchOnOverride.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedClassConstructorCall.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedClassConstructorCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedClassConstructorCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedClassConstructorCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedSupertype.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedSupertype.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedSupertype.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/sealedSupertype.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/someOverridesTest.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/someOverridesTest.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/someOverridesTest.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/someOverridesTest.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/superCallWithDelegation.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/superCallWithDelegation.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/superCallWithDelegation.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/superCallWithDelegation.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/superIsNotAnExpression.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/superIsNotAnExpression.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/superIsNotAnExpression.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/superIsNotAnExpression.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/superNotAvailable.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/superNotAvailable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/superNotAvailable.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/superNotAvailable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/superclassNotAccessibleFromInterface.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/superclassNotAccessibleFromInterface.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/superclassNotAccessibleFromInterface.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/superclassNotAccessibleFromInterface.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedInInterface.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedInInterface.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedInInterface.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedInInterface.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedWithoutPrimaryConstructor.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedWithoutPrimaryConstructor.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedWithoutPrimaryConstructor.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/supertypeInitializedWithoutPrimaryConstructor.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/testIllegalAnnotationClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/typeArgumentsNotAllowed.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeOfAnnotationMember.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeOfAnnotationMember.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/typeOfAnnotationMember.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/typeOfAnnotationMember.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInEnum.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInEnum.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInEnum.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInEnum.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/typeParametersInObject.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/upperBoundViolated.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/valOnAnnotationParameter.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/valOnAnnotationParameter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/diagnostics/valOnAnnotationParameter.txt
rename to compiler/fir/analysis-tests/testData/resolve/diagnostics/valOnAnnotationParameter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/enum.txt b/compiler/fir/analysis-tests/testData/resolve/enum.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/enum.txt
rename to compiler/fir/analysis-tests/testData/resolve/enum.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/enumWithCompanion.txt b/compiler/fir/analysis-tests/testData/resolve/enumWithCompanion.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/enumWithCompanion.txt
rename to compiler/fir/analysis-tests/testData/resolve/enumWithCompanion.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndDNNType.txt b/compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndDNNType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndDNNType.txt
rename to compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndDNNType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndFlexibleType.txt b/compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndFlexibleType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndFlexibleType.txt
rename to compiler/fir/analysis-tests/testData/resolve/exhaustiveWhenAndFlexibleType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_boolean.txt b/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_boolean.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/exhaustiveness_boolean.txt
rename to compiler/fir/analysis-tests/testData/resolve/exhaustiveness_boolean.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_enum.txt b/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_enum.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/exhaustiveness_enum.txt
rename to compiler/fir/analysis-tests/testData/resolve/exhaustiveness_enum.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_enumJava.txt b/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_enumJava.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/exhaustiveness_enumJava.txt
rename to compiler/fir/analysis-tests/testData/resolve/exhaustiveness_enumJava.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedClass.txt b/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedObject.txt b/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedObject.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedObject.txt
rename to compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedObject.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedSubClass.txt b/compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedSubClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedSubClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/exhaustiveness_sealedSubClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/CallBasedInExpressionGenerator.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/access.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/access.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/access.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/access.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/annotationWithReturn.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/annotationWithReturn.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/annotationWithReturn.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/annotationWithReturn.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/annotations.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/annotations.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/annotations.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/annotations.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/baseQualifier.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/baseQualifier.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/baseQualifier.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/baseQualifier.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/blockLocalScopes.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/blockLocalScopes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/blockLocalScopes.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/blockLocalScopes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/checkArguments.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/checkArguments.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/checkArguments.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/checkArguments.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/classifierAccessFromCompanion.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/classifierAccessFromCompanion.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/classifierAccessFromCompanion.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/classifierAccessFromCompanion.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/companion.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/companion.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/companion.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/companion.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/companionExtension.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/companionExtension.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/companionExtension.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/companionExtension.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/constructor.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/constructor.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/constructor.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/constructor.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/dispatchReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/dispatchReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/dispatchReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/dispatchReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/enumEntryUse.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/enumValues.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/errCallable.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/errCallable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/errCallable.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/errCallable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/extensionPropertyInLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDecorator.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDecorator.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/genericDecorator.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/genericDecorator.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/genericDescriptor.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/genericDiagnostic.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/genericPropertyAccess.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/genericUsedInFunction.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/importedReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/id.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/id.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/inference/id.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/inference/id.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/inference/typeParameters2.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/innerQualifier.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/innerQualifier.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/innerQualifier.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/innerQualifier.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/innerWithSuperCompanion.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/innerWithSuperCompanion.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/innerWithSuperCompanion.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/innerWithSuperCompanion.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/doubleBrackets.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/explicitReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/explicitReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/explicitReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/explicitReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/explicitReceiver2.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/explicitReceiver2.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/explicitReceiver2.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/explicitReceiver2.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extension.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extension.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extension.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extension.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionOnObject.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/extensionSafeCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/farInvokeExtension.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/farInvokeExtension.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/farInvokeExtension.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/farInvokeExtension.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/implicitTypeOrder.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/implicitTypeOrder.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/implicitTypeOrder.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/implicitTypeOrder.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/inBrackets.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/incorrectInvokeReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/incorrectInvokeReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/incorrectInvokeReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/incorrectInvokeReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyFromParameter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/propertyWithExtensionType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/simple.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/simple.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/simple.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/simple.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceivers.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceivers.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceivers.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceivers.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/invoke/threeReceiversCorrect.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/javaFieldCallable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/lambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/lambdaWithReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localClassAccessesContainingClass.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localClassAccessesContainingClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/localClassAccessesContainingClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/localClassAccessesContainingClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localConstructor.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localConstructor.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/localConstructor.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/localConstructor.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localExtension.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localExtension.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/localExtension.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/localExtension.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localImplicitBodies.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localImplicitBodies.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/localImplicitBodies.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/localImplicitBodies.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localInnerClass.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localInnerClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/localInnerClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/localInnerClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localObjects.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localObjects.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/localObjects.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/localObjects.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localScopes.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localScopes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/localScopes.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/localScopes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localTypes.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localTypes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/localTypes.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/localTypes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/localWithBooleanNot.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/localWithBooleanNot.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/localWithBooleanNot.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/localWithBooleanNot.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/memberExtension.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/memberExtension.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/memberExtension.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/memberExtension.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedConstructorCallable.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedConstructorCallable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/nestedConstructorCallable.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/nestedConstructorCallable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedObjects.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedObjects.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/nestedObjects.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/nestedObjects.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/nestedVisibility.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/objectOverrideCallViaImport.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/objectOverrideCallViaImport.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/objectOverrideCallViaImport.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/objectOverrideCallViaImport.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/objectVsProperty.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/objectVsProperty.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/objectVsProperty.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/objectVsProperty.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/objects.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/objects.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/objects.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/objects.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plus.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plus.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plus.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plus.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plusAndPlusAssign.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plusAndPlusAssign.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plusAndPlusAssign.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plusAndPlusAssign.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plusAssign.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plusAssign.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plusAssign.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/operators/plusAssign.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/outerMemberAccesses.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/outerObject.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/outerObject.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/outerObject.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/outerObject.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/overriddenJavaGetter.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/overriddenJavaGetter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/overriddenJavaGetter.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/overriddenJavaGetter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/privateObjectLiteral.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/privateVisibility.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/protectedVisibility.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/qualifiedExpressions.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/qualifiedExpressions.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/qualifiedExpressions.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/qualifiedExpressions.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/qualifierPriority.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/qualifierPriority.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/qualifierPriority.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/qualifierPriority.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/receiverConsistency.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/receiverConsistency.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/receiverConsistency.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/receiverConsistency.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/sameReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/sameReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/sameReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/sameReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/simple.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/simple.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/simple.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/simple.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticInImplicitBody.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticInImplicitBody.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticInImplicitBody.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticInImplicitBody.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/syntheticSmartCast.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/this.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/this.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/this.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/this.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/topExtensionVsOuterMember.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/topExtensionVsOuterMember.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/topExtensionVsOuterMember.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/topExtensionVsOuterMember.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/typeAliasConstructor.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/vararg.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/vararg.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/vararg.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/vararg.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/expresssions/when.txt b/compiler/fir/analysis-tests/testData/resolve/expresssions/when.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/expresssions/when.txt
rename to compiler/fir/analysis-tests/testData/resolve/expresssions/when.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/extension.txt b/compiler/fir/analysis-tests/testData/resolve/extension.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/extension.txt
rename to compiler/fir/analysis-tests/testData/resolve/extension.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/fakeRecursiveSupertype.txt b/compiler/fir/analysis-tests/testData/resolve/fakeRecursiveSupertype.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/fakeRecursiveSupertype.txt
rename to compiler/fir/analysis-tests/testData/resolve/fakeRecursiveSupertype.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/fakeRecursiveTypealias.txt b/compiler/fir/analysis-tests/testData/resolve/fakeRecursiveTypealias.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/fakeRecursiveTypealias.txt
rename to compiler/fir/analysis-tests/testData/resolve/fakeRecursiveTypealias.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/fib.txt b/compiler/fir/analysis-tests/testData/resolve/fib.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/fib.txt
rename to compiler/fir/analysis-tests/testData/resolve/fib.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.txt b/compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.txt
rename to compiler/fir/analysis-tests/testData/resolve/flexibleCapturedType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.txt b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.txt
rename to compiler/fir/analysis-tests/testData/resolve/fromBuilder/complexTypes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.txt b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.txt
rename to compiler/fir/analysis-tests/testData/resolve/fromBuilder/enums.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/noPrimaryConstructor.txt b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/noPrimaryConstructor.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/fromBuilder/noPrimaryConstructor.txt
rename to compiler/fir/analysis-tests/testData/resolve/fromBuilder/noPrimaryConstructor.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/simpleClass.txt b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/simpleClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/fromBuilder/simpleClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/fromBuilder/simpleClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/typeParameters.txt b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/typeParameters.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/fromBuilder/typeParameters.txt
rename to compiler/fir/analysis-tests/testData/resolve/fromBuilder/typeParameters.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/ft.txt b/compiler/fir/analysis-tests/testData/resolve/ft.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/ft.txt
rename to compiler/fir/analysis-tests/testData/resolve/ft.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.txt
rename to compiler/fir/analysis-tests/testData/resolve/functionTypeAlias.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/functionTypes.txt b/compiler/fir/analysis-tests/testData/resolve/functionTypes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/functionTypes.txt
rename to compiler/fir/analysis-tests/testData/resolve/functionTypes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/genericConstructors.txt b/compiler/fir/analysis-tests/testData/resolve/genericConstructors.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/genericConstructors.txt
rename to compiler/fir/analysis-tests/testData/resolve/genericConstructors.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/genericFunctions.txt b/compiler/fir/analysis-tests/testData/resolve/genericFunctions.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/genericFunctions.txt
rename to compiler/fir/analysis-tests/testData/resolve/genericFunctions.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/genericReceiverPropertyOverride.txt b/compiler/fir/analysis-tests/testData/resolve/genericReceiverPropertyOverride.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/genericReceiverPropertyOverride.txt
rename to compiler/fir/analysis-tests/testData/resolve/genericReceiverPropertyOverride.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.txt b/compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.txt
rename to compiler/fir/analysis-tests/testData/resolve/implicitTypeInFakeOverride.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/incorrectSuperCall.txt b/compiler/fir/analysis-tests/testData/resolve/incorrectSuperCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/incorrectSuperCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/incorrectSuperCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/callableReferenceOnInstance.txt b/compiler/fir/analysis-tests/testData/resolve/inference/callableReferenceOnInstance.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/callableReferenceOnInstance.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/callableReferenceOnInstance.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/callableReferenceToLocalClass.txt b/compiler/fir/analysis-tests/testData/resolve/inference/callableReferenceToLocalClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/callableReferenceToLocalClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/callableReferenceToLocalClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/callableReferencesAndDefaultParameters.txt b/compiler/fir/analysis-tests/testData/resolve/inference/callableReferencesAndDefaultParameters.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/callableReferencesAndDefaultParameters.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/callableReferencesAndDefaultParameters.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.txt b/compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/capturedTypeForJavaTypeParameter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/coercionToUnitWithEarlyReturn.txt b/compiler/fir/analysis-tests/testData/resolve/inference/coercionToUnitWithEarlyReturn.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/coercionToUnitWithEarlyReturn.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/coercionToUnitWithEarlyReturn.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/definitelyNotNullIntersectionType.txt b/compiler/fir/analysis-tests/testData/resolve/inference/definitelyNotNullIntersectionType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/definitelyNotNullIntersectionType.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/definitelyNotNullIntersectionType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/extensionCallableReferences.txt b/compiler/fir/analysis-tests/testData/resolve/inference/extensionCallableReferences.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/extensionCallableReferences.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/extensionCallableReferences.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.txt b/compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/integerLiteralAsComparable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/intersectionTypesInConstraints.txt b/compiler/fir/analysis-tests/testData/resolve/inference/intersectionTypesInConstraints.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/intersectionTypesInConstraints.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/intersectionTypesInConstraints.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/kt40131.txt b/compiler/fir/analysis-tests/testData/resolve/inference/kt40131.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/kt40131.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/kt40131.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/kt41989.txt b/compiler/fir/analysis-tests/testData/resolve/inference/kt41989.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/kt41989.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/kt41989.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.txt b/compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/lambdaAsReturnStatementOfLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.txt b/compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/lambdaInElvis.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.txt b/compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/nestedExtensionFunctionType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/nestedLambdas.txt b/compiler/fir/analysis-tests/testData/resolve/inference/nestedLambdas.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/nestedLambdas.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/nestedLambdas.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.txt b/compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/nullableIntegerLiteralType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt b/compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/receiverWithCapturedType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.txt b/compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/simpleCapturedTypes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/typeDepthForTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/inference/typeDepthForTypeAlias.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/inference/typeDepthForTypeAlias.txt
rename to compiler/fir/analysis-tests/testData/resolve/inference/typeDepthForTypeAlias.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.txt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.txt
rename to compiler/fir/analysis-tests/testData/resolve/innerClasses/inner.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.txt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.txt
rename to compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypeFromSuperClassInBody.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.txt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.txt
rename to compiler/fir/analysis-tests/testData/resolve/innerClasses/innerTypes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.txt b/compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.txt
rename to compiler/fir/analysis-tests/testData/resolve/innerClasses/simple.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/intersectionScope.txt b/compiler/fir/analysis-tests/testData/resolve/intersectionScope.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/intersectionScope.txt
rename to compiler/fir/analysis-tests/testData/resolve/intersectionScope.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/intersectionTypes.txt b/compiler/fir/analysis-tests/testData/resolve/intersectionTypes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/intersectionTypes.txt
rename to compiler/fir/analysis-tests/testData/resolve/intersectionTypes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.txt b/compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.txt
rename to compiler/fir/analysis-tests/testData/resolve/invokeInWhenSubjectVariableInitializer.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/invokeOfLambdaWithReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.txt b/compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.txt
rename to compiler/fir/analysis-tests/testData/resolve/javaFieldVsAccessor.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.txt b/compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.txt
rename to compiler/fir/analysis-tests/testData/resolve/javaStaticScopeInheritance.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/kt41984.txt b/compiler/fir/analysis-tests/testData/resolve/kt41984.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/kt41984.txt
rename to compiler/fir/analysis-tests/testData/resolve/kt41984.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/kt41990.txt b/compiler/fir/analysis-tests/testData/resolve/kt41990.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/kt41990.txt
rename to compiler/fir/analysis-tests/testData/resolve/kt41990.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/labelAndReceiverForInfix.txt b/compiler/fir/analysis-tests/testData/resolve/labelAndReceiverForInfix.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/labelAndReceiverForInfix.txt
rename to compiler/fir/analysis-tests/testData/resolve/labelAndReceiverForInfix.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.txt b/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.fir.txt
similarity index 86%
rename from compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.txt
rename to compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.fir.txt
index a3013d57256..48797a8dc12 100644
--- a/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/lambdaArgInScopeFunction.fir.txt
@@ -54,17 +54,3 @@ FILE: lambdaArgInScopeFunction.kt
         }
         )
     }
-FILE: CHECK_TYPE.kt
-    public final fun <T> checkSubtype(t: R|T|): R|T| {
-        ^checkSubtype R|<local>/t|
-    }
-    public final class CheckTypeInv<T> : R|kotlin/Any| {
-        public constructor<T>(): R|CheckTypeInv<T>| {
-            super<R|kotlin/Any|>()
-        }
-
-    }
-    public final fun <E> R|CheckTypeInv<E>|._(): R|kotlin/Unit| {
-    }
-    public final infix fun <T> R|T|.checkType(f: R|CheckTypeInv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
-    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.txt b/compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/lambdaInLhsOfTypeOperatorCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt b/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.fir.txt
similarity index 93%
rename from compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt
rename to compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.fir.txt
index 38bcc13dff5..80d838fddd7 100644
--- a/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/lambdaPropertyTypeInference.fir.txt
@@ -172,17 +172,3 @@ FILE: KotlinClass.kt
         }
 
     }
-FILE: CHECK_TYPE.kt
-    public final fun <T> checkSubtype(t: R|T|): R|T| {
-        ^checkSubtype R|<local>/t|
-    }
-    public final class CheckTypeInv<T> : R|kotlin/Any| {
-        public constructor<T>(): R|CheckTypeInv<T>| {
-            super<R|kotlin/Any|>()
-        }
-
-    }
-    public final fun <E> R|CheckTypeInv<E>|._(): R|kotlin/Unit| {
-    }
-    public final infix fun <T> R|T|.checkType(f: R|CheckTypeInv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
-    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInAnonymous.txt b/compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInAnonymous.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInAnonymous.txt
rename to compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInAnonymous.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInLocalClasses.txt b/compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInLocalClasses.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInLocalClasses.txt
rename to compiler/fir/analysis-tests/testData/resolve/localClasses/implicitInLocalClasses.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/localClasses/typesFromSuperClasses.txt b/compiler/fir/analysis-tests/testData/resolve/localClasses/typesFromSuperClasses.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/localClasses/typesFromSuperClasses.txt
rename to compiler/fir/analysis-tests/testData/resolve/localClasses/typesFromSuperClasses.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/localFunctionsHiding.txt b/compiler/fir/analysis-tests/testData/resolve/localFunctionsHiding.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/localFunctionsHiding.txt
rename to compiler/fir/analysis-tests/testData/resolve/localFunctionsHiding.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/localObject.txt b/compiler/fir/analysis-tests/testData/resolve/localObject.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/localObject.txt
rename to compiler/fir/analysis-tests/testData/resolve/localObject.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/multifile/Annotations.txt b/compiler/fir/analysis-tests/testData/resolve/multifile/Annotations.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/multifile/Annotations.txt
rename to compiler/fir/analysis-tests/testData/resolve/multifile/Annotations.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/multifile/ByteArray.txt b/compiler/fir/analysis-tests/testData/resolve/multifile/ByteArray.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/multifile/ByteArray.txt
rename to compiler/fir/analysis-tests/testData/resolve/multifile/ByteArray.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/multifile/NestedSuperType.txt b/compiler/fir/analysis-tests/testData/resolve/multifile/NestedSuperType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/multifile/NestedSuperType.txt
rename to compiler/fir/analysis-tests/testData/resolve/multifile/NestedSuperType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/multifile/TypeAliasExpansion.txt b/compiler/fir/analysis-tests/testData/resolve/multifile/TypeAliasExpansion.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/multifile/TypeAliasExpansion.txt
rename to compiler/fir/analysis-tests/testData/resolve/multifile/TypeAliasExpansion.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/multifile/importFromObject.txt b/compiler/fir/analysis-tests/testData/resolve/multifile/importFromObject.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/multifile/importFromObject.txt
rename to compiler/fir/analysis-tests/testData/resolve/multifile/importFromObject.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/multifile/sealedStarImport.txt b/compiler/fir/analysis-tests/testData/resolve/multifile/sealedStarImport.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/multifile/sealedStarImport.txt
rename to compiler/fir/analysis-tests/testData/resolve/multifile/sealedStarImport.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/multifile/simpleAliasedImport.txt b/compiler/fir/analysis-tests/testData/resolve/multifile/simpleAliasedImport.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/multifile/simpleAliasedImport.txt
rename to compiler/fir/analysis-tests/testData/resolve/multifile/simpleAliasedImport.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/multifile/simpleImport.txt b/compiler/fir/analysis-tests/testData/resolve/multifile/simpleImport.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/multifile/simpleImport.txt
rename to compiler/fir/analysis-tests/testData/resolve/multifile/simpleImport.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/multifile/simpleImportNested.txt b/compiler/fir/analysis-tests/testData/resolve/multifile/simpleImportNested.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/multifile/simpleImportNested.txt
rename to compiler/fir/analysis-tests/testData/resolve/multifile/simpleImportNested.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/multifile/simpleImportOuter.txt b/compiler/fir/analysis-tests/testData/resolve/multifile/simpleImportOuter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/multifile/simpleImportOuter.txt
rename to compiler/fir/analysis-tests/testData/resolve/multifile/simpleImportOuter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/multifile/simpleStarImport.txt b/compiler/fir/analysis-tests/testData/resolve/multifile/simpleStarImport.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/multifile/simpleStarImport.txt
rename to compiler/fir/analysis-tests/testData/resolve/multifile/simpleStarImport.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/nestedClass.txt b/compiler/fir/analysis-tests/testData/resolve/nestedClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/nestedClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/nestedClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/nestedClassContructor.txt b/compiler/fir/analysis-tests/testData/resolve/nestedClassContructor.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/nestedClassContructor.txt
rename to compiler/fir/analysis-tests/testData/resolve/nestedClassContructor.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/nestedClassNameClash.txt b/compiler/fir/analysis-tests/testData/resolve/nestedClassNameClash.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/nestedClassNameClash.txt
rename to compiler/fir/analysis-tests/testData/resolve/nestedClassNameClash.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/nestedReturnType.txt b/compiler/fir/analysis-tests/testData/resolve/nestedReturnType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/nestedReturnType.txt
rename to compiler/fir/analysis-tests/testData/resolve/nestedReturnType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt b/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.fir.txt
similarity index 94%
rename from compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/objectInnerClass.fir.txt
index b16c64244ce..6116ba8e6cd 100644
--- a/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/objectInnerClass.fir.txt
@@ -197,17 +197,3 @@ FILE: objectInnerClass.kt
         }
 
     }
-FILE: CHECK_TYPE.kt
-    public final fun <T> checkSubtype(t: R|T|): R|T| {
-        ^checkSubtype R|<local>/t|
-    }
-    public final class CheckTypeInv<T> : R|kotlin/Any| {
-        public constructor<T>(): R|CheckTypeInv<T>| {
-            super<R|kotlin/Any|>()
-        }
-
-    }
-    public final fun <E> R|CheckTypeInv<E>|._(): R|kotlin/Unit| {
-    }
-    public final infix fun <T> R|T|.checkType(f: R|CheckTypeInv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
-    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.txt b/compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.txt
rename to compiler/fir/analysis-tests/testData/resolve/offOrderMultiBoundGenericOverride.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/openInInterface.txt b/compiler/fir/analysis-tests/testData/resolve/openInInterface.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/openInInterface.txt
rename to compiler/fir/analysis-tests/testData/resolve/openInInterface.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/generics.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/generics.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/overrides/generics.txt
rename to compiler/fir/analysis-tests/testData/resolve/overrides/generics.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.txt
rename to compiler/fir/analysis-tests/testData/resolve/overrides/protobufExt.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/simple.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/simple.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/overrides/simple.txt
rename to compiler/fir/analysis-tests/testData/resolve/overrides/simple.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/simple.kt b/compiler/fir/analysis-tests/testData/resolve/overrides/simple.kt
index 1cb76bb2493..f87bf8fb820 100644
--- a/compiler/fir/analysis-tests/testData/resolve/overrides/simple.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/overrides/simple.kt
@@ -9,7 +9,7 @@ open class A {
 class B : A() {
     override fun foo(): B = this
     fun bar(): B = this // Ambiguity, no override here (really it's just "missing override" and no ambiguity)
-    override fun buz(p: B): B = this //No override as B <!:> A
+    override fun buz(p: B): B = this //No override as B not :> A
 
     fun test() {
         foo()
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.txt
rename to compiler/fir/analysis-tests/testData/resolve/overrides/simpleFakeOverride.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/simpleMostSpecific.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/simpleMostSpecific.fir.txt
similarity index 88%
rename from compiler/fir/analysis-tests/testData/resolve/overrides/simpleMostSpecific.txt
rename to compiler/fir/analysis-tests/testData/resolve/overrides/simpleMostSpecific.fir.txt
index d24df0ce59d..12ff3d185e2 100644
--- a/compiler/fir/analysis-tests/testData/resolve/overrides/simpleMostSpecific.txt
+++ b/compiler/fir/analysis-tests/testData/resolve/overrides/simpleMostSpecific.fir.txt
@@ -70,17 +70,3 @@ FILE: simpleMostSpecific.kt
         }
         )
     }
-FILE: CHECK_TYPE.kt
-    public final fun <T> checkSubtype(t: R|T|): R|T| {
-        ^checkSubtype R|<local>/t|
-    }
-    public final class CheckTypeInv<T> : R|kotlin/Any| {
-        public constructor<T>(): R|CheckTypeInv<T>| {
-            super<R|kotlin/Any|>()
-        }
-
-    }
-    public final fun <E> R|CheckTypeInv<E>|._(): R|kotlin/Unit| {
-    }
-    public final infix fun <T> R|T|.checkType(f: R|CheckTypeInv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
-    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.txt
rename to compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenerics.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.txt
rename to compiler/fir/analysis-tests/testData/resolve/overrides/supertypeGenericsComplex.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/overrides/three.txt b/compiler/fir/analysis-tests/testData/resolve/overrides/three.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/overrides/three.txt
rename to compiler/fir/analysis-tests/testData/resolve/overrides/three.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/compilerPhase.txt b/compiler/fir/analysis-tests/testData/resolve/problems/compilerPhase.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/compilerPhase.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/compilerPhase.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/complexLambdaWithTypeVariableAsExpectedType.txt b/compiler/fir/analysis-tests/testData/resolve/problems/complexLambdaWithTypeVariableAsExpectedType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/complexLambdaWithTypeVariableAsExpectedType.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/complexLambdaWithTypeVariableAsExpectedType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/defaultParametersFromDifferentScopes.txt b/compiler/fir/analysis-tests/testData/resolve/problems/defaultParametersFromDifferentScopes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/defaultParametersFromDifferentScopes.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/defaultParametersFromDifferentScopes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.txt b/compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/definitelyNotNullAndOriginalType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.txt b/compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/flexibleTypeVarAgainstNull.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/inaccessibleJavaGetter.txt b/compiler/fir/analysis-tests/testData/resolve/problems/inaccessibleJavaGetter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/inaccessibleJavaGetter.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/inaccessibleJavaGetter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/innerClassHierarchy.txt b/compiler/fir/analysis-tests/testData/resolve/problems/innerClassHierarchy.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/innerClassHierarchy.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/innerClassHierarchy.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/javaQualifier.txt b/compiler/fir/analysis-tests/testData/resolve/problems/javaQualifier.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/javaQualifier.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/javaQualifier.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/kt42346.txt b/compiler/fir/analysis-tests/testData/resolve/problems/kt42346.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/kt42346.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/kt42346.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.txt b/compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/multipleJavaClassesInOneFile.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/objectDerivedFromInnerClass.txt b/compiler/fir/analysis-tests/testData/resolve/problems/objectDerivedFromInnerClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/objectDerivedFromInnerClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/objectDerivedFromInnerClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/questionableSmartCast.txt b/compiler/fir/analysis-tests/testData/resolve/problems/questionableSmartCast.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/questionableSmartCast.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/questionableSmartCast.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.txt b/compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/safeCallInvoke.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems/secondaryConstructorCfg.txt b/compiler/fir/analysis-tests/testData/resolve/problems/secondaryConstructorCfg.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems/secondaryConstructorCfg.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems/secondaryConstructorCfg.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/problems2.txt b/compiler/fir/analysis-tests/testData/resolve/problems2.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/problems2.txt
rename to compiler/fir/analysis-tests/testData/resolve/problems2.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.txt b/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.txt
rename to compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorConversion.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorsComplex.txt b/compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorsComplex.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorsComplex.txt
rename to compiler/fir/analysis-tests/testData/resolve/properties/javaAccessorsComplex.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/properties/kotlinOverridesJavaComplex.txt b/compiler/fir/analysis-tests/testData/resolve/properties/kotlinOverridesJavaComplex.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/properties/kotlinOverridesJavaComplex.txt
rename to compiler/fir/analysis-tests/testData/resolve/properties/kotlinOverridesJavaComplex.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/properties/noBackingFieldForExtension.txt b/compiler/fir/analysis-tests/testData/resolve/properties/noBackingFieldForExtension.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/properties/noBackingFieldForExtension.txt
rename to compiler/fir/analysis-tests/testData/resolve/properties/noBackingFieldForExtension.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/properties/noBackingFieldInProperty.txt b/compiler/fir/analysis-tests/testData/resolve/properties/noBackingFieldInProperty.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/properties/noBackingFieldInProperty.txt
rename to compiler/fir/analysis-tests/testData/resolve/properties/noBackingFieldInProperty.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/properties/syntheticPropertiesForJavaAnnotations.txt b/compiler/fir/analysis-tests/testData/resolve/properties/syntheticPropertiesForJavaAnnotations.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/properties/syntheticPropertiesForJavaAnnotations.txt
rename to compiler/fir/analysis-tests/testData/resolve/properties/syntheticPropertiesForJavaAnnotations.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/propertyFromJavaPlusAssign.txt b/compiler/fir/analysis-tests/testData/resolve/propertyFromJavaPlusAssign.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/propertyFromJavaPlusAssign.txt
rename to compiler/fir/analysis-tests/testData/resolve/propertyFromJavaPlusAssign.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/qualifierWithCompanion.txt b/compiler/fir/analysis-tests/testData/resolve/qualifierWithCompanion.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/qualifierWithCompanion.txt
rename to compiler/fir/analysis-tests/testData/resolve/qualifierWithCompanion.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.txt b/compiler/fir/analysis-tests/testData/resolve/rawTypeSam.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/rawTypeSam.txt
rename to compiler/fir/analysis-tests/testData/resolve/rawTypeSam.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.txt b/compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/recursiveCallOnWhenWithSealedClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/references/integerLiteralInLhs.txt b/compiler/fir/analysis-tests/testData/resolve/references/integerLiteralInLhs.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/references/integerLiteralInLhs.txt
rename to compiler/fir/analysis-tests/testData/resolve/references/integerLiteralInLhs.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.txt b/compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.txt
rename to compiler/fir/analysis-tests/testData/resolve/references/referenceToExtension.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/references/simple.txt b/compiler/fir/analysis-tests/testData/resolve/references/simple.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/references/simple.txt
rename to compiler/fir/analysis-tests/testData/resolve/references/simple.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/references/superMember.txt b/compiler/fir/analysis-tests/testData/resolve/references/superMember.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/references/superMember.txt
rename to compiler/fir/analysis-tests/testData/resolve/references/superMember.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSam.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConstructors/genericSamInferenceFromExpectType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/kotlinSam.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/kotlinSam.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConstructors/kotlinSam.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConstructors/kotlinSam.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConstructors/realConstructorFunction.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/runnable.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/runnable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConstructors/runnable.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConstructors/runnable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConstructors/simple.txt b/compiler/fir/analysis-tests/testData/resolve/samConstructors/simple.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConstructors/simple.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConstructors/simple.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConversions/genericSam.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConversions/kotlinSam.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConversions/notSamBecauseOfSupertype.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/runnable.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/runnable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConversions/runnable.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConversions/runnable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/samConversionInConstructorCall.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/samConversionInConstructorCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConversions/samConversionInConstructorCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConversions/samConversionInConstructorCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertype.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertype.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertype.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertype.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConversions/samSupertypeWithOverride.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConversions/samWithEquals.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/samConversions/simple.txt b/compiler/fir/analysis-tests/testData/resolve/samConversions/simple.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/samConversions/simple.txt
rename to compiler/fir/analysis-tests/testData/resolve/samConversions/simple.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/sealedClass.txt b/compiler/fir/analysis-tests/testData/resolve/sealedClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/sealedClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/sealedClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/simpleClass.txt b/compiler/fir/analysis-tests/testData/resolve/simpleClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/simpleClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/simpleClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/simpleTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/simpleTypeAlias.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/simpleTypeAlias.txt
rename to compiler/fir/analysis-tests/testData/resolve/simpleTypeAlias.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/bangbang.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/booleanOperators.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/booleanOperators.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/booleanOperators.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/booleanOperators.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/equalsToBoolean.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/booleans/jumpFromRhsOfOperator.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcasts.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcasts.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcasts.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcasts.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/boundSmartcastsInBranches.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/functionCallBound.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/functionCallBound.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/functionCallBound.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/boundSmartcasts/functionCallBound.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/casts.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/casts.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/casts.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/casts.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/elvis.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/elvis.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/elvis.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/elvis.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/returns.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/simpleIf.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/simpleIf.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/simpleIf.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/simpleIf.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/smartcastFromArgument.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/smartcastFromArgument.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/smartcastFromArgument.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/smartcastFromArgument.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/when.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/when.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/when.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/controlStructures/when.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/equalsAndIdentity.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/kt10240.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt37327.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt37327.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/kt37327.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/kt37327.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt39000.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/kt39000.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/kt39000.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/kt39000.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/inPlaceLambdas.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/lambdaInWhenBranch.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/lambdas/smartcastOnLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/dataFlowInfoFromWhileCondition.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/dataFlowInfoFromWhileCondition.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/dataFlowInfoFromWhileCondition.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/dataFlowInfoFromWhileCondition.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/endlessLoops.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/endlessLoops.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/endlessLoops.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/loops/endlessLoops.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/multipleCasts.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/multipleCasts.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/multipleCasts.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/multipleCasts.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/nullability.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/orInWhenBranch.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/problems/invoke.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceiverAsWhenSubject.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceiverAsWhenSubject.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceiverAsWhenSubject.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceiverAsWhenSubject.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceivers.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceivers.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceivers.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/implicitReceivers.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/mixingImplicitAndExplicitReceivers.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/mixingImplicitAndExplicitReceivers.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/mixingImplicitAndExplicitReceivers.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/mixingImplicitAndExplicitReceivers.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/thisOfExtensionProperty.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/thisOfExtensionProperty.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/thisOfExtensionProperty.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/receivers/thisOfExtensionProperty.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/assignSafeCall.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/assignSafeCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/assignSafeCall.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/assignSafeCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/boundSafeCallAndIsCheck.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCallAndEqualityToBool.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/safeCalls/safeCalls.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartCastInInit.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartCastInInit.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/smartCastInInit.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/smartCastInInit.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/smartcastToNothing.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/stability/overridenOpenVal.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/stability/overridenOpenVal.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/stability/overridenOpenVal.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/stability/overridenOpenVal.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/delayedAssignment.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.txt b/compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.txt
rename to compiler/fir/analysis-tests/testData/resolve/smartcasts/variables/smartcastAfterReassignment.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/spreadOperator.txt b/compiler/fir/analysis-tests/testData/resolve/spreadOperator.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/spreadOperator.txt
rename to compiler/fir/analysis-tests/testData/resolve/spreadOperator.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/statusResolveForTypealiasAsSuperClass.txt b/compiler/fir/analysis-tests/testData/resolve/statusResolveForTypealiasAsSuperClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/statusResolveForTypealiasAsSuperClass.txt
rename to compiler/fir/analysis-tests/testData/resolve/statusResolveForTypealiasAsSuperClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.txt b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.txt
rename to compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/ArrayInGenericArguments.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.txt b/compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.txt
rename to compiler/fir/analysis-tests/testData/resolve/stdlib/j+k/flexibleWildcard.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/syntheticsVsNormalProperties.txt b/compiler/fir/analysis-tests/testData/resolve/syntheticsVsNormalProperties.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/syntheticsVsNormalProperties.txt
rename to compiler/fir/analysis-tests/testData/resolve/syntheticsVsNormalProperties.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/treeSet.txt b/compiler/fir/analysis-tests/testData/resolve/treeSet.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/treeSet.txt
rename to compiler/fir/analysis-tests/testData/resolve/treeSet.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/tryInference.txt b/compiler/fir/analysis-tests/testData/resolve/tryInference.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/tryInference.txt
rename to compiler/fir/analysis-tests/testData/resolve/tryInference.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/typeAliasWithGeneric.txt b/compiler/fir/analysis-tests/testData/resolve/typeAliasWithGeneric.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/typeAliasWithGeneric.txt
rename to compiler/fir/analysis-tests/testData/resolve/typeAliasWithGeneric.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.txt b/compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.txt
rename to compiler/fir/analysis-tests/testData/resolve/typeAliasWithTypeArguments.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/typeFromGetter.txt b/compiler/fir/analysis-tests/testData/resolve/typeFromGetter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/typeFromGetter.txt
rename to compiler/fir/analysis-tests/testData/resolve/typeFromGetter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/typeParameterInPropertyReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/typeParameterInPropertyReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/typeParameterInPropertyReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/typeParameterInPropertyReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/typeParameterVsNested.txt b/compiler/fir/analysis-tests/testData/resolve/typeParameterVsNested.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/typeParameterVsNested.txt
rename to compiler/fir/analysis-tests/testData/resolve/typeParameterVsNested.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.txt
rename to compiler/fir/analysis-tests/testData/resolve/types/bareWithSubjectTypeAlias.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/types/capturedParametersOfInnerClasses.txt b/compiler/fir/analysis-tests/testData/resolve/types/capturedParametersOfInnerClasses.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/types/capturedParametersOfInnerClasses.txt
rename to compiler/fir/analysis-tests/testData/resolve/types/capturedParametersOfInnerClasses.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/typesInLocalFunctions.txt b/compiler/fir/analysis-tests/testData/resolve/typesInLocalFunctions.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/typesInLocalFunctions.txt
rename to compiler/fir/analysis-tests/testData/resolve/typesInLocalFunctions.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.txt b/compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.txt
rename to compiler/fir/analysis-tests/testData/resolve/varargInPrimaryConstructor.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/exposedFunctionParameterType.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/exposedFunctionParameterType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/visibility/exposedFunctionParameterType.txt
rename to compiler/fir/analysis-tests/testData/resolve/visibility/exposedFunctionParameterType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/exposedFunctionReturnType.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/exposedFunctionReturnType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/visibility/exposedFunctionReturnType.txt
rename to compiler/fir/analysis-tests/testData/resolve/visibility/exposedFunctionReturnType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/exposedPropertyType.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/exposedPropertyType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/visibility/exposedPropertyType.txt
rename to compiler/fir/analysis-tests/testData/resolve/visibility/exposedPropertyType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/exposedSupertype.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/exposedSupertype.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/visibility/exposedSupertype.txt
rename to compiler/fir/analysis-tests/testData/resolve/visibility/exposedSupertype.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/exposedTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/exposedTypeAlias.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/visibility/exposedTypeAlias.txt
rename to compiler/fir/analysis-tests/testData/resolve/visibility/exposedTypeAlias.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/exposedTypeParameters.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/exposedTypeParameters.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/visibility/exposedTypeParameters.txt
rename to compiler/fir/analysis-tests/testData/resolve/visibility/exposedTypeParameters.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.txt
rename to compiler/fir/analysis-tests/testData/resolve/visibility/intersectionOverrideWithImplicitTypes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/kotlinJavaKotlinHierarchy.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/kotlinJavaKotlinHierarchy.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/visibility/kotlinJavaKotlinHierarchy.txt
rename to compiler/fir/analysis-tests/testData/resolve/visibility/kotlinJavaKotlinHierarchy.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/protectedInCompanion.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/protectedInCompanion.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/visibility/protectedInCompanion.txt
rename to compiler/fir/analysis-tests/testData/resolve/visibility/protectedInCompanion.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.txt
rename to compiler/fir/analysis-tests/testData/resolve/visibility/singletonConstructors.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/visibility/visibilityWithOverrides.txt b/compiler/fir/analysis-tests/testData/resolve/visibility/visibilityWithOverrides.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/visibility/visibilityWithOverrides.txt
rename to compiler/fir/analysis-tests/testData/resolve/visibility/visibilityWithOverrides.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/whenAsReceiver.txt b/compiler/fir/analysis-tests/testData/resolve/whenAsReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/whenAsReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolve/whenAsReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/whenElse.txt b/compiler/fir/analysis-tests/testData/resolve/whenElse.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/whenElse.txt
rename to compiler/fir/analysis-tests/testData/resolve/whenElse.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/whenExpressionType.txt b/compiler/fir/analysis-tests/testData/resolve/whenExpressionType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/whenExpressionType.txt
rename to compiler/fir/analysis-tests/testData/resolve/whenExpressionType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolve/whenInference.txt b/compiler/fir/analysis-tests/testData/resolve/whenInference.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolve/whenInference.txt
rename to compiler/fir/analysis-tests/testData/resolve/whenInference.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/addAllOnJavaCollection.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFilterCapturedType.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFilterCapturedType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFilterCapturedType.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFilterCapturedType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayFirstOrNull.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayInLocal.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayInLocal.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayInLocal.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/arrayInLocal.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/backingField.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/backingField.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/backingField.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/backingField.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/beyoundCalls.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/beyoundCalls.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/beyoundCalls.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/beyoundCalls.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/coercionToUnit.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/coercionToUnit.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/coercionToUnit.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/coercionToUnit.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/companions.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/constructors.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/constructors.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/constructors.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/constructors.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/differentLevels.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/differentLevels.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/differentLevels.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/differentLevels.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/extensionReceiverInference.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/extensionReceiverInference.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/extensionReceiverInference.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/extensionReceiverInference.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/ambiguityWhenNoApplicableCallableReferenceCandidate.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/applicableCallableReferenceFromDistantScope.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/chooseCallableReferenceDependingOnInferredReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/commonSupertypeFromReturnTypesOfCallableReference.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerAndPostponedCallableReferences.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/moreSpecificAmbiguousExtensions.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/multipleOutersAndMultipleCallableReferences.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/noAmbiguityBetweenTopLevelAndMemberProperty.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/overloadsBound.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/postponedResolveOfManyCallableReference.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/resolveCallableReferencesAfterAllSimpleArguments.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/withGenericFun.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/genericInReceiver.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/genericInReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/genericInReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/genericInReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/ifWithCR.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/implicitTypes.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/inferenceFromCallableReferenceType.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/inferenceFromCallableReferenceType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/inferenceFromCallableReferenceType.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/inferenceFromCallableReferenceType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/inferenceFromExpectedType.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/inferenceFromExpectedType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/inferenceFromExpectedType.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/inferenceFromExpectedType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/javaStatic.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/javaStatic.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/javaStatic.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/javaStatic.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyCandidatesInference.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyCandidatesInference.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyCandidatesInference.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyCandidatesInference.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnerCandidates.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnerCandidates.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnerCandidates.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnerCandidates.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnerManyOuterCandidates.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnerManyOuterCandidates.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnerManyOuterCandidates.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnerManyOuterCandidates.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyInnermanyOuterCandidatesAmbiguity.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyOuterCandidates.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyOuterCandidates.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyOuterCandidates.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/manyOuterCandidates.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/properties.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/properties.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/properties.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/properties.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/sam.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/sam.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/sam.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/sam.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleClassReceiver.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleClassReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleClassReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleClassReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleExpressionReceiver.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleExpressionReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleExpressionReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleExpressionReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleNoReceiver.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleNoReceiver.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleNoReceiver.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/simpleNoReceiver.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/varProperties.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/varProperties.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/varProperties.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/varProperties.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/classLiteralForParameter.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/classLiteralForParameter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/classLiteralForParameter.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/classLiteralForParameter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/cloneArray.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/companionLoad.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/companionLoad.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/companionLoad.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/companionLoad.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/components.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrent.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrent.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrent.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrent.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/concurrentMapOfAliases.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/callsInPlace.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/conditionalEffects.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromLibrary/notIsNullOrEmpty.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inAnonymousObject.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/inLocalFunction.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/callsInPlace/toLocalVariables.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/returnsImplies/notNull.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/returnsImplies/notNull.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/returnsImplies/notNull.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/returnsImplies/notNull.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/returnsImplies/propertyGetter.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/returnsImplies/propertyGetter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/returnsImplies/propertyGetter.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/bad/returnsImplies/propertyGetter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atLeastOnce.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/atMostOnce.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/contractsUsage.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/exactlyOnce.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/flow.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/inPlaceLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/simple.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/unknown.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/booleanOperators.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/booleanOperators.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/booleanOperators.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/booleanOperators.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/conditionLogic.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/conditionLogic.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/conditionLogic.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/conditionLogic.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/eqNotEq.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/inapplicable.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/inapplicable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/inapplicable.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/inapplicable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/namedArguments.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/namedArguments.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/namedArguments.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/namedArguments.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/notNull.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/notNull.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/notNull.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/notNull.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/propertyAccessors.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/propertyAccessors.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/propertyAccessors.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/propertyAccessors.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/receivers.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/safeCall.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/safeCall.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/safeCall.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/safeCall.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/trickyCases.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/trickyCases.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/trickyCases.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/trickyCases.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/typePredicate.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/typePredicate.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/typePredicate.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/returnsImplies/typePredicate.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/variousContracts/newSyntax/functionsWithContract.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/anonymousInDelegate.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/anonymousInDelegate.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/anonymousInDelegate.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/anonymousInDelegate.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateTypeMismatch.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/delegateWithAnonymousObject.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/propertyWithFunctionalType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegateProvider.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegateProvider.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegateProvider.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegateProvider.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/delegates/simpleDelegatedToMap.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/emptyArray.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/emptyArray.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/emptyArray.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/emptyArray.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/enumValuesDeserialized.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/enumValuesDeserialized.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/enumValuesDeserialized.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/enumValuesDeserialized.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/exception.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/exception.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/exception.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/exception.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/factoryFunctionOverloads.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/factoryFunctionOverloads.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/factoryFunctionOverloads.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/factoryFunctionOverloads.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/fillInStackTrace.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/fillInStackTrace.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/fillInStackTrace.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/fillInStackTrace.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/functionAndFunctionN.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/functionAndFunctionN.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/functionAndFunctionN.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/functionAndFunctionN.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/functionX.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/functionX.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/functionX.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/functionX.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/getOnKProperty.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOrPutAmbiguity.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/getOrPutAmbiguity.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/getOrPutAmbiguity.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/getOrPutAmbiguity.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/hashMapTypeAlias.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashSet.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashSet.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/hashSet.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/hashSet.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/hashTableWithForEach.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/helloWorld.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/helloWorld.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/helloWorld.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/helloWorld.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/implicitReceiverOrder.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/implicitReceiverOrder.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/implicitReceiverOrder.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/implicitReceiverOrder.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inapplicableRemoveAll.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inapplicableRemoveAll.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/inapplicableRemoveAll.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/inapplicableRemoveAll.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInference.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/complexConstraintSystem.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/flexibleTypeInSystem.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/ifElvisReturn.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/ifElvisReturn.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/ifElvisReturn.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/ifElvisReturn.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/plusAssignWithLambdaInRhs.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/initialization/fromLocalMembers.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/initialization/fromLocalMembers.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/initialization/fromLocalMembers.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/initialization/fromLocalMembers.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedJava.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithAnnotatedOverriddenJava.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJava.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJava.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJava.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJava.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithJavaFakeOverride.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/BasicWithPrimitiveJava.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAccessFromDerived.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAccessFromDerived.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAccessFromDerived.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAccessFromDerived.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAndGetter.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAndGetter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAndGetter.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldAndGetter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FieldSubstitution.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FlexiblePrimitiveOverloading.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FlexiblePrimitiveOverloading.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FlexiblePrimitiveOverloading.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FlexiblePrimitiveOverloading.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/FunctionTypeInJava.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/IntersectionTypesProblem.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaGetPrefixConflict.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinDerived.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinDerived.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinDerived.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinDerived.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinExtension.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinExtension.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinExtension.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinExtension.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinProperty.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinProperty.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinProperty.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsKotlinProperty.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsRawKotlin.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsRawKotlin.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsRawKotlin.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaInheritsRawKotlin.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaSyntheticProperty.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/JavaVisibility2.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchy.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchy.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchy.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchy.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKComplexHierarchyWithNested.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritance.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritance.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritance.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritance.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KJKInheritanceGeneric.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/KotlinClassParameterGeneric.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/LoggerInstance.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapCompute.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MapEntry.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyException.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyIterable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/MyMap.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/OverrideWithJava.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/OverrideWithJava.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/OverrideWithJava.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/OverrideWithJava.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/RawType.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/RawType.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/RawType.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/RawType.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticClassConstructorFromBaseClass.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticClassConstructorFromBaseClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticClassConstructorFromBaseClass.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticClassConstructorFromBaseClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticFromBaseClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/StaticGenericMethod.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticAfterFiltering.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticAfterFiltering.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticAfterFiltering.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticAfterFiltering.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/SyntheticWithForEach.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/capturedFlexible.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/complexFlexibleInference.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/fieldOverride.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/fieldOverride.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/fieldOverride.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/fieldOverride.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/flexibleTypeAliases.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/kt39076.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/kt39076.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/kt39076.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/kt39076.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/mapMerge.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/outerInnerClasses.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/outerInnerClasses.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/outerInnerClasses.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/outerInnerClasses.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/serializableString.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/serializableString.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/serializableString.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/serializableString.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/smartSet.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/typeParameterUse.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/typeParameterUse.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/typeParameterUse.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/j+k/typeParameterUse.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaEnumSynthetic.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaEnumSynthetic.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/javaEnumSynthetic.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/javaEnumSynthetic.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/javaLangComparator.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/kotlinComparatorAlias.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/listPlusAssign.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/listPlusAssign.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/listPlusAssign.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/listPlusAssign.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/lowPriorityInResolution.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/lowPriorityInResolution.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/lowPriorityInResolution.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/lowPriorityInResolution.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/mapList.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.fir.txt
similarity index 96%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.fir.txt
index 39ea2414813..bd1c6543b33 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Basic.fir.txt
@@ -1,3 +1,4 @@
+Module: m1
 FILE: base.kt
     public final class Hello : R|kotlin/Any| {
         public constructor(msg: R|kotlin/String|): R|hello/Hello| {
@@ -17,6 +18,7 @@ FILE: base.kt
             public get(): R|java/util/Set<*>|
 
     }
+Module: m2
 FILE: user.kt
     public final fun foo(hello: R|hello/Hello|): R|kotlin/String| {
         ^foo R|<local>/hello|.R|hello/Hello.msg|
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.fir.txt
similarity index 97%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.fir.txt
index c22424c4793..0584958a586 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/FakeOverrides.fir.txt
@@ -1,3 +1,4 @@
+Module: m1-common
 FILE: common.kt
     public open expect class A<T> : R|kotlin/Any| {
         public expect constructor<T>(): R|A<T>| {
@@ -27,6 +28,7 @@ FILE: common.kt
         }
 
     }
+Module: m1-jvm
 FILE: jvm.kt
     public open actual class A<T> : R|kotlin/Any| {
         public constructor<T>(): R|A<T>| {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.fir.txt
similarity index 98%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.fir.txt
index 40613912c09..46b2cdede09 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/MemberType.fir.txt
@@ -1,3 +1,4 @@
+Module: m1-common
 FILE: common.kt
     public final expect class MyList : R|kotlin/Any| {
         public expect constructor(): R|MyList| {
@@ -16,6 +17,7 @@ FILE: common.kt
             public get(): R|MyList|
 
     }
+Module: m1-jvm
 FILE: jvm.kt
     public final actual class MyList : R|kotlin/Any| {
         public constructor(): R|MyList| {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.fir.txt
similarity index 97%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.fir.txt
index 902141ba54a..6e9033a691a 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/Members.fir.txt
@@ -1,3 +1,4 @@
+Module: m1-common
 FILE: common.kt
     public open expect class A : R|kotlin/Any| {
         public expect constructor(): R|A| {
@@ -16,6 +17,7 @@ FILE: common.kt
         }
 
     }
+Module: m1-jvm
 FILE: jvm.kt
     public open actual class A : R|kotlin/Any| {
         public constructor(): R|A| {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.fir.txt
similarity index 97%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.fir.txt
index d011977dbb4..bfdacc544f1 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.txt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multiModule/SuperTypes.fir.txt
@@ -1,3 +1,4 @@
+Module: m1-common
 FILE: common.kt
     public open expect class A : R|kotlin/Any| {
         public expect constructor(): R|A| {
@@ -13,6 +14,7 @@ FILE: common.kt
         }
 
     }
+Module: m1-jvm
 FILE: jvm.kt
     public abstract class X : R|kotlin/Any| {
         public constructor(): R|X| {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/multipleImplicitReceivers.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/multipleImplicitReceivers.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/multipleImplicitReceivers.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/multipleImplicitReceivers.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/noneWithForEach.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/nullableTypeParameter.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/nullableTypeParameter.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/nullableTypeParameter.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/nullableTypeParameter.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/plusAssignNullable.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/plusAssignNullable.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/plusAssignNullable.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/plusAssignNullable.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/problems.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/DeepCopyIrTree.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/EnumMapGet.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/KJKComplexHierarchyNestedLoop.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/TypesEligibleForSimpleVisit.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/TypesEligibleForSimpleVisit.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/TypesEligibleForSimpleVisit.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/TypesEligibleForSimpleVisit.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/invokePriority.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/invokePriority.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/invokePriority.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/invokePriority.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/invokePriorityComplex.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/invokePriorityComplex.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/invokePriorityComplex.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/invokePriorityComplex.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/qualifierPriority.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/qualifierPriority.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/qualifierPriority.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/qualifierPriority.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/receiverResolutionInLambda.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/problems/weakHashMap.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/rangeTo.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/rangeTo.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/rangeTo.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/rangeTo.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/recursiveBug.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/reflectionClass.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/reflectionClass.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/reflectionClass.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/reflectionClass.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations/constructorVarWrite.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations/constructorVarWrite.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations/constructorVarWrite.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/reinitializations/constructorVarWrite.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/removeIf.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/removeOnAbstractMap.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/runOnIntegerLiteral.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/runOnIntegerLiteral.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/runOnIntegerLiteral.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/runOnIntegerLiteral.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/samForComparator.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/simpleLazy.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/simpleLazy.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/simpleLazy.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/simpleLazy.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/smartcasts/tryWithLambdaInside.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/stringConstructors.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/stringConstructors.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/stringConstructors.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/stringConstructors.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/toSortedMapWithComparator.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/toSortedMapWithComparator.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/toSortedMapWithComparator.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/toSortedMapWithComparator.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/topLevelResolve.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/topLevelResolve.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/topLevelResolve.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/topLevelResolve.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasDeserialization.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/typeAliasWithForEach.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/typeParameterDerived.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/unaryOperators.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/unaryOperators.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/unaryOperators.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/unaryOperators.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/whenAsLambdaReturnStatement.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/whenAsLambdaReturnStatement.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/whenAsLambdaReturnStatement.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/whenAsLambdaReturnStatement.fir.txt
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/withInInitializer.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/withInInitializer.fir.txt
similarity index 100%
rename from compiler/fir/analysis-tests/testData/resolveWithStdlib/withInInitializer.txt
rename to compiler/fir/analysis-tests/testData/resolveWithStdlib/withInInitializer.fir.txt
diff --git a/compiler/testData/diagnostics/tests/AutoCreatedIt.kt b/compiler/testData/diagnostics/tests/AutoCreatedIt.kt
index c7e7b466be3..464e073ea33 100644
--- a/compiler/testData/diagnostics/tests/AutoCreatedIt.kt
+++ b/compiler/testData/diagnostics/tests/AutoCreatedIt.kt
@@ -4,16 +4,16 @@ fun text() {
     "direct:a" on {it.body == "<hello/>"} to "mock:a"
     "direct:a" on {it -> it.body == "<hello/>"} to "mock:a"
     bar <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>{<!>1}
-    bar <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>{<!><!UNRESOLVED_REFERENCE!>it<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1}
+    bar <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>{<!><!UNRESOLVED_REFERENCE!>it<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> 1}
     bar {it, <!UNUSED_ANONYMOUS_PARAMETER!>it1<!> -> it}
 
     bar1 {1}
     bar1 {it + 1}
 
-    bar2 <!NI;TYPE_MISMATCH!>{<!TYPE_MISMATCH!><!>}<!>
+    bar2 <!TYPE_MISMATCH{NI}!>{<!TYPE_MISMATCH!><!>}<!>
     bar2 {1}
-    bar2 <!NI;TYPE_MISMATCH!>{<!UNRESOLVED_REFERENCE!>it<!>}<!>
-    bar2 <!NI;TYPE_MISMATCH!>{<!CANNOT_INFER_PARAMETER_TYPE, EXPECTED_PARAMETERS_NUMBER_MISMATCH!>it<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!>}<!>
+    bar2 <!TYPE_MISMATCH{NI}!>{<!UNRESOLVED_REFERENCE!>it<!>}<!>
+    bar2 <!TYPE_MISMATCH{NI}!>{<!CANNOT_INFER_PARAMETER_TYPE, EXPECTED_PARAMETERS_NUMBER_MISMATCH!>it<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!>}<!>
 }
 
 fun bar(<!UNUSED_PARAMETER!>f<!> :  (Int, Int) -> Int) {}
diff --git a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt
index 54855bdc82d..7dd7bc2a849 100644
--- a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt
+++ b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt
@@ -6,10 +6,10 @@ class A() {
 fun f(): Unit {
     var x: Int? = <!VARIABLE_WITH_REDUNDANT_INITIALIZER!>1<!>
     x = null
-    <!OI;DEBUG_INFO_CONSTANT!>x<!> + 1
+    <!DEBUG_INFO_CONSTANT{OI}!>x<!> + 1
     <!DEBUG_INFO_CONSTANT!>x<!> <!INFIX_MODIFIER_REQUIRED!>plus<!> 1
     <!DEBUG_INFO_CONSTANT!>x<!> <!UNSAFE_OPERATOR_CALL!><<!> 1
-    <!TYPE_MISMATCH!><!OI;DEBUG_INFO_CONSTANT!>x<!> += 1<!>
+    <!TYPE_MISMATCH!><!DEBUG_INFO_CONSTANT{OI}!>x<!> += 1<!>
 
     <!DEBUG_INFO_CONSTANT!>x<!> == 1
     <!DEBUG_INFO_CONSTANT!>x<!> != 1
@@ -22,11 +22,11 @@ fun f(): Unit {
     <!IMPLICIT_BOXING_IN_IDENTITY_EQUALS!><!DEBUG_INFO_CONSTANT!>x<!> === 1<!>
     <!IMPLICIT_BOXING_IN_IDENTITY_EQUALS!><!DEBUG_INFO_CONSTANT!>x<!> !== 1<!>
 
-    <!OI;DEBUG_INFO_CONSTANT!>x<!><!UNSAFE_OPERATOR_CALL!>..<!>2
+    <!DEBUG_INFO_CONSTANT{OI}!>x<!><!UNSAFE_OPERATOR_CALL!>..<!>2
     <!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!> in 1..2
 
     val y : Boolean? = true
     <!UNUSED_EXPRESSION!>false || <!TYPE_MISMATCH!>y<!><!>
     <!UNUSED_EXPRESSION!><!TYPE_MISMATCH!>y<!> && true<!>
     <!UNUSED_EXPRESSION!><!TYPE_MISMATCH!>y<!> && <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!><!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt b/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt
index e3decfd56d6..e77f1473e88 100644
--- a/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt
+++ b/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt
@@ -1,6 +1,6 @@
 // !WITH_NEW_INFERENCE
 fun test() {
-  if (<!UNRESOLVED_REFERENCE!>x<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>><!> 0) {
+  if (<!UNRESOLVED_REFERENCE!>x<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>><!> 0) {
 
   }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.kt b/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.kt
index adfb57f794b..cb059abf9b0 100644
--- a/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.kt
+++ b/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.kt
@@ -7,4 +7,4 @@ fun test() {
     <!INVISIBLE_MEMBER!>Byte<!>()
     <!INVISIBLE_MEMBER!>Char<!>()
     <!INVISIBLE_MEMBER!>Boolean<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
index 5263624e844..2e58eb19980 100644
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
+++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
@@ -29,26 +29,26 @@ fun <T> fooT2() : (t : T) -> T {
 fun main(args : Array<String>) {
     args.foo()()
     args.foo1()(<!NO_VALUE_FOR_PARAMETER!>)<!>
-    <!UNRESOLVED_REFERENCE!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()()
-    <!UNRESOLVED_REFERENCE!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()(<!UNRESOLVED_REFERENCE!>a<!>)
+    <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>foo1<!>()()
+    <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>foo1<!>()(<!UNRESOLVED_REFERENCE!>a<!>)
 
     args.foo1()(1)
     args.foo1()(<!TYPE_MISMATCH!>"1"<!>)
-    <!UNRESOLVED_REFERENCE!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()("1")
-    <!UNRESOLVED_REFERENCE!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo1<!>()(<!UNRESOLVED_REFERENCE!>a<!>)
+    <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>foo1<!>()("1")
+    <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>foo1<!>()(<!UNRESOLVED_REFERENCE!>a<!>)
 
     foo2()({})
     foo2()<!TOO_MANY_ARGUMENTS!>{}<!>
     (foo2()){}
-    (foo2())<!NI;TYPE_MISMATCH!>{<!CANNOT_INFER_PARAMETER_TYPE, EXPECTED_PARAMETERS_NUMBER_MISMATCH, UNUSED_ANONYMOUS_PARAMETER!>x<!> -> }<!>
-    foo2()(<!NI;TYPE_MISMATCH!>{<!CANNOT_INFER_PARAMETER_TYPE, EXPECTED_PARAMETERS_NUMBER_MISMATCH, UNUSED_ANONYMOUS_PARAMETER!>x<!> -> }<!>)
+    (foo2())<!TYPE_MISMATCH{NI}!>{<!CANNOT_INFER_PARAMETER_TYPE, EXPECTED_PARAMETERS_NUMBER_MISMATCH, UNUSED_ANONYMOUS_PARAMETER!>x<!> -> }<!>
+    foo2()(<!TYPE_MISMATCH{NI}!>{<!CANNOT_INFER_PARAMETER_TYPE, EXPECTED_PARAMETERS_NUMBER_MISMATCH, UNUSED_ANONYMOUS_PARAMETER!>x<!> -> }<!>)
 
     val a = fooT1(1)()
     checkSubtype<Int>(a)
 
     val b = fooT2<Int>()(1)
     checkSubtype<Int>(b)
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>fooT2<!>()(1) // : Any?
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>fooT2<!>()(1) // : Any?
 
     <!FUNCTION_EXPECTED!>1<!>()
     <!FUNCTION_EXPECTED!>1<!>{}
@@ -78,7 +78,7 @@ fun main1() {
 fun test() {
     {<!UNUSED_ANONYMOUS_PARAMETER!>x<!> : Int -> 1}(<!NO_VALUE_FOR_PARAMETER!>)<!>;
     (fun Int.() = 1)(<!NO_VALUE_FOR_PARAMETER!>)<!>
-    <!OI;TYPE_MISMATCH!>"sd"<!>.<!NI;FUNCTION_EXPECTED!>(fun Int.() = 1)<!>()
+    <!TYPE_MISMATCH{OI}!>"sd"<!>.<!FUNCTION_EXPECTED{NI}!>(fun Int.() = 1)<!>()
     val i : Int? = null
     i<!UNSAFE_CALL!>.<!>(fun Int.() = 1)();
     {}<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>()
diff --git a/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.fir.kt b/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.fir.kt
index 770829cde47..bb9a1236f2b 100644
--- a/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.fir.kt
+++ b/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.fir.kt
@@ -8,4 +8,4 @@ class A(a<!SYNTAX!><!>)
 val bar = fun(a){}
 
 val la = { a -> }
-val las = { a: Int -> }
\ No newline at end of file
+val las = { a: Int -> }
diff --git a/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.kt b/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.kt
index 0b1d8f87a01..1df67d43854 100644
--- a/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.kt
+++ b/compiler/testData/diagnostics/tests/FunctionParameterWithoutType.kt
@@ -8,4 +8,4 @@ class A(a<!SYNTAX!><!>)
 val bar = fun(<!CANNOT_INFER_PARAMETER_TYPE!>a<!>){}
 
 val la = { <!CANNOT_INFER_PARAMETER_TYPE!>a<!> -> }
-val las = { a: Int -> }
\ No newline at end of file
+val las = { a: Int -> }
diff --git a/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt b/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt
index 5e86c9b152c..47a87c24b32 100644
--- a/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt
+++ b/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt
@@ -146,14 +146,14 @@ fun illegalConstantBlock(): String {
     return <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>
 }
 fun illegalIfBody(): Int =
-        if (1 < 2) <!CONSTANT_EXPECTED_TYPE_MISMATCH!>'a'<!> else <!NI;TYPE_MISMATCH!>{ <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1.0<!> }<!>
+        if (1 < 2) <!CONSTANT_EXPECTED_TYPE_MISMATCH!>'a'<!> else <!TYPE_MISMATCH{NI}!>{ <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>1.0<!> }<!>
 fun illegalIfBlock(): Boolean {
     if (1 < 2)
         return false
     else { return <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!> }
 }
 fun illegalReturnIf(): Char {
-    return if (1 < 2) 'a' else <!NI;TYPE_MISMATCH!>{ <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!> }<!>
+    return if (1 < 2) 'a' else <!TYPE_MISMATCH{NI}!>{ <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>1<!> }<!>
 }
 
 fun returnNothing(): Nothing {
diff --git a/compiler/testData/diagnostics/tests/GenericArgumentConsistency.fir.kt b/compiler/testData/diagnostics/tests/GenericArgumentConsistency.fir.kt
index d5421d842e9..2d50e8c8fd3 100644
--- a/compiler/testData/diagnostics/tests/GenericArgumentConsistency.fir.kt
+++ b/compiler/testData/diagnostics/tests/GenericArgumentConsistency.fir.kt
@@ -1,4 +1,4 @@
-// FILE: b.kt
+// FILE: a.kt
 interface A<in T> {}
 interface B<T> : A<Int> {}
 interface C<T> : B<T>, A<T> {}
@@ -21,23 +21,23 @@ package x
     interface AB3 : AA1<Comparable<Int>> {}
     interface AB2 : AA1<Number>, AB1, AB3 {}
 
-// FILE: b.kt
+// FILE: c.kt
 package x2
     interface AA1<out T> {}
     interface AB1 : AA1<Any> {}
     interface AB3 : AA1<Comparable<Int>> {}
     interface AB2 : AA1<Number>, AB1, AB3 {}
 
-// FILE: b.kt
+// FILE: d.kt
 package x3
     interface AA1<in T> {}
     interface AB1 : AA1<Any> {}
     interface AB3 : AA1<Comparable<Int>> {}
     interface AB2 : AA1<Number>, AB1, AB3 {}
 
-// FILE: b.kt
+// FILE: e.kt
 package sx2
     interface AA1<in T> {}
     interface AB1 : AA1<Int> {}
     interface AB3 : AA1<Comparable<Int>> {}
-    interface AB2 : AA1<Number>, AB1, AB3 {}
\ No newline at end of file
+    interface AB2 : AA1<Number>, AB1, AB3 {}
diff --git a/compiler/testData/diagnostics/tests/GenericArgumentConsistency.kt b/compiler/testData/diagnostics/tests/GenericArgumentConsistency.kt
index 29bb7ee8614..a9c4557b742 100644
--- a/compiler/testData/diagnostics/tests/GenericArgumentConsistency.kt
+++ b/compiler/testData/diagnostics/tests/GenericArgumentConsistency.kt
@@ -1,4 +1,4 @@
-// FILE: b.kt
+// FILE: a.kt
 interface A<in T> {}
 interface B<T> : A<Int> {}
 interface C<T> : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>B<T>, A<T><!> {}
@@ -21,23 +21,23 @@ package x
     interface AB3 : AA1<Comparable<Int>> {}
     interface AB2 : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>AA1<Number>, AB1, AB3<!> {}
 
-// FILE: b.kt
+// FILE: c.kt
 package x2
     interface AA1<out T> {}
     interface AB1 : AA1<Any> {}
     interface AB3 : AA1<Comparable<Int>> {}
     interface AB2 : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>AA1<Number>, AB1, AB3<!> {}
 
-// FILE: b.kt
+// FILE: d.kt
 package x3
     interface AA1<in T> {}
     interface AB1 : AA1<Any> {}
     interface AB3 : AA1<Comparable<Int>> {}
     interface AB2 : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>AA1<Number>, AB1, AB3<!> {}
 
-// FILE: b.kt
+// FILE: e.kt
 package sx2
     interface AA1<in T> {}
     interface AB1 : AA1<Int> {}
     interface AB3 : AA1<Comparable<Int>> {}
-    interface AB2 : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>AA1<Number>, AB1, AB3<!> {}
\ No newline at end of file
+    interface AB2 : <!INCONSISTENT_TYPE_PARAMETER_VALUES!>AA1<Number>, AB1, AB3<!> {}
diff --git a/compiler/testData/diagnostics/tests/IncDec.kt b/compiler/testData/diagnostics/tests/IncDec.kt
index adec0848762..614a3b2320f 100644
--- a/compiler/testData/diagnostics/tests/IncDec.kt
+++ b/compiler/testData/diagnostics/tests/IncDec.kt
@@ -43,4 +43,4 @@ fun testUnitIncDec() {
   x = <!UNUSED_CHANGED_VALUE!>x<!INC_DEC_SHOULD_NOT_RETURN_UNIT!>--<!><!>
   x = <!INC_DEC_SHOULD_NOT_RETURN_UNIT!>++<!>x
   <!UNUSED_VALUE!>x =<!> <!INC_DEC_SHOULD_NOT_RETURN_UNIT!>--<!>x
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/Infix.kt b/compiler/testData/diagnostics/tests/Infix.kt
index db5936351a5..5515bcc08f0 100644
--- a/compiler/testData/diagnostics/tests/Infix.kt
+++ b/compiler/testData/diagnostics/tests/Infix.kt
@@ -35,4 +35,4 @@ fun test() {
     a <!INFIX_MODIFIER_REQUIRED!>toExtNonInfixDefaultValues<!> b
 
     a <!INFIX_MODIFIER_REQUIRED!>withLambda<!> { }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/InfixModifierApplicability.kt b/compiler/testData/diagnostics/tests/InfixModifierApplicability.kt
index beffb0c75e7..aff28aea41f 100644
--- a/compiler/testData/diagnostics/tests/InfixModifierApplicability.kt
+++ b/compiler/testData/diagnostics/tests/InfixModifierApplicability.kt
@@ -24,4 +24,4 @@ class Example {
     <!INAPPLICABLE_INFIX_MODIFIER("must have a single value parameter")!>infix<!> fun e8(s: String, a: Int = 0) {}
     <!INAPPLICABLE_INFIX_MODIFIER("must have a single value parameter")!>infix<!> fun e9(s: String, a: Int) {}
     <!INAPPLICABLE_INFIX_MODIFIER("must have a single value parameter")!>infix<!> fun e10() {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.fir.kt b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.fir.kt
index 1a8d787d47f..fae4df97b96 100644
--- a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.fir.kt
+++ b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.fir.kt
@@ -16,4 +16,4 @@ class B {
 class C {
     val bar = test()
     val test = <!UNRESOLVED_REFERENCE!>bar<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.kt b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.kt
index f08830b3e13..2b99daf752b 100644
--- a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.kt
+++ b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.kt
@@ -14,6 +14,6 @@ class B {
 }
 
 class C {
-    val bar = <!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;UNINITIALIZED_VARIABLE!>test<!>()<!>
-    val test = <!NI;TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;FUNCTION_EXPECTED!>bar<!>()<!>
-}
\ No newline at end of file
+    val bar = <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}!><!DEBUG_INFO_MISSING_UNRESOLVED{NI}, UNINITIALIZED_VARIABLE{OI}!>test<!>()<!>
+    val test = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM{NI}!><!DEBUG_INFO_MISSING_UNRESOLVED{NI}, FUNCTION_EXPECTED{OI}!>bar<!>()<!>
+}
diff --git a/compiler/testData/diagnostics/tests/Nullability.kt b/compiler/testData/diagnostics/tests/Nullability.kt
index 374ddcfa54e..f6d21f2d4ed 100644
--- a/compiler/testData/diagnostics/tests/Nullability.kt
+++ b/compiler/testData/diagnostics/tests/Nullability.kt
@@ -149,7 +149,7 @@ fun test() {
   
   while (out2 == null) {
     <!DEBUG_INFO_CONSTANT!>out2<!>?.println();
-    <!OI;DEBUG_INFO_CONSTANT!>out2<!><!UNSAFE_CALL!>.<!>println();
+    <!DEBUG_INFO_CONSTANT{OI}!>out2<!><!UNSAFE_CALL!>.<!>println();
   }
   <!DEBUG_INFO_SMARTCAST!>out2<!>.println()
 
diff --git a/compiler/testData/diagnostics/tests/ObjectWithConstructor.kt b/compiler/testData/diagnostics/tests/ObjectWithConstructor.kt
index 4ea06d4bf7b..81b91509995 100644
--- a/compiler/testData/diagnostics/tests/ObjectWithConstructor.kt
+++ b/compiler/testData/diagnostics/tests/ObjectWithConstructor.kt
@@ -21,4 +21,4 @@ class A3 {
     companion object B<!CONSTRUCTOR_IN_OBJECT!>(val prop: Int)<!> {
         public <!CONSTRUCTOR_IN_OBJECT!>constructor()<!> : this(2)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt
index a0fd717964b..8b6a963d361 100644
--- a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt
+++ b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt
@@ -23,4 +23,4 @@ fun main() {
     (<!NO_COMPANION_OBJECT!>System<!>)
     <!REDUNDANT_LABEL_WARNING!>foo@<!> <!NO_COMPANION_OBJECT!>System<!>
     null in <!NO_COMPANION_OBJECT!>System<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/PackageQualified.fir.kt b/compiler/testData/diagnostics/tests/PackageQualified.fir.kt
index 77688d0231e..73136a4d60c 100644
--- a/compiler/testData/diagnostics/tests/PackageQualified.fir.kt
+++ b/compiler/testData/diagnostics/tests/PackageQualified.fir.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// FILE: b.kt
+// FILE: a.kt
 
 
 package foobar.a
@@ -16,14 +16,14 @@ abstract class Foo<T>() {
     abstract val x : <!TYPE_ARGUMENTS_NOT_ALLOWED!>T<Int><!>
 }
 
-// FILE: b.kt
+// FILE: c.kt
 package foobar.a
     import java.util.*
 
     val b : List<Int>? = a
     val b1 : <!UNRESOLVED_REFERENCE!>util.List<Int>?<!> = a
 
-// FILE: b.kt
+// FILE: d.kt
 package foobar
 val x1 = <!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>a<!>
 val x2 = foobar.a.a
@@ -68,4 +68,4 @@ abstract class Collection<E> : Iterable<E> {
       }
       return current.done()
   }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/PackageQualified.kt b/compiler/testData/diagnostics/tests/PackageQualified.kt
index 2d6b1e583f4..040208dbdf0 100644
--- a/compiler/testData/diagnostics/tests/PackageQualified.kt
+++ b/compiler/testData/diagnostics/tests/PackageQualified.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// FILE: b.kt
+// FILE: a.kt
 
 
 package foobar.a
@@ -16,16 +16,16 @@ abstract class Foo<T>() {
     abstract val x : T<!TYPE_ARGUMENTS_NOT_ALLOWED!><Int><!>
 }
 
-// FILE: b.kt
+// FILE: c.kt
 package foobar.a
     import java.util.*
 
     val b : List<Int>? = <!TYPE_MISMATCH!>a<!>
     val b1 : <!UNRESOLVED_REFERENCE!>util<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>List<!><Int>? = a
 
-// FILE: b.kt
+// FILE: d.kt
 package foobar
-val x1 = <!UNRESOLVED_REFERENCE!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>
+val x1 = <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>a<!>
 val x2 = foobar.a.a
 
 val y1 = foobar.a.b
@@ -68,4 +68,4 @@ abstract class Collection<E> : Iterable<E> {
       }
       return current.done()
   }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/PrivateFromOuterPackage.kt b/compiler/testData/diagnostics/tests/PrivateFromOuterPackage.kt
index ca1bf81fe49..eacf6df1994 100644
--- a/compiler/testData/diagnostics/tests/PrivateFromOuterPackage.kt
+++ b/compiler/testData/diagnostics/tests/PrivateFromOuterPackage.kt
@@ -22,4 +22,4 @@ import outer.<!INVISIBLE_REFERENCE!>a<!>
 fun use() {
     <!INVISIBLE_MEMBER!>a<!>()
     outer.<!INVISIBLE_MEMBER!>B<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/QualifiedExpressions.kt b/compiler/testData/diagnostics/tests/QualifiedExpressions.kt
index 5921611129a..c53e08c580b 100644
--- a/compiler/testData/diagnostics/tests/QualifiedExpressions.kt
+++ b/compiler/testData/diagnostics/tests/QualifiedExpressions.kt
@@ -5,8 +5,8 @@ fun test(s: IntRange?) {
    val <!UNUSED_VARIABLE!>a<!>: Int = <!TYPE_MISMATCH!>s?.start<!>
    val b: Int? = s?.start
    val <!UNUSED_VARIABLE!>c<!>: Int = s?.start ?: -11
-   val <!UNUSED_VARIABLE!>d<!>: Int = <!NI;TYPE_MISMATCH!>s?.start ?: <!OI;TYPE_MISMATCH!>"empty"<!><!>
-   val e: String = <!NI;TYPE_MISMATCH!><!OI;TYPE_MISMATCH!>s?.start<!> ?: "empty"<!>
+   val <!UNUSED_VARIABLE!>d<!>: Int = <!TYPE_MISMATCH{NI}!>s?.start ?: <!TYPE_MISMATCH{OI}!>"empty"<!><!>
+   val e: String = <!TYPE_MISMATCH{NI}!><!TYPE_MISMATCH{OI}!>s?.start<!> ?: "empty"<!>
    val <!UNUSED_VARIABLE!>f<!>: Int = s?.endInclusive ?: b ?: 1
    val <!UNUSED_VARIABLE!>g<!>: Boolean? = e.startsWith("s")//?.length
 }
diff --git a/compiler/testData/diagnostics/tests/RecursiveTypeInference.fir.kt b/compiler/testData/diagnostics/tests/RecursiveTypeInference.fir.kt
index 4c0c35b113a..93c53906a00 100644
--- a/compiler/testData/diagnostics/tests/RecursiveTypeInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/RecursiveTypeInference.fir.kt
@@ -1,19 +1,19 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
-// FILE: f.kt
+// FILE: a.kt
 package a
     val foo = bar()
 
     fun bar() = foo
 
-// FILE: f.kt
+// FILE: b.kt
 package b
     fun foo() = bar()
 
     fun bar() = foo()
 
-// FILE: f.kt
+// FILE: c.kt
 package c
     fun bazz() = bar()
 
@@ -21,14 +21,14 @@ package c
 
     fun bar() = foo()
 
-// FILE: f.kt
+// FILE: d.kt
 
     package ok.a
         val foo = bar()
 
         fun bar() : Int = foo
 
-// FILE: f.kt
+// FILE: e.kt
     package ok.b
         fun foo() : Int = bar()
 
diff --git a/compiler/testData/diagnostics/tests/RecursiveTypeInference.kt b/compiler/testData/diagnostics/tests/RecursiveTypeInference.kt
index 72e5afa997b..45601ce7a15 100644
--- a/compiler/testData/diagnostics/tests/RecursiveTypeInference.kt
+++ b/compiler/testData/diagnostics/tests/RecursiveTypeInference.kt
@@ -1,19 +1,19 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
-// FILE: f.kt
+// FILE: a.kt
 package a
     val foo = bar()
 
-    fun bar() = <!NI;DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>foo<!>
+    fun bar() = <!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>foo<!>
 
-// FILE: f.kt
+// FILE: b.kt
 package b
     fun foo() = bar()
 
     fun bar() = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>()<!>
 
-// FILE: f.kt
+// FILE: c.kt
 package c
     fun bazz() = bar()
 
@@ -21,14 +21,14 @@ package c
 
     fun bar() = foo()
 
-// FILE: f.kt
+// FILE: d.kt
 
     package ok.a
         val foo = bar()
 
         fun bar() : Int = foo
 
-// FILE: f.kt
+// FILE: e.kt
     package ok.b
         fun foo() : Int = bar()
 
diff --git a/compiler/testData/diagnostics/tests/ReserveYield.kt b/compiler/testData/diagnostics/tests/ReserveYield.kt
index 42d30817ddf..a4ba561fe6f 100644
--- a/compiler/testData/diagnostics/tests/ReserveYield.kt
+++ b/compiler/testData/diagnostics/tests/ReserveYield.kt
@@ -20,7 +20,7 @@ fun yield(yield: Int) {
     val foo = <!YIELD_IS_RESERVED!>yield<!> + <!YIELD_IS_RESERVED!>yield<!>
     val foo2 = <!YIELD_IS_RESERVED!>yield<!>
 
-    bar(<!OI;YIELD_IS_RESERVED!>yield<!> = 5)
+    bar(<!YIELD_IS_RESERVED{OI}!>yield<!> = 5)
 
     yield(4)
     <!YIELD_IS_RESERVED!>yield<!> {}
diff --git a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.fir.kt b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.fir.kt
index 8391182a406..782ff38e3aa 100644
--- a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.fir.kt
+++ b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.fir.kt
@@ -19,4 +19,4 @@ fun test(a : java.util.ArrayList<Int>) {
 
 fun test(a : java.lang.Class<Int>) {
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt
index 1fa35d93abb..e374a2a284d 100644
--- a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt
+++ b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt
@@ -5,7 +5,7 @@ fun test(<!UNUSED_PARAMETER!>a<!> : java.lang.annotation.RetentionPolicy) {
 }
 
 fun test() {
-  java.util.Collections.<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>()
+  java.util.Collections.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyList<!>()
   val <!UNUSED_VARIABLE!>a<!> : Collection<String>? = java.util.Collections.emptyList()
 }
 
@@ -19,4 +19,4 @@ fun test(<!UNUSED_PARAMETER!>a<!> : java.util.ArrayList<Int>) {
 
 fun test(<!UNUSED_PARAMETER!>a<!> : java.lang.Class<Int>) {
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt b/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt
index c7a51271bb7..f693a338940 100644
--- a/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt
+++ b/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt
@@ -1,9 +1,9 @@
 // !WITH_NEW_INFERENCE
 // !CHECK_TYPE
-// JAVAC_SKIP
+// SKIP_JAVAC
 // FULL_JDK
 
-// FILE: f.kt
+// FILE: a.kt
 
 import java.*
 import java.util.*
@@ -53,6 +53,6 @@ fun test(l : java.util.List<Int>) {
 }
 
 
-// FILE: f.kt
+// FILE: b.kt
 package xxx
-  import java.lang.Class;
\ No newline at end of file
+  import java.lang.Class;
diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.kt b/compiler/testData/diagnostics/tests/ResolveToJava.kt
index 1de4a07950f..fcdad46c454 100644
--- a/compiler/testData/diagnostics/tests/ResolveToJava.kt
+++ b/compiler/testData/diagnostics/tests/ResolveToJava.kt
@@ -1,9 +1,9 @@
 // !WITH_NEW_INFERENCE
 // !CHECK_TYPE
-// JAVAC_SKIP
+// SKIP_JAVAC
 // FULL_JDK
 
-// FILE: f.kt
+// FILE: a.kt
 
 import java.*
 import java.util.*
@@ -22,10 +22,10 @@ fun test(<!UNUSED_PARAMETER!>l<!> : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util
 
   val <!UNUSED_VARIABLE!>f<!> : java.io.File? = null
 
-  Collections.<!FUNCTION_CALL_EXPECTED, NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>
+  Collections.<!FUNCTION_CALL_EXPECTED, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyList<!>
   Collections.<!FUNCTION_CALL_EXPECTED!>emptyList<Int><!>
   Collections.emptyList<Int>()
-  Collections.<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>()
+  Collections.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyList<!>()
 
   checkSubtype<Set<Int>?>(Collections.singleton<Int>(1))
   Collections.singleton<Int>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1.0<!>)
@@ -53,6 +53,6 @@ fun test(<!UNUSED_PARAMETER!>l<!> : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util
 }
 
 
-// FILE: f.kt
+// FILE: b.kt
 package xxx
-  import java.lang.Class;
\ No newline at end of file
+  import java.lang.Class;
diff --git a/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.kt b/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.kt
index 438400a2b11..3e2a82a1317 100644
--- a/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.kt
+++ b/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.kt
@@ -13,4 +13,4 @@ fun ff() {
     val a = <!NO_COMPANION_OBJECT!>Test<!><!UNEXPECTED_SAFE_CALL!>?.<!>FOO
     val b = <!EXPRESSION_EXPECTED_PACKAGE_FOUND!>foo<!><!UNEXPECTED_SAFE_CALL!>?.<!>s
     <!NO_COMPANION_OBJECT!>System<!><!UNEXPECTED_SAFE_CALL!>?.<!>out.println(a + b)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/SafeCallOnSuperReceiver.kt b/compiler/testData/diagnostics/tests/SafeCallOnSuperReceiver.kt
index 5af03be990c..c9aeabb196d 100644
--- a/compiler/testData/diagnostics/tests/SafeCallOnSuperReceiver.kt
+++ b/compiler/testData/diagnostics/tests/SafeCallOnSuperReceiver.kt
@@ -8,4 +8,4 @@ class B : A() {
     fun g() {
         super<!UNEXPECTED_SAFE_CALL!>?.<!>f()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/Serializable.kt b/compiler/testData/diagnostics/tests/Serializable.kt
index e5afb864445..f87f135da6d 100644
--- a/compiler/testData/diagnostics/tests/Serializable.kt
+++ b/compiler/testData/diagnostics/tests/Serializable.kt
@@ -52,4 +52,4 @@ fun testEnums(a: Enum<*>) {
 
 fun testLists(a: List<Int>) {
     useList(a)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/ShiftFunctionTypes.kt b/compiler/testData/diagnostics/tests/ShiftFunctionTypes.kt
index 4c617645291..889e584aeb2 100644
--- a/compiler/testData/diagnostics/tests/ShiftFunctionTypes.kt
+++ b/compiler/testData/diagnostics/tests/ShiftFunctionTypes.kt
@@ -1,12 +1,12 @@
 // FIR_IDENTICAL
-// FILE: f.kt
+// FILE: a.kt
 class A {
 }
 
-// FILE: f.kt
+// FILE: b.kt
 package n
   class B
-// FILE: f.kt
+// FILE: c.kt
 abstract class XXX() {
     abstract val a : Int
     abstract val a2 : n.B
@@ -50,4 +50,4 @@ abstract class YYY() {
     abstract val a17 : ((a : Int) -> Int).(a : Int) -> Int
     abstract val a18 : (a : Int) -> ((a : Int) -> Int)
     abstract val a19 : (b : (a : Int) -> Int) -> Int
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt
index 91fa86bc7ba..fc0f7385426 100644
--- a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt
+++ b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt
@@ -6,10 +6,10 @@ fun <A, B, C> getTTT(<!UNUSED_PARAMETER!>x<!> : Any) {}
 fun foo(<!UNUSED_PARAMETER!>a<!> : Any?) {}
 
 public fun main() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getT<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>getT<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
     <!UNRESOLVED_REFERENCE!>ggetT<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getTT<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>, <!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getTT<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>, Int>()
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getTT<!><Int, <!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
-    foo(<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getTTT<!><Int, <!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>, Int>(1))
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>getTT<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>, <!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>getTT<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>, Int>()
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>getTT<!><Int, <!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
+    foo(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>getTTT<!><Int, <!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>, Int>(1))
 }
diff --git a/compiler/testData/diagnostics/tests/TypeInference.fir.kt b/compiler/testData/diagnostics/tests/TypeInference.fir.kt
index b1f763b91b1..29dd29364f7 100644
--- a/compiler/testData/diagnostics/tests/TypeInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/TypeInference.fir.kt
@@ -16,4 +16,4 @@ fun main() {
   val bx : C<in String> = bar()
   val by : C<out String> = bar()
   val bz : C<*> = bar()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/TypeInference.kt b/compiler/testData/diagnostics/tests/TypeInference.kt
index 124ebe886bd..9411d3f47c6 100644
--- a/compiler/testData/diagnostics/tests/TypeInference.kt
+++ b/compiler/testData/diagnostics/tests/TypeInference.kt
@@ -10,10 +10,10 @@ fun main() {
   val <!UNUSED_VARIABLE!>a<!> : C<Int> = C();
   val <!UNUSED_VARIABLE!>x<!> : C<in String> = C()
   val <!UNUSED_VARIABLE!>y<!> : C<out String> = C()
-  val <!UNUSED_VARIABLE!>z<!> : C<*> = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>C<!>()
+  val <!UNUSED_VARIABLE!>z<!> : C<*> = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>C<!>()
 
   val <!UNUSED_VARIABLE!>ba<!> : C<Int> = bar();
   val <!UNUSED_VARIABLE!>bx<!> : C<in String> = bar()
   val <!UNUSED_VARIABLE!>by<!> : C<out String> = bar()
-  val <!UNUSED_VARIABLE!>bz<!> : C<*> = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!>()
-}
\ No newline at end of file
+  val <!UNUSED_VARIABLE!>bz<!> : C<*> = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>bar<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.fir.kt b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.fir.kt
index faa8581a0da..b2509b87409 100644
--- a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.fir.kt
@@ -3,4 +3,4 @@ import java.util.ArrayList
 
 <!NOT_AN_ANNOTATION_CLASS!>@ArrayList<Int>(1, 1)<!> fun b() {}
 @<!UNRESOLVED_REFERENCE!>Xoo<!>(<!UNRESOLVED_REFERENCE!>x<!>) fun c() {}
-<!INAPPLICABLE_CANDIDATE!>@java.lang.Deprecated(<!UNRESOLVED_REFERENCE!>x<!>)<!> fun a() {}
\ No newline at end of file
+<!INAPPLICABLE_CANDIDATE!>@java.lang.Deprecated(<!UNRESOLVED_REFERENCE!>x<!>)<!> fun a() {}
diff --git a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt
index a7261c4c663..409c262a427 100644
--- a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt
+++ b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt
@@ -1,6 +1,6 @@
 // !WITH_NEW_INFERENCE
 import java.util.ArrayList
 
-<!NI;NOT_AN_ANNOTATION_CLASS!>@<!OI;NONE_APPLICABLE!>ArrayList<!><Int>(<!NI;TOO_MANY_ARGUMENTS!>1<!>, <!NI;TOO_MANY_ARGUMENTS!>1<!>)<!> fun b() {}
+<!NOT_AN_ANNOTATION_CLASS{NI}!>@<!NONE_APPLICABLE{OI}!>ArrayList<!><Int>(<!TOO_MANY_ARGUMENTS{NI}!>1<!>, <!TOO_MANY_ARGUMENTS{NI}!>1<!>)<!> fun b() {}
 @<!UNRESOLVED_REFERENCE!>Xoo<!>(<!UNRESOLVED_REFERENCE!>x<!>) fun c() {}
-<!DEPRECATED_JAVA_ANNOTATION!>@java.lang.Deprecated(<!TOO_MANY_ARGUMENTS, UNRESOLVED_REFERENCE!>x<!>)<!> fun a() {}
\ No newline at end of file
+<!DEPRECATED_JAVA_ANNOTATION!>@java.lang.Deprecated(<!TOO_MANY_ARGUMENTS, UNRESOLVED_REFERENCE!>x<!>)<!> fun a() {}
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.kt b/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.kt
index 6a99570100b..2b9adf696d7 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.kt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.kt
@@ -7,4 +7,4 @@ class TopLevelClass<<!UNSUPPORTED!>@A1<!> <!UNSUPPORTED!>@A2(3)<!> <!UNSUPPORTED
             class InFun<<!UNSUPPORTED!>@A1<!> <!UNSUPPORTED!>@A2(3)<!> <!UNSUPPORTED!>@A2<!> <!UNSUPPORTED!>@A1(12)<!> <!UNSUPPORTED!>@A2("Test")<!> T>
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.kt b/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.kt
index 277ea2bd172..3d99339006f 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.kt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.kt
@@ -9,4 +9,4 @@ class SomeClass {
     fun foo() {
         fun <<!WRONG_ANNOTATION_TARGET!>@A1<!> <!WRONG_ANNOTATION_TARGET!>@A2(3)<!> <!REPEATED_ANNOTATION, WRONG_ANNOTATION_TARGET!>@A2<!> <!REPEATED_ANNOTATION, WRONG_ANNOTATION_TARGET!>@A1(<!TOO_MANY_ARGUMENTS!>12<!>)<!> <!REPEATED_ANNOTATION, WRONG_ANNOTATION_TARGET!>@A2(<!TYPE_MISMATCH!>"Test"<!>)<!>  T> innerFun() = 12
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt
index cc25f54c2d0..6a9e6fb163e 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt
@@ -11,4 +11,4 @@ class SomeClass {
     fun foo() {
         val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS!><<!WRONG_ANNOTATION_TARGET!>@<!DEBUG_INFO_MISSING_UNRESOLVED!>A1<!><!> <!WRONG_ANNOTATION_TARGET!>@<!DEBUG_INFO_MISSING_UNRESOLVED!>A2<!>(3)<!> <!WRONG_ANNOTATION_TARGET!>@<!DEBUG_INFO_MISSING_UNRESOLVED!>A2<!><!> <!WRONG_ANNOTATION_TARGET!>@<!DEBUG_INFO_MISSING_UNRESOLVED!>A1<!>(12)<!> <!WRONG_ANNOTATION_TARGET!>@<!DEBUG_INFO_MISSING_UNRESOLVED!>A2<!>("Test")<!> T><!> <!UNUSED_VARIABLE!>localVal<!> = 12
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/DanglingMixed.fir.kt b/compiler/testData/diagnostics/tests/annotations/DanglingMixed.fir.kt
index 5e619361ce3..28b63a6c62f 100644
--- a/compiler/testData/diagnostics/tests/annotations/DanglingMixed.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/DanglingMixed.fir.kt
@@ -19,4 +19,4 @@ class C {
 @Ann0
 @Ann @Ann3
 @Ann2(1)
-@Ann4<!SYNTAX!><!>
\ No newline at end of file
+@Ann4<!SYNTAX!><!>
diff --git a/compiler/testData/diagnostics/tests/annotations/DanglingMixed.kt b/compiler/testData/diagnostics/tests/annotations/DanglingMixed.kt
index 62a023634f4..21fd5a02481 100644
--- a/compiler/testData/diagnostics/tests/annotations/DanglingMixed.kt
+++ b/compiler/testData/diagnostics/tests/annotations/DanglingMixed.kt
@@ -19,4 +19,4 @@ class C {
 @<!UNRESOLVED_REFERENCE!>Ann0<!>
 @Ann @<!UNRESOLVED_REFERENCE!>Ann3<!>
 @Ann2(<!TOO_MANY_ARGUMENTS!>1<!>)
-@<!UNRESOLVED_REFERENCE!>Ann4<!SYNTAX!><!><!>
\ No newline at end of file
+@<!UNRESOLVED_REFERENCE!>Ann4<!><!SYNTAX!><!>
diff --git a/compiler/testData/diagnostics/tests/annotations/RecursivelyIncorrectlyAnnotatedParameter.kt b/compiler/testData/diagnostics/tests/annotations/RecursivelyIncorrectlyAnnotatedParameter.kt
index ecd5c6fb4d8..04f6425cca0 100644
--- a/compiler/testData/diagnostics/tests/annotations/RecursivelyIncorrectlyAnnotatedParameter.kt
+++ b/compiler/testData/diagnostics/tests/annotations/RecursivelyIncorrectlyAnnotatedParameter.kt
@@ -1,2 +1,2 @@
 // Class constructor parameter CAN be recursively annotated
-class RecursivelyAnnotated(<!NOT_AN_ANNOTATION_CLASS!>@RecursivelyAnnotated(1)<!> val x: Int)
\ No newline at end of file
+class RecursivelyAnnotated(<!NOT_AN_ANNOTATION_CLASS!>@RecursivelyAnnotated(1)<!> val x: Int)
diff --git a/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.kt b/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.kt
index 21deee04336..2fae7b45b79 100644
--- a/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.kt
+++ b/compiler/testData/diagnostics/tests/annotations/WrongAnnotationArgsOnObject.kt
@@ -5,4 +5,4 @@ object SomeObject
 
 val some = SomeObject
 
-annotation class BadAnnotation(val s: String)
\ No newline at end of file
+annotation class BadAnnotation(val s: String)
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.kt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.kt
index 15248efb9ed..d240f44a186 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.kt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_after.kt
@@ -12,4 +12,4 @@ enum class MyEnum {
 }
 
 @AnnE(<!ANNOTATION_ARGUMENT_MUST_BE_CONST, TYPE_MISMATCH!>Test()<!>)
-class Test2
\ No newline at end of file
+class Test2
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.kt b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.kt
index c226e0922c2..c780cedcb82 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.kt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst_before.kt
@@ -12,4 +12,4 @@ enum class MyEnum {
 }
 
 @AnnE(<!TYPE_MISMATCH!>Test()<!>)
-class Test2
\ No newline at end of file
+class Test2
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.kt b/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.kt
index bc162fd28f7..760c984e59a 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.kt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.kt
@@ -4,7 +4,7 @@
 
 fun f1(x: String) {}
 fun f2(f: () -> Unit) {}
-fun test1() = f2(<!TYPE_MISMATCH("() -> Unit", "KFunction1<String, Unit>")!>::f1<!>)
+fun test1() = f2(<!TYPE_MISMATCH("() -> Unit; KFunction1<String, Unit>")!>::f1<!>)
 
 
 @Target(AnnotationTarget.TYPE_PARAMETER,  AnnotationTarget.TYPE)
@@ -13,14 +13,14 @@ annotation class Ann
 fun <@Ann R : @Ann Any> f3(a: Array<@Ann R>): Array<@Ann R?> =  null!!
 
 fun test2(a: @Ann Array<in @Ann Int>) {
-    val r: Array<in Int?> = <!OI;TYPE_INFERENCE_CANNOT_CAPTURE_TYPES("'R' cannot capture 'in Int'. Type parameter has an upper bound 'Any' that cannot be satisfied capturing 'in' projection")!>f3<!>(<!NI;TYPE_MISMATCH("Any", "Int"), NI;TYPE_MISMATCH("Any", "Int")!>a<!>)
+    val r: Array<in Int?> = <!OI{OI}, TYPE_INFERENCE_CANNOT_CAPTURE_TYPES{OI}("'R' cannot capture 'in Int'. Type parameter has an upper bound 'Any' that cannot be satisfied capturing 'in' projection")!>f3<!>(<!TYPE_MISMATCH("Any; Int"), TYPE_MISMATCH("Any; Int")!>a<!>)
 }
 
 
 var test3: Int = 0
-    set(s: <!WRONG_SETTER_PARAMETER_TYPE("Int", "String")!>@Ann String<!>) {}
+    set(s: <!WRONG_SETTER_PARAMETER_TYPE("Int; String")!>@Ann String<!>) {}
 
 
 fun f4(fn: (@Ann Int, @Ann Int) -> Unit) {}
 
-val test4 = f4 <!NI;TYPE_MISMATCH("(Int, Int) -> Unit", "(Int) -> Unit")!>{ <!EXPECTED_PARAMETERS_NUMBER_MISMATCH("2", "Int, Int")!>single<!> -> }<!>
+val test4 = f4 <!NI{OI}, TYPE_MISMATCH("(Int, Int) -> Unit; (Int) -> Unit")!>{ <!EXPECTED_PARAMETERS_NUMBER_MISMATCH("2; Int, Int")!>single<!> -> }<!>
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt
index bed18d44445..1ed9b7850c1 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt
+++ b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt
@@ -7,4 +7,4 @@ var bar : Int = 1
 val x : (Int) -> Int = {@<!UNRESOLVED_REFERENCE!>varargs<!> <!TYPE_MISMATCH, UNINITIALIZED_VARIABLE!>x<!> <!SYNTAX!>: Int -> x<!>}
 
 class Hello(@<!UNRESOLVED_REFERENCE!>varargs<!> <!UNUSED_PARAMETER!>args<!>: Any) {
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/options/functions.fir.kt b/compiler/testData/diagnostics/tests/annotations/options/functions.fir.kt
index e1caca0c43e..a0e1826f4ec 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/functions.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/options/functions.fir.kt
@@ -37,4 +37,4 @@ fun foo(arg: Int) {
     bar(@FunAnn ::gav)
     // Function expression, ok
     fast(f)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/options/functions.kt b/compiler/testData/diagnostics/tests/annotations/options/functions.kt
index a80f28b9469..74cf26d1662 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/functions.kt
+++ b/compiler/testData/diagnostics/tests/annotations/options/functions.kt
@@ -34,7 +34,7 @@ fun foo(arg: Int) {
     val f = @FunAnn fun(): Int { return 42 }
     // But here, f and gav should be annotated instead
     bar(<!WRONG_ANNOTATION_TARGET!>@FunAnn<!> f)
-    bar(<!OI;WRONG_ANNOTATION_TARGET!>@<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>FunAnn<!><!> ::gav)
+    bar(<!WRONG_ANNOTATION_TARGET{OI}!>@<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>FunAnn<!><!> ::gav)
     // Function expression, ok
     fast(f)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt
index ae80d67f369..43d09706892 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt
@@ -28,7 +28,7 @@ abstract class My(<!WRONG_ANNOTATION_TARGET!>@Field<!> arg: Int, @Field val w: I
     fun foo() {}
 
     <!WRONG_ANNOTATION_TARGET!>@Field<!>
-    val v: Int by <!UNRESOLVED_REFERENCE!>Delegates<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>lazy<!> { 42 }
+    val v: Int by <!UNRESOLVED_REFERENCE!>Delegates<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>lazy<!> { 42 }
 }
 
 enum class Your {
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/cannotOverrideInvisibleMember.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/cannotOverrideInvisibleMember.fir.kt
index 2b454317472..b00866f80a1 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/cannotOverrideInvisibleMember.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/cannotOverrideInvisibleMember.fir.kt
@@ -7,9 +7,9 @@ annotation class A
 @A
 open class B1 {
     @A
-    <!INCOMPATIBLE_MODIFIERS!>private<!> <!INCOMPATIBLE_MODIFIERS!>open<!> fun foo() {}
+    private open fun foo() {}
 }
 
 class D1 : B1() {
     override fun foo() {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/cannotOverrideInvisibleMember.kt b/compiler/testData/diagnostics/tests/annotations/rendering/cannotOverrideInvisibleMember.kt
index f612b7fee73..82399317825 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/cannotOverrideInvisibleMember.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/cannotOverrideInvisibleMember.kt
@@ -11,5 +11,5 @@ open class B1 {
 }
 
 class D1 : B1() {
-    <!CANNOT_OVERRIDE_INVISIBLE_MEMBER("public open fun foo(): Unit defined in D1", "private open fun foo(): Unit defined in B1")!>override<!> fun foo() {}
-}
\ No newline at end of file
+    <!CANNOT_OVERRIDE_INVISIBLE_MEMBER("public open fun foo(): Unit defined in D1; private open fun foo(): Unit defined in B1")!>override<!> fun foo() {}
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/differentNamesForParameter.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/differentNamesForParameter.fir.kt
index 322233012fd..62c217a5773 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/differentNamesForParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/differentNamesForParameter.fir.kt
@@ -15,4 +15,4 @@ interface B {
     fun foo(@An b : @An Int)
 }
 
-interface C : A, B
\ No newline at end of file
+interface C : A, B
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/differentNamesForParameter.kt b/compiler/testData/diagnostics/tests/annotations/rendering/differentNamesForParameter.kt
index 25d3516b121..845395ecc75 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/differentNamesForParameter.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/differentNamesForParameter.kt
@@ -15,4 +15,4 @@ interface B {
     fun foo(@An b : @An Int)
 }
 
-<!DIFFERENT_NAMES_FOR_THE_SAME_PARAMETER_IN_SUPERTYPES("public abstract fun foo(a: Int): Unit defined in A, public abstract fun foo(b: Int): Unit defined in B", "1")!>interface C<!> : A, B
\ No newline at end of file
+<!DIFFERENT_NAMES_FOR_THE_SAME_PARAMETER_IN_SUPERTYPES("public abstract fun foo(a: Int): Unit defined in A, public abstract fun foo(b: Int): Unit defined in B; 1")!>interface C<!> : A, B
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt
index fbbaba7fb47..4c0852edda9 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt
@@ -13,4 +13,4 @@ class C<T> {
 
 fun test(a: C<out CharSequence>) {
     <!INAPPLICABLE_CANDIDATE!>a[1] = 25<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.kt b/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.kt
index 9ff64213d65..899c7ee199f 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.kt
@@ -12,5 +12,5 @@ class C<T> {
 }
 
 fun test(a: C<out CharSequence>) {
-    <!OI;MEMBER_PROJECTED_OUT("public final operator fun set(x: Int, y: T): Unit defined in C", "C<out CharSequence>")!>a[1]<!> = <!NI;CONSTANT_EXPECTED_TYPE_MISMATCH("integer", "Nothing")!>25<!>
-}
\ No newline at end of file
+    <!MEMBER_PROJECTED_OUT{OI}("public final operator fun set(x: Int, y: T): Unit defined in C", "C<out CharSequence>"), OI{OI}!>a[1]<!> = <!CONSTANT_EXPECTED_TYPE_MISMATCH("integer; Nothing"), NI{OI}!>25<!>
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/notImplementedMembers.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/notImplementedMembers.fir.kt
index 081c2838d5f..490a2df7c96 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/notImplementedMembers.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/notImplementedMembers.fir.kt
@@ -45,4 +45,4 @@ interface GI : G {
 }
 
 class AG1(val a: A, val g: G) : A by a, G by g
-class AG2() : AI, GI
\ No newline at end of file
+class AG2() : AI, GI
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/notImplementedMembers.kt b/compiler/testData/diagnostics/tests/annotations/rendering/notImplementedMembers.kt
index 249bd575dfe..16822811ff4 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/notImplementedMembers.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/notImplementedMembers.kt
@@ -15,7 +15,7 @@ interface B {
     fun <T> a(@An arg: @An Int)
 }
 
-<!CONFLICTING_INHERITED_MEMBERS("C", "public abstract fun a(arg: Int): Unit defined in A, public abstract fun <T> a(arg: Int): Unit defined in B")!>interface C<!> : A, B
+<!CONFLICTING_INHERITED_MEMBERS("C; public abstract fun a(arg: Int): Unit defined in A, public abstract fun <T> a(arg: Int): Unit defined in B")!>interface C<!> : A, B
 
 @An
 abstract class D {
@@ -23,8 +23,8 @@ abstract class D {
     abstract val d: @An Int
 }
 
-<!ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED("Class 'E'", "public abstract val d: Int defined in D")!>class E<!> : D(), A
-<!ABSTRACT_MEMBER_NOT_IMPLEMENTED("Class 'F'", "public abstract fun a(arg: Int): Unit defined in A")!>class F<!> : A
+<!ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED("Class 'E'; public abstract val d: Int defined in D")!>class E<!> : D(), A
+<!ABSTRACT_MEMBER_NOT_IMPLEMENTED("Class 'F'; public abstract fun a(arg: Int): Unit defined in A")!>class F<!> : A
 
 @An
 interface G {
@@ -44,5 +44,5 @@ interface GI : G {
     override fun a(@An arg: @An Int) {}
 }
 
-<!MANY_IMPL_MEMBER_NOT_IMPLEMENTED("Class 'AG1'", "public open fun a(arg: Int): Unit defined in AG1")!>class AG1<!>(val a: A, val g: G) : A by a, G by g
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED("Class 'AG2'", "public open fun a(arg: Int): Unit defined in AI")!>class AG2<!>() : AI, GI
\ No newline at end of file
+<!MANY_IMPL_MEMBER_NOT_IMPLEMENTED("Class 'AG1'; public open fun a(arg: Int): Unit defined in AG1")!>class AG1<!>(val a: A, val g: G) : A by a, G by g
+<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED("Class 'AG2'; public open fun a(arg: Int): Unit defined in AI")!>class AG2<!>() : AI, GI
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt
index 87dbe8aebb3..53093bc40c4 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt
@@ -15,4 +15,4 @@ class Out<out F>
 
 fun test(a: C<out CharSequence>, y: Out<CharSequence>) {
     a <!INAPPLICABLE_CANDIDATE!>+<!> y
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.kt
index 461153d69c9..ee51112f1e8 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.kt
@@ -14,5 +14,5 @@ class C<T> {
 class Out<out F>
 
 fun test(a: C<out CharSequence>, y: Out<CharSequence>) {
-    a + <!NI;TYPE_MISMATCH("Out<Nothing>", "Out<CharSequence>"), OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS("Out<Nothing>", "Out<CharSequence>", "C<out CharSequence>", "public final operator fun plus(x: Out<T>): C<T> defined in C")!>y<!>
-}
\ No newline at end of file
+    a + <!"C<out{OI}, "Out<CharSequence>"{OI}, "Out<Nothing>"{OI}, "public{OI}, :{OI}, C"{OI}, C<T>{OI}, CharSequence>"{OI}, NI{OI}, Out<T>{OI}, TYPE_MISMATCH("Out<Nothing>; Out<CharSequence>"), TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}, defined{OI}, final{OI}, fun{OI}, in{OI}, operator{OI}, plus{OI}, x:{OI}!>y<!>
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt
index a208725096c..d297a3f996a 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.fir.kt
@@ -23,4 +23,4 @@ interface B : A {
 
 interface C : A {
     override var p2: <!VAR_TYPE_MISMATCH_ON_OVERRIDE!>Int<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.kt
index 1da134986bd..f9677fd42f6 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverride.kt
@@ -15,12 +15,12 @@ interface A {
 
 @An
 interface B : A {
-    override val p1: <!PROPERTY_TYPE_MISMATCH_ON_OVERRIDE("p1", "public abstract val p1: String defined in A")!>Int<!>
+    override val p1: <!PROPERTY_TYPE_MISMATCH_ON_OVERRIDE("p1; public abstract val p1: String defined in A")!>Int<!>
     @An
-    override <!VAR_OVERRIDDEN_BY_VAL("public abstract val p2: String defined in B", "public abstract var p2: String defined in A")!>val<!> p2: @An String
-    override fun test(arg: String): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE("test", "public abstract fun test(arg: String): String defined in A")!>Int<!>
+    override <!VAR_OVERRIDDEN_BY_VAL("public abstract val p2: String defined in B; public abstract var p2: String defined in A")!>val<!> p2: @An String
+    override fun test(arg: String): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE("test; public abstract fun test(arg: String): String defined in A")!>Int<!>
 }
 
 interface C : A {
-    override var p2: <!VAR_TYPE_MISMATCH_ON_OVERRIDE("p2", "public abstract var p2: String defined in A")!>Int<!>
-}
\ No newline at end of file
+    override var p2: <!VAR_TYPE_MISMATCH_ON_OVERRIDE("p2; public abstract var p2: String defined in A")!>Int<!>
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.fir.kt
index 2641a81ae86..e43eb6ba4c4 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.fir.kt
@@ -1,5 +1,5 @@
 // !RENDER_DIAGNOSTICS_MESSAGES
-// JAVAC_SKIP
+// SKIP_JAVAC
 
 // FILE: A.java
 
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.kt
index 0fd8f38666a..2af1c3ffa62 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchOnOverrideJavaNullable.kt
@@ -1,5 +1,5 @@
 // !RENDER_DIAGNOSTICS_MESSAGES
-// JAVAC_SKIP
+// SKIP_JAVAC
 
 // FILE: A.java
 
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
 annotation class An
 
 class B : A {
-    override fun foo(): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE("foo", "@NotNull @MyTypeQualifier public abstract fun foo(): String defined in A")!>String?<!> = null
+    override fun foo(): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE("foo; @NotNull @MyTypeQualifier public abstract fun foo(): String defined in A")!>String?<!> = null
 }
 
 @An
@@ -38,5 +38,5 @@ public interface C {
 }
 
 class D : C {
-    override fun foo(): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE("foo", "public abstract fun foo(): String defined in C")!>String?<!> = null
+    override fun foo(): <!RETURN_TYPE_MISMATCH_ON_OVERRIDE("foo; public abstract fun foo(): String defined in C")!>String?<!> = null
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/unusedValue.kt b/compiler/testData/diagnostics/tests/annotations/rendering/unusedValue.kt
index 762ba1ef936..a78442158f8 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/unusedValue.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/unusedValue.kt
@@ -8,5 +8,5 @@ annotation class A
 fun test() {
     @A
     var b: @A Int = 0
-    <!UNUSED_VALUE("15", "var b: Int defined in test")!>b =<!> 15
+    <!UNUSED_VALUE("15; var b: Int defined in test")!>b =<!> 15
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.kt b/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.kt
index 318b67e12e9..bbe861566ce 100644
--- a/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.kt
+++ b/compiler/testData/diagnostics/tests/annotations/typeParameterAsAnnotation.kt
@@ -6,4 +6,4 @@ class Foo<T> {
 class Bar<T : Annotation> {
     @<!NOT_A_CLASS!>T<!>
     fun foo() = 0
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ExtensionProperty.kt b/compiler/testData/diagnostics/tests/backingField/ExtensionProperty.kt
index 461ae219f3c..27858f2148b 100644
--- a/compiler/testData/diagnostics/tests/backingField/ExtensionProperty.kt
+++ b/compiler/testData/diagnostics/tests/backingField/ExtensionProperty.kt
@@ -14,4 +14,4 @@ class My {
     val String.x: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>7<!>
         // Error
         get() = <!UNRESOLVED_REFERENCE!>field<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/bareType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/bareType.fir.kt
index 34cf4aafe65..a074814bc15 100644
--- a/compiler/testData/diagnostics/tests/callableReference/bareType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/bareType.fir.kt
@@ -1,3 +1,9 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-220
+ * PRIMARY LINKS: expressions, call-and-property-access-expressions, callable-references -> paragraph 3 -> sentence 1
+ */
 fun f1() = Map::hashCode
 fun f2() = Map.Entry::hashCode
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.fir.kt b/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.fir.kt
index 06998a2aa87..40937ce03de 100644
--- a/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.fir.kt
@@ -26,4 +26,4 @@ class Test {
     val test1a: () -> Right = a.b.c::foo
 
     val test2: () -> Right = a.b<Int>.c?::foo
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.kt b/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.kt
index 4cb8f15091a..99f905559f3 100644
--- a/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.kt
@@ -23,7 +23,7 @@ class Test {
     val Int.c: Int get() = 42
 
     val test1: () -> Right = <!RESERVED_SYNTAX_IN_CALLABLE_REFERENCE_LHS!><!DEBUG_INFO_MISSING_UNRESOLVED!>a<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>b<!><<!DEBUG_INFO_MISSING_UNRESOLVED!>Int<!>>.<!DEBUG_INFO_MISSING_UNRESOLVED!>c<!><!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>
-    val test1a: () -> Right = a.<!NI;DEBUG_INFO_LEAKING_THIS!>b<!>.<!NI;DEBUG_INFO_LEAKING_THIS!>c<!>::foo
+    val test1a: () -> Right = a.<!DEBUG_INFO_LEAKING_THIS{NI}!>b<!>.<!DEBUG_INFO_LEAKING_THIS{NI}!>c<!>::foo
 
     val test2: () -> Right = <!RESERVED_SYNTAX_IN_CALLABLE_REFERENCE_LHS!><!DEBUG_INFO_MISSING_UNRESOLVED!>a<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>b<!><<!DEBUG_INFO_MISSING_UNRESOLVED!>Int<!>>.<!DEBUG_INFO_MISSING_UNRESOLVED!>c<!><!>?::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.fir.kt b/compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.fir.kt
deleted file mode 100644
index 357e98bcb2f..00000000000
--- a/compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.fir.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_VARIABLE
-// !CHECK_TYPE
-
-import kotlin.reflect.KFunction0
-
-fun test() {
-    val a = if (true) {
-        val x = 1
-        "".length
-        ::foo
-    } else {
-        ::foo
-    }
-    a checkType {  _<KFunction0<Int>>() }
-}
-
-fun foo(): Int = 0
diff --git a/compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.kt b/compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.kt
index de8b9d44602..edf02e85437 100644
--- a/compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/callableReferenceAsLastExpressionInBlock.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // !CHECK_TYPE
 /*
@@ -20,4 +21,4 @@ fun test() {
     a checkType {  _<KFunction0<Int>>() }
 }
 
-fun foo(): Int = 0
\ No newline at end of file
+fun foo(): Int = 0
diff --git a/compiler/testData/diagnostics/tests/callableReference/classVsPackage.txt b/compiler/testData/diagnostics/tests/callableReference/classVsPackage.txt
index 32a7d8f2179..3973cbbd382 100644
--- a/compiler/testData/diagnostics/tests/callableReference/classVsPackage.txt
+++ b/compiler/testData/diagnostics/tests/callableReference/classVsPackage.txt
@@ -18,7 +18,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -36,10 +35,10 @@ package a {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 package test {
     public fun test(): kotlin.reflect.KFunction1<a.b.c, kotlin.Unit>
 }
+
diff --git a/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.kt b/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.kt
index a46c6cc7cd7..11074194cc9 100644
--- a/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.kt
@@ -19,6 +19,6 @@ fun <K, V> B<K>.star(p: KProperty1<*, V>): B<V> = TODO()
 fun <R : A> B<R>.test(){
     foo(A::bla)
     bar(A::bla)
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>baz<!>(<!NI;TYPE_MISMATCH!>A::bla<!>)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>baz<!>(<!TYPE_MISMATCH{NI}!>A::bla<!>)
     star(A::bla)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/correctInfoAfterArrayLikeCall.fir.kt b/compiler/testData/diagnostics/tests/callableReference/correctInfoAfterArrayLikeCall.fir.kt
index ccfc84684b8..7be47b6b770 100644
--- a/compiler/testData/diagnostics/tests/callableReference/correctInfoAfterArrayLikeCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/correctInfoAfterArrayLikeCall.fir.kt
@@ -1,5 +1,12 @@
 // !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-220
+ * PRIMARY LINKS: expressions, call-and-property-access-expressions, navigation-operators -> paragraph 9 -> sentence 2
+ * expressions, call-and-property-access-expressions, navigation-operators -> paragraph 8 -> sentence 1
+ */
 
 import kotlin.reflect.KProperty1
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/ea81649_errorPropertyLHS.txt b/compiler/testData/diagnostics/tests/callableReference/ea81649_errorPropertyLHS.txt
index c144a6cd26b..cb10c6e01dd 100644
--- a/compiler/testData/diagnostics/tests/callableReference/ea81649_errorPropertyLHS.txt
+++ b/compiler/testData/diagnostics/tests/callableReference/ea81649_errorPropertyLHS.txt
@@ -3,7 +3,6 @@ package
 
 public fun </*0*/ T> bar(/*0*/ ff: [ERROR : Err].() -> kotlin.Unit): kotlin.Unit
 
-
 // -- Module: <m2> --
 package
 
@@ -18,3 +17,4 @@ public final data class User {
     public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.kt b/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.kt
index 1baccb084ee..6fea2363d82 100644
--- a/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.kt
@@ -8,6 +8,6 @@ fun <T> takeIt(x: T, f: SubFunction) {}
 fun cr() {}
 
 fun test() {
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>takeIt<!>(42, <!TYPE_MISMATCH!>::cr<!>)
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>takeIt<!>(42, <!TYPE_MISMATCH!>{ }<!>)
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>takeIt<!>(42, <!TYPE_MISMATCH!>::cr<!>)
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>takeIt<!>(42, <!TYPE_MISMATCH!>{ }<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.fir.kt
index ccddcecf6a6..6ecf2acaf76 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.fir.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_EXPRESSION,-UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_VARIABLE
 fun foo(x: Int, y: Any) = x
 fun foo(x: Any, y: Int) = y
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.kt b/compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.kt
index 3bf7de5a5db..55bd278f232 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/ambiguityTopLevelVsTopLevel.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_EXPRESSION,-UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_VARIABLE
 fun foo(x: Int, <!UNUSED_PARAMETER!>y<!>: Any) = x
 fun foo(<!UNUSED_PARAMETER!>x<!>: Any, y: Int) = y
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt
index 23e721dc794..b5691532799 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt
@@ -6,9 +6,9 @@ class A<T, U : Any> {
     fun bar() = <!CALLABLE_REFERENCE_LHS_NOT_A_CLASS!>U::<!UNRESOLVED_REFERENCE!>toString<!><!>
 
     fun baz() {
-        take(<!CALLABLE_REFERENCE_LHS_NOT_A_CLASS, OI;CALLABLE_REFERENCE_LHS_NOT_A_CLASS, OI;CALLABLE_REFERENCE_LHS_NOT_A_CLASS!>T::<!OI;UNRESOLVED_REFERENCE!>toString<!><!>)
+        take(<!CALLABLE_REFERENCE_LHS_NOT_A_CLASS!>T::<!UNRESOLVED_REFERENCE{OI}!>toString<!><!>)
 
-        take(<!CALLABLE_REFERENCE_LHS_NOT_A_CLASS, OI;CALLABLE_REFERENCE_LHS_NOT_A_CLASS, OI;CALLABLE_REFERENCE_LHS_NOT_A_CLASS!>U::<!OI;UNRESOLVED_REFERENCE!>toString<!><!>)
+        take(<!CALLABLE_REFERENCE_LHS_NOT_A_CLASS!>U::<!UNRESOLVED_REFERENCE{OI}!>toString<!><!>)
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/unresolved.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/unresolved.fir.kt
index 3995290ce81..90d03179700 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/unresolved.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/unresolved.fir.kt
@@ -21,4 +21,4 @@ fun test2() {
     <!INAPPLICABLE_CANDIDATE!>foo<!>(<!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>Unresolved<!>::foo<!>)
     <!INAPPLICABLE_CANDIDATE!>foo<!>(<!UNRESOLVED_REFERENCE!><!UNRESOLVED_REFERENCE!>Unresolved<!>::unresolved<!>)
     <!UNRESOLVED_REFERENCE!>::unresolved<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt b/compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt
index 12c944b7062..6cbec1318df 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt
@@ -18,7 +18,7 @@ fun test2() {
     fun foo() {}
 
     <!UNRESOLVED_REFERENCE!>Unresolved<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>
-    foo(<!UNRESOLVED_REFERENCE!>Unresolved<!>::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>)
-    foo(<!UNRESOLVED_REFERENCE!>Unresolved<!>::<!NI;UNRESOLVED_REFERENCE, OI;DEBUG_INFO_MISSING_UNRESOLVED!>unresolved<!>)
+    foo(<!UNRESOLVED_REFERENCE!>Unresolved<!>::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, DEBUG_INFO_MISSING_UNRESOLVED{OI}!>foo<!>)
+    foo(<!UNRESOLVED_REFERENCE!>Unresolved<!>::<!DEBUG_INFO_MISSING_UNRESOLVED{OI}, UNRESOLVED_REFERENCE{NI}!>unresolved<!>)
     ::<!UNRESOLVED_REFERENCE!>unresolved<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.fir.kt
index f4823010880..912f1d0586d 100644
--- a/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.fir.kt
@@ -15,4 +15,4 @@ fun bar2(body: (String, Int) -> String): String {
 fun test() {
     bar1(::foo)
     bar2(::foo)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.kt b/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.kt
index 1286b67628b..45518d3a90c 100644
--- a/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.kt
@@ -13,6 +13,6 @@ fun bar2(body: (String, Int) -> String): String {
 }
 
 fun test() {
-    bar1(<!OI;TYPE_MISMATCH!>::foo<!>)
+    bar1(<!TYPE_MISMATCH{OI}!>::foo<!>)
     bar2(::foo)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.fir.kt
index c43049f5469..f3ef65d93c3 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.fir.kt
@@ -34,4 +34,4 @@ fun <T> test2(x: T) {
     bar(listOf<T>(), setOf<T>(), ::foo).checkType { _<Pair<List<T>, Set<T>>> () }
     bar(listOf<T>(), 1, ::foo).checkType { _<Pair<List<T>, Int>>() }
     bar(1, listOf<T>(), ::foo).checkType { _<Pair<Int, List<T>>>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.kt b/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.kt
index f75b4b68bcf..bb292eca42b 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.kt
@@ -16,9 +16,9 @@ fun test1() {
     bar("", 1, ::foo).checkType { _<Pair<String, Int>>() }
     bar("", 1, ::fooReturnInt).checkType { _<Pair<String, Int>>() }
     bar("", 1, ::fooTakeString).checkType { _<Pair<String, Int>>() }
-    bar("", "", ::fooReturnInt).checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Pair<String, Any>>() }
+    bar("", "", ::fooReturnInt).checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Pair<String, Any>>() }
 
-    val x: String = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>bar("", "", ::fooReturnInt)<!>
+    val x: String = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>bar("", "", ::fooReturnInt)<!>
 
     baz(Int::toString, ::foo).checkType { _<Pair<Int, String>>() }
 }
@@ -34,4 +34,4 @@ fun <T> test2(x: T) {
     bar(listOf<T>(), setOf<T>(), ::foo).checkType { _<Pair<List<T>, Set<T>>> () }
     bar(listOf<T>(), 1, ::foo).checkType { _<Pair<List<T>, Int>>() }
     bar(1, listOf<T>(), ::foo).checkType { _<Pair<Int, List<T>>>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/dependOnArgumentType.kt b/compiler/testData/diagnostics/tests/callableReference/generic/dependOnArgumentType.kt
index f93d0f47013..961da9621d2 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/dependOnArgumentType.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/dependOnArgumentType.kt
@@ -27,4 +27,4 @@ fun <R> test2(x: R) {
     foo(x, ::bar)
 
     complex(x, ::bar)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.kt b/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.kt
index f9e1511590b..58ef4a7767f 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.kt
@@ -14,12 +14,12 @@ fun <T> Wrapper<T>.baz(transform: (T) -> Unit): T = TODO()
 
 fun test() {
     takeFun<String>(::foo)
-    takeFun<String>(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>::<!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>fooInt<!><!>)
+    takeFun<String>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>::<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooInt<!><!>)
 
     callFun<String, Wrapper<String>>(::createWrapper)
     callFun<Int, Wrapper<Number>>(::createWrapper)
     callFun<String, Wrapper<*>>(::createWrapper)
-    callFun<String, Wrapper<Int>>(::<!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>createWrapper<!>)
+    callFun<String, Wrapper<Int>>(::<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>createWrapper<!>)
 
     callFun<Int, Wrapper<Int>>(::createWrapper).baz(::foo)
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.kt b/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.kt
index 1dec1c9ca97..2589b80a8b3 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.kt
@@ -23,9 +23,9 @@ fun test1() {
 fun <T> test2() {
     bar<Wrapper, Int, String>(Wrapper::fooReturnString).checkType { _<Tripple<Wrapper, Int, String>>() }
     bar<Wrapper, T, String>(Wrapper::fooReturnString).checkType { _<Tripple<Wrapper, T, String>>() }
-    bar<Wrapper, T, T>(<!NI;TYPE_MISMATCH!>Wrapper::<!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>fooReturnString<!><!>)
-    bar<Wrapper, Int, Int>(<!NI;TYPE_MISMATCH!>Wrapper::<!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>fooReturnString<!><!>)
+    bar<Wrapper, T, T>(<!TYPE_MISMATCH{NI}!>Wrapper::<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>fooReturnString<!><!>)
+    bar<Wrapper, Int, Int>(<!TYPE_MISMATCH{NI}!>Wrapper::<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>fooReturnString<!><!>)
 
     bar<Wrapper, Int, T>(Wrapper::fooTakeInt).checkType { _<Tripple<Wrapper, Int, T>>() }
     bar<Wrapper, Int, String>(Wrapper::fooTakeInt).checkType { _<Tripple<Wrapper, Int, String>>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.fir.kt
index f5a10b2ed56..fc0a7eb3a4e 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.fir.kt
@@ -34,4 +34,4 @@ fun <T> test(x: T) {
 
     val s5: Pair<Int, String> = bar(1, "", ::foo)
     val (a1: Int, b1: String) = bar(1, "", ::foo)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt b/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt
index 79377bf1e1f..7eea813263e 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt
@@ -29,9 +29,9 @@ fun <T> test(x: T) {
     <!REIFIED_TYPE_FORBIDDEN_SUBSTITUTION!>baz<!>(1, null, ::foo)
     <!REIFIED_TYPE_FORBIDDEN_SUBSTITUTION, REIFIED_TYPE_FORBIDDEN_SUBSTITUTION!>baz<!>(null, null, ::foo)
 
-    val s3: Pair<Int, String?> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>bar(null, null, ::<!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>)<!>
-    val s4: Pair<Int?, String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>bar(null, null, ::<!NI;IMPLICIT_NOTHING_TYPE_ARGUMENT_IN_RETURN_POSITION, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>)<!>
+    val s3: Pair<Int, String?> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>bar(null, null, ::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>)<!>
+    val s4: Pair<Int?, String> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>bar(null, null, ::<!IMPLICIT_NOTHING_TYPE_ARGUMENT_IN_RETURN_POSITION{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>)<!>
 
-    val s5: Pair<Int, String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>bar(1, "", ::foo)<!>
+    val s5: Pair<Int, String> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>bar(1, "", ::foo)<!>
     val (a1: Int, b1: String) = <!COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH!>bar(1, "", ::foo)<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.fir.kt
index af8867fde95..e2ee9d919a5 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.fir.kt
@@ -19,4 +19,4 @@ fun test() {
     baz<(Int) -> Unit>(id(::foo), id(id(::foo)))
     baz(id(::foo), id(id<(Int) -> Unit>(::foo)))
     baz(id(::foo), id<(Int) -> Unit>(id(::foo)))
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.kt b/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.kt
index 4dcb4810326..93c5b667a93 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.kt
@@ -11,7 +11,7 @@ fun test() {
     val x2: (Int) -> Unit = baz(id(::foo), ::foo)
     val x3: (Int) -> Unit = baz(id(::foo), id(id(::foo)))
     val x4: (String) -> Unit = baz(id(::foo), id(id(::foo)))
-    val x5: (Double) -> Unit = baz(id(::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;NONE_APPLICABLE!>foo<!>), id(id(::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;NONE_APPLICABLE!>foo<!>)))
+    val x5: (Double) -> Unit = baz(id(::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, NONE_APPLICABLE{OI}!>foo<!>), id(id(::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, NONE_APPLICABLE{OI}!>foo<!>)))
 
 
     id<(Int) -> Unit>(id(id(::foo)))
@@ -19,4 +19,4 @@ fun test() {
     baz<(Int) -> Unit>(id(::foo), id(id(::foo)))
     baz(id(::foo), id(id<(Int) -> Unit>(::foo)))
     baz(id(::foo), id<(Int) -> Unit>(id(::foo)))
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.fir.kt
index 1d1c41ecace..fa9a235ea18 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.fir.kt
@@ -20,4 +20,4 @@ fun test1() {
     val b1: Int = baz(<!UNRESOLVED_REFERENCE!>::foo<!>)
     val b2: String = baz(<!UNRESOLVED_REFERENCE!>::foo<!>)
     val b3: Boolean = baz(<!UNRESOLVED_REFERENCE!>::foo<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.kt b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.kt
index 78fddfdb2e3..c4fd6422d5f 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.kt
@@ -17,7 +17,7 @@ fun test1() {
     baz<String>(::foo).checkType { _<String?>() }
     baz<Boolean>(::foo).checkType { _<Boolean?>() }
 
-    val b1: Int = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>baz(::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>foo<!>)<!>
-    val b2: String = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>baz(::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>foo<!>)<!>
-    val b3: Boolean = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>baz(::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY!>foo<!>)<!>
-}
\ No newline at end of file
+    val b1: Int = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>baz(::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}!>foo<!>)<!>
+    val b2: String = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>baz(::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}!>foo<!>)<!>
+    val b3: Boolean = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>baz(::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}!>foo<!>)<!>
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.kt b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.kt
index 0196e6c4812..b079ffde181 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.kt
@@ -5,9 +5,9 @@ fun test() {
     val a1: Array<Double.(Double) -> Double> = arrayOf(Double::plus, Double::minus)
     val a2: Array<Double.(Int) -> Double> = arrayOf(Double::plus, Double::minus)
 
-    val a3: Array<Int.(Int) -> Double> = arrayOf(Double::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;NONE_APPLICABLE!>plus<!>, Double::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;NONE_APPLICABLE!>minus<!>)
-    val a4: Array<Int.(Double) -> Double> = arrayOf(Int::plus, Double::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;NONE_APPLICABLE!>minus<!>)
-    val a5: Array<Double.(Double) -> Double> = arrayOf(Double::plus, Int::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;NONE_APPLICABLE!>minus<!>)
+    val a3: Array<Int.(Int) -> Double> = arrayOf(Double::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, NONE_APPLICABLE{OI}!>plus<!>, Double::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, NONE_APPLICABLE{OI}!>minus<!>)
+    val a4: Array<Int.(Double) -> Double> = arrayOf(Int::plus, Double::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, NONE_APPLICABLE{OI}!>minus<!>)
+    val a5: Array<Double.(Double) -> Double> = arrayOf(Double::plus, Int::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, NONE_APPLICABLE{OI}!>minus<!>)
 }
 
 fun foo(x: Int) {}
@@ -18,5 +18,5 @@ fun <T> bar(x: T, f: (T) -> Unit) {}
 fun test2() {
     bar(1, ::foo)
     bar("", ::foo)
-    bar(1.0, ::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;NONE_APPLICABLE!>foo<!>)
+    bar(1.0, ::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, NONE_APPLICABLE{OI}!>foo<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/specialCalls.kt b/compiler/testData/diagnostics/tests/callableReference/generic/specialCalls.kt
index aee3d92a0ac..99d2b985943 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/specialCalls.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/specialCalls.kt
@@ -20,4 +20,4 @@ fun test() {
     val x5: (Int) -> Int = bar(::baz<!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>)
 
     (if (true) ::baz else ::baz)(1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/kt34314.kt b/compiler/testData/diagnostics/tests/callableReference/kt34314.kt
index e96d453f3ea..f4877956ae9 100644
--- a/compiler/testData/diagnostics/tests/callableReference/kt34314.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/kt34314.kt
@@ -2,5 +2,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 fun main() {
-    val x = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>run<!> { <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>::<!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>run<!><!> } // no error
+    val x = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>run<!> { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>::<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>run<!><!> } // no error
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.kt b/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.kt
index 4f32d9431ce..e78751143f3 100644
--- a/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.kt
@@ -4,5 +4,5 @@
 fun <T> materialize(): T = TODO()
 
 fun main() {
-    val x = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>run<!> { <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>materialize<!>() }
+    val x = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>run<!> { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>materialize<!>() }
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/kt37530.kt b/compiler/testData/diagnostics/tests/callableReference/kt37530.kt
index 1a1b22881f0..d0d956d8e77 100644
--- a/compiler/testData/diagnostics/tests/callableReference/kt37530.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/kt37530.kt
@@ -7,5 +7,5 @@ fun <D> create(fn: () -> D): D {
 }
 
 fun main() {
-    create(::<!CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS, OI;CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS, OI;CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS!>Abstract<!>)
+    create(::<!CREATING_AN_INSTANCE_OF_ABSTRACT_CLASS!>Abstract<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/callableReference/referenceAdaptationHasDependencyOnApi14.kt b/compiler/testData/diagnostics/tests/callableReference/referenceAdaptationHasDependencyOnApi14.kt
index 0d9359b2f3a..31f3f8f66af 100644
--- a/compiler/testData/diagnostics/tests/callableReference/referenceAdaptationHasDependencyOnApi14.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/referenceAdaptationHasDependencyOnApi14.kt
@@ -15,4 +15,4 @@ fun test() {
     varargToElement(<!TYPE_MISMATCH!>A::foo<!>)
     defaultAndVararg(<!TYPE_MISMATCH!>A::foo<!>)
     allOfTheAbove(<!TYPE_MISMATCH!>A::foo<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.fir.kt
index 94b5a42062c..8d341599ee2 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.fir.kt
@@ -8,4 +8,4 @@ fun foo(s: String) {}
 
 val x1 = ofType<() -> Unit>(::foo)
 val x2 = ofType<(String) -> Unit>(::foo)
-val x3 = <!INAPPLICABLE_CANDIDATE!>ofType<!><(Int) -> Unit>(<!UNRESOLVED_REFERENCE!>::foo<!>)
\ No newline at end of file
+val x3 = <!INAPPLICABLE_CANDIDATE!>ofType<!><(Int) -> Unit>(<!UNRESOLVED_REFERENCE!>::foo<!>)
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.kt
index 53f4c989346..d92df4d486e 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.kt
@@ -8,4 +8,4 @@ fun foo(s: String) {}
 
 val x1 = ofType<() -> Unit>(::foo)
 val x2 = ofType<(String) -> Unit>(::foo)
-val x3 = ofType<(Int) -> Unit>(::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;NONE_APPLICABLE!>foo<!>)
\ No newline at end of file
+val x3 = ofType<(Int) -> Unit>(::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, NONE_APPLICABLE{OI}!>foo<!>)
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.kt
index 9b00eef59ed..d0aad3d4df8 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.kt
@@ -11,9 +11,9 @@ class Foo {
     }
 
     fun foo() {
-        <!NI;NONE_APPLICABLE, OI;OVERLOAD_RESOLUTION_AMBIGUITY!>installRoute<!><Any>(::route)
+        <!NONE_APPLICABLE{NI}, OVERLOAD_RESOLUTION_AMBIGUITY{OI}!>installRoute<!><Any>(::route)
     }
 
 }
 
-fun route(s: String): Any? = null
\ No newline at end of file
+fun route(s: String): Any? = null
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/overloads.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/overloads.kt
index 18357e89d25..79fadc1252c 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/overloads.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/overloads.kt
@@ -27,4 +27,4 @@ fun test() {
     B::<!OVERLOAD_RESOLUTION_AMBIGUITY!>bas<!>
 
     ::<!OVERLOAD_RESOLUTION_AMBIGUITY!>fas<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/resolveCallableReferencesAfterAllSimpleArguments.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/resolveCallableReferencesAfterAllSimpleArguments.kt
index 69e5755059f..53e13b9a6d3 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/resolveCallableReferencesAfterAllSimpleArguments.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/resolveCallableReferencesAfterAllSimpleArguments.kt
@@ -13,4 +13,4 @@ fun test(a: A, b: B) {
     // Note that diagnostic is always on callable references as they are resolved after simple arguments
     baz(a, <!TYPE_MISMATCH!>::fooB<!>)
     bar(<!TYPE_MISMATCH!>::fooB<!>, a)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.fir.kt
index 97276eddf24..892f9b83286 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.fir.kt
@@ -9,4 +9,4 @@ fun foo(s: String) {}
 
 val x1 = apply(1, ::foo)
 val x2 = apply("hello", ::foo)
-val x3 = <!INAPPLICABLE_CANDIDATE!>apply<!>(true, <!UNRESOLVED_REFERENCE!>::foo<!>)
\ No newline at end of file
+val x3 = <!INAPPLICABLE_CANDIDATE!>apply<!>(true, <!UNRESOLVED_REFERENCE!>::foo<!>)
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.kt
index 95d91830fd5..3d76e660054 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.kt
@@ -9,4 +9,4 @@ fun foo(s: String) {}
 
 val x1 = apply(1, ::foo)
 val x2 = apply("hello", ::foo)
-val x3 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>apply<!>(true, ::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;NONE_APPLICABLE!>foo<!>)
\ No newline at end of file
+val x3 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>apply<!>(true, ::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, NONE_APPLICABLE{OI}!>foo<!>)
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.fir.kt
index 529469c7d36..ec722c9bba5 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.fir.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// !DIAGNOSTICS: -UNUSED_PARAMETER,-CONFLICTING_JVM_DECLARATIONS
+// !DIAGNOSTICS: -UNUSED_PARAMETER -CONFLICTING_JVM_DECLARATIONS
 // NI_EXPECTED_FILE
 
 fun foo(i: Int) = "$i"
@@ -25,4 +25,4 @@ val x3 = fn2(::bar, ::foo)
 val x4 = <!AMBIGUITY!>fn2<!>(<!UNRESOLVED_REFERENCE!>::foo<!>, ::bar)
 val x5 = <!AMBIGUITY!>fn2<!>(<!UNRESOLVED_REFERENCE!>::foo<!>, <!UNRESOLVED_REFERENCE!>::foo<!>)
 
-val x6 = fn3(1, ::qux)
\ No newline at end of file
+val x6 = fn3(1, ::qux)
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.kt
index 3e2251bed0b..1a2118bfe41 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// !DIAGNOSTICS: -UNUSED_PARAMETER,-CONFLICTING_JVM_DECLARATIONS
+// !DIAGNOSTICS: -UNUSED_PARAMETER -CONFLICTING_JVM_DECLARATIONS
 // NI_EXPECTED_FILE
 
 fun foo(i: Int) = "$i"
@@ -22,7 +22,7 @@ val x1 = fn1(1, ::foo, ::foo)
 val x2 = fn1(1, ::foo, ::bar)
 
 val x3 = fn2(::bar, ::foo)
-val x4 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>fn2<!>(::<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>, ::bar)
-val x5 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>fn2<!>(::<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>, ::<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>)
+val x4 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>fn2<!>(::<!DEBUG_INFO_MISSING_UNRESOLVED{NI}, OVERLOAD_RESOLUTION_AMBIGUITY{OI}!>foo<!>, ::bar)
+val x5 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>fn2<!>(::<!DEBUG_INFO_MISSING_UNRESOLVED{NI}, OVERLOAD_RESOLUTION_AMBIGUITY{OI}!>foo<!>, ::<!DEBUG_INFO_MISSING_UNRESOLVED{NI}, OVERLOAD_RESOLUTION_AMBIGUITY{OI}!>foo<!>)
 
-val x6 = fn3(1, ::qux)
\ No newline at end of file
+val x6 = fn3(1, ::qux)
diff --git a/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.fir.kt b/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.fir.kt
index e29d857d649..51416c8e083 100644
--- a/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.fir.kt
+++ b/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.fir.kt
@@ -50,4 +50,4 @@ fun <T> testDependent() {
 }
 
 fun <T> listOf(vararg elements: T): List<T> = TODO()
-fun <T, R> Iterable<T>.map(transform: (T) -> R): List<R> = TODO()
\ No newline at end of file
+fun <T, R> Iterable<T>.map(transform: (T) -> R): List<R> = TODO()
diff --git a/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.kt b/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.kt
index 07734c128ab..c128ca9a2fd 100644
--- a/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.kt
+++ b/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.kt
@@ -6,7 +6,7 @@ fun runWithoutReturn(r: () -> Unit) = r()
 fun testRun() {
     run {
         1 <!USELESS_CAST!>as Any<!>
-        1 <!NI;USELESS_CAST!>as Any<!>
+        1 <!USELESS_CAST{NI}!>as Any<!>
     }
 
     run<Any> {
@@ -17,11 +17,11 @@ fun testRun() {
     fun foo(): Int = 1
 
     run {
-        foo() <!NI;USELESS_CAST!>as Any<!>
+        foo() <!USELESS_CAST{NI}!>as Any<!>
     }
 
     run {
-        (if (true) 1 else 2) <!NI;USELESS_CAST!>as Any<!>
+        (if (true) 1 else 2) <!USELESS_CAST{NI}!>as Any<!>
     }
 
     run<Int?> {
@@ -36,18 +36,18 @@ fun testRun() {
 }
 
 fun testReturn(): Number {
-    run { 1 <!NI;USELESS_CAST!>as Number<!> }
+    run { 1 <!USELESS_CAST{NI}!>as Number<!> }
     return run { 1 <!USELESS_CAST!>as Number<!> }
 }
 
 fun <T> testDependent() {
     listOf(1).map {
         it <!USELESS_CAST!>as Any<!>
-        it <!NI;USELESS_CAST!>as Any<!>
+        it <!USELESS_CAST{NI}!>as Any<!>
     }
 
-    listOf<T>().map { it <!NI;USELESS_CAST!>as Any?<!> }
+    listOf<T>().map { it <!USELESS_CAST{NI}!>as Any?<!> }
 }
 
 fun <T> listOf(vararg elements: T): List<T> = TODO()
-fun <T, R> Iterable<T>.map(transform: (T) -> R): List<R> = TODO()
\ No newline at end of file
+fun <T, R> Iterable<T>.map(transform: (T) -> R): List<R> = TODO()
diff --git a/compiler/testData/diagnostics/tests/cast/UselessSafeCast.fir.kt b/compiler/testData/diagnostics/tests/cast/UselessSafeCast.fir.kt
index f35df122d02..6e2725448d4 100644
--- a/compiler/testData/diagnostics/tests/cast/UselessSafeCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/cast/UselessSafeCast.fir.kt
@@ -20,4 +20,4 @@ fun test(x: Int?) {
     }
 }
 
-fun foo(x: Number?) {}
\ No newline at end of file
+fun foo(x: Number?) {}
diff --git a/compiler/testData/diagnostics/tests/cast/UselessSafeCast.kt b/compiler/testData/diagnostics/tests/cast/UselessSafeCast.kt
index 6a5f82470ab..e66a9efaa40 100644
--- a/compiler/testData/diagnostics/tests/cast/UselessSafeCast.kt
+++ b/compiler/testData/diagnostics/tests/cast/UselessSafeCast.kt
@@ -11,7 +11,7 @@ fun test(x: Int?) {
     val a7: Number? = 1 <!USELESS_CAST!>as? Number<!>
 
     run { x <!USELESS_CAST!>as? Int<!> }
-    run { x <!NI;USELESS_CAST!>as? Number<!> }
+    run { x <!USELESS_CAST{NI}!>as? Number<!> }
 
     foo(x as? Number)
 
@@ -20,4 +20,4 @@ fun test(x: Int?) {
     }
 }
 
-fun foo(x: Number?) {}
\ No newline at end of file
+fun foo(x: Number?) {}
diff --git a/compiler/testData/diagnostics/tests/cast/kt15161.fir.kt b/compiler/testData/diagnostics/tests/cast/kt15161.fir.kt
index da274164691..02d95115904 100644
--- a/compiler/testData/diagnostics/tests/cast/kt15161.fir.kt
+++ b/compiler/testData/diagnostics/tests/cast/kt15161.fir.kt
@@ -4,4 +4,4 @@ class Array<E>(e: E) {
         1 as Any
         e as Any?
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/cast/kt15161.kt b/compiler/testData/diagnostics/tests/cast/kt15161.kt
index dbbaa04a2ce..41fad36bda1 100644
--- a/compiler/testData/diagnostics/tests/cast/kt15161.kt
+++ b/compiler/testData/diagnostics/tests/cast/kt15161.kt
@@ -2,6 +2,6 @@
 class Array<E>(e: E) {
     val k = Array(1) {
         1 <!USELESS_CAST!>as Any<!>
-        e <!NI;USELESS_CAST!>as Any?<!>
+        e <!USELESS_CAST{NI}!>as Any?<!>
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.fir.kt b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.fir.kt
index fd1651e8fab..1bcb23f6af9 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.fir.kt
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.fir.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -WARNING +CAST_NEVER_SUCCEEDS
+// !DIAGNOSTICS: -PLATFORM_CLASS_MAPPED_TO_KOTLIN -USELESS_CAST
 import java.lang.String as JString
 import java.lang.CharSequence as JCS
 
@@ -30,4 +30,4 @@ fun test(
 
   jcs as Int
   s as java.lang.Integer
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.kt b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.kt
index c3036d892ac..10a42477396 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.kt
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -WARNING +CAST_NEVER_SUCCEEDS
+// !DIAGNOSTICS: -PLATFORM_CLASS_MAPPED_TO_KOTLIN -USELESS_CAST
 import java.lang.String as JString
 import java.lang.CharSequence as JCS
 
@@ -30,4 +30,4 @@ fun test(
 
   jcs <!CAST_NEVER_SUCCEEDS!>as<!> Int
   s <!CAST_NEVER_SUCCEEDS!>as<!> java.lang.Integer
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.fir.kt b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.fir.kt
index 98982311d56..c776beaf211 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.fir.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -WARNING +CAST_NEVER_SUCCEEDS -ABSTRACT_MEMBER_NOT_IMPLEMENTED
+// !DIAGNOSTICS: -PLATFORM_CLASS_MAPPED_TO_KOTLIN -UNUSED_PARAMETER -ABSTRACT_MEMBER_NOT_IMPLEMENTED -USELESS_CAST
 import java.lang.CharSequence as JCS
 
 class JSub: JCS
@@ -18,4 +18,4 @@ fun test(
 
   js as Sub
   s as JSub
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.kt b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.kt
index 821ae2270aa..b8584abd89a 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.kt
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -WARNING +CAST_NEVER_SUCCEEDS -ABSTRACT_MEMBER_NOT_IMPLEMENTED
+// !DIAGNOSTICS: -PLATFORM_CLASS_MAPPED_TO_KOTLIN -UNUSED_PARAMETER -ABSTRACT_MEMBER_NOT_IMPLEMENTED -USELESS_CAST
 import java.lang.CharSequence as JCS
 
 class JSub: JCS
@@ -18,4 +18,4 @@ fun test(
 
   js <!CAST_NEVER_SUCCEEDS!>as<!> Sub
   s <!CAST_NEVER_SUCCEEDS!>as<!> JSub
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt
index ba7c29177ce..48a50f50add 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt
@@ -1,5 +1,5 @@
 // FIR_IDENTICAL
-// !DIAGNOSTICS: -WARNING +CAST_NEVER_SUCCEEDS
+// !DIAGNOSTICS: -USELESS_CAST -UNCHECKED_CAST
 interface T1
 interface T2
 interface T3
@@ -44,4 +44,4 @@ fun <TP1: OC1, TP2: T2, TP3: OC2> test(
   tp2 as T2
   tp2 as T5
   tp1 as TP3
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.fir.kt b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.fir.kt
index 1aef98f1325..791075a1f6d 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.fir.kt
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.fir.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -WARNING +CAST_NEVER_SUCCEEDS
+// !DIAGNOSTICS: -UNCHECKED_CAST
 interface Trait1
 interface Trait2
 open class OClass1
@@ -31,4 +31,4 @@ fun <TP1: OClass1, TP2: OClass2> test(
   tp1 as OClass2
   tp1 as FClass2
   tp1 as TP2
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt
index 1f2a52a4d71..1ff4ef851a7 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -WARNING +CAST_NEVER_SUCCEEDS
+// !DIAGNOSTICS: -UNCHECKED_CAST
 interface Trait1
 interface Trait2
 open class OClass1
@@ -31,4 +31,4 @@ fun <TP1: OClass1, TP2: OClass2> test(
   tp1 as OClass2
   tp1 as FClass2
   tp1 as TP2
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
index 4955c8da00c..926cddf106e 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
@@ -12,7 +12,7 @@ fun main() {
     join(1, "2", "3")
     join(<!NON_VARARG_SPREAD!>*<!>1, "2")
     join(1, *<!TYPE_MISMATCH!>"2"<!>)
-    join(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, NI;TYPE_MISMATCH!>"2"<!>)
+    join(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, TYPE_MISMATCH{NI}!>"2"<!>)
     join(x = <!NON_VARARG_SPREAD!>*<!>1, a = *<!TYPE_MISMATCH!>"2"<!>)
     join(x = 1, a = a)
     join(x = 1, a = <!TYPE_MISMATCH!>b<!>)
@@ -25,35 +25,35 @@ fun main() {
     join(1, "4", *a)
     join(1, "4", *a, *a, "3")
     join(1, "4", *a, *<!TYPE_MISMATCH!>b<!>, "3")
-    join(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>a = a<!>, x = 1)
-    join(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>a = <!TYPE_MISMATCH!>b<!><!>, x = 1)
-    join(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>a = a<!>, x = 1)
+    join(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS{NI}!>a = a<!>, x = 1)
+    join(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS{NI}!>a = <!TYPE_MISMATCH!>b<!><!>, x = 1)
+    join(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS{NI}!>a = a<!>, x = 1)
 
     joinG<String>(1, "2")
     joinG<String>(<!NON_VARARG_SPREAD!>*<!>1, "2")
     joinG<String>(1, *<!TYPE_MISMATCH!>"2"<!>)
     joinG<String>(x = 1, a = a)
-    joinG<String>(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, NI;TYPE_MISMATCH!>"2"<!>)
+    joinG<String>(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, TYPE_MISMATCH{NI}!>"2"<!>)
     joinG<String>(x = <!NON_VARARG_SPREAD!>*<!>1, a = *<!TYPE_MISMATCH!>"2"<!>)
     joinG<String>(1, *a)
     joinG<String>(1, *a, "3")
     joinG<String>(1, "4", *a, "3")
     joinG<String>(1, "4", *a)
     joinG<String>(1, "4", *a, *a, "3")
-    joinG<String>(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>a = a<!>, x = 1)
+    joinG<String>(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS{NI}!>a = a<!>, x = 1)
 
     joinG(1, "2")
     joinG(<!NON_VARARG_SPREAD!>*<!>1, "2")
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>joinG<!>(1, *<!TYPE_MISMATCH!>"2"<!>)
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>joinG<!>(1, *<!TYPE_MISMATCH!>"2"<!>)
     joinG(x = 1, a = a)
-    joinG(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, NI;TYPE_MISMATCH!>"2"<!>)
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>joinG<!>(x = <!NON_VARARG_SPREAD!>*<!>1, a = *<!TYPE_MISMATCH!>"2"<!>)
+    joinG(x = 1, a = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, TYPE_MISMATCH{NI}!>"2"<!>)
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>joinG<!>(x = <!NON_VARARG_SPREAD!>*<!>1, a = *<!TYPE_MISMATCH!>"2"<!>)
     joinG(1, *a)
     joinG(1, *a, "3")
     joinG(1, "4", *a, "3")
     joinG(1, "4", *a)
     joinG(1, "4", *a, *a, "3")
-    joinG(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>a = a<!>, x = 1)
+    joinG(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS{NI}!>a = a<!>, x = 1)
 
     val x1 = joinT(1, "2")
     checkSubtype<String?>(x1)
@@ -69,7 +69,7 @@ fun main() {
     checkSubtype<String?>(x9)
     val x10 = joinT(1, "4", *a, *a, "3")
     checkSubtype<String?>(x10)
-    val x11 = joinT(<!NI;CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS!>a = a<!>, x = 1)
+    val x11 = joinT(<!CHANGING_ARGUMENTS_EXECUTION_ORDER_FOR_NAMED_VARARGS{NI}!>a = a<!>, x = 1)
     checkSubtype<String?>(x11)
     val x12 = joinT(x = 1, a = a)
     checkSubtype<String?>(x12)
@@ -93,4 +93,4 @@ fun <T> joinG(x : Int, vararg a : T) : String {
 
 fun <T: Any> joinT(<!UNUSED_PARAMETER!>x<!> : Int, vararg <!UNUSED_PARAMETER!>a<!> : T) : T? {
     return null
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.kt b/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.kt
index 534666d631c..01778b5843b 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.kt
@@ -6,6 +6,6 @@ class A {
     operator fun set(x: String, value: Int) {}
 
     fun d(x: Int) {
-        this["", <!OI;TOO_MANY_ARGUMENTS!>1<!>] = <!NI;TOO_MANY_ARGUMENTS!>1<!>
+        this["", <!TOO_MANY_ARGUMENTS{OI}!>1<!>] = <!TOO_MANY_ARGUMENTS{NI}!>1<!>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt
index 9634aece459..66fd955733e 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt
@@ -26,4 +26,4 @@ fun test() {
     <!INAPPLICABLE_CANDIDATE!>foo<!>("", 1) {}
 
     <!INAPPLICABLE_CANDIDATE!>foo<!>("", 1) {} {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt
index 6ffad0cd81a..3e3f5038433 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt
@@ -21,9 +21,9 @@ fun test() {
 
     foo(<!TYPE_MISMATCH!>""<!>, s = <!CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!>)
 
-    foo(i = <!TYPE_MISMATCH!>""<!>, s = <!CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!>, <!NI;TOO_MANY_ARGUMENTS, OI;MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>33<!>)
+    foo(i = <!TYPE_MISMATCH!>""<!>, s = <!CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!>, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS{OI}, TOO_MANY_ARGUMENTS{NI}!>33<!>)
 
     foo(<!TYPE_MISMATCH!>""<!>, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>) <!TOO_MANY_ARGUMENTS!>{}<!>
 
     foo(<!TYPE_MISMATCH!>""<!>, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>) <!TOO_MANY_ARGUMENTS!>{}<!> <!MANY_LAMBDA_EXPRESSION_ARGUMENTS!>{}<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.kt b/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.kt
index 4ebcaa07984..b7e9129f92f 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.kt
@@ -12,6 +12,6 @@ fun test() {
     <!NONE_APPLICABLE!>foo<!>(1, 2)
     foo(<!TYPE_MISMATCH!>""<!>)
 
-    <!OI;NONE_APPLICABLE!>bar<!>(1, <!NI;TOO_MANY_ARGUMENTS!>2<!>)
+    <!NONE_APPLICABLE{OI}!>bar<!>(1, <!TOO_MANY_ARGUMENTS{NI}!>2<!>)
     <!NONE_APPLICABLE!>bar<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/checkType.kt b/compiler/testData/diagnostics/tests/checkType.kt
index 2c67dda4e97..cb8cd2fa44b 100644
--- a/compiler/testData/diagnostics/tests/checkType.kt
+++ b/compiler/testData/diagnostics/tests/checkType.kt
@@ -7,6 +7,6 @@ interface C : B
 
 fun test(b: B) {
     b checkType { _<B>() }
-    b checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><A>() }
-    b checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><C>() }
+    b checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><A>() }
+    b checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><C>() }
 }
diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt
index 450938b6ca4..b4a10ef21a4 100644
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt
@@ -27,4 +27,4 @@ class CCC() {
   private companion object {
     val classObjectVar = 3
   }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt
index 13235a7274d..530c42cc791 100644
--- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughClassObject.kt
@@ -48,4 +48,4 @@ fun f() {
 
     O.O
     O.A()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt
index 045e0d7934c..9e882d8676f 100644
--- a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt
@@ -48,4 +48,4 @@ fun test() {
     a.C.<!INVISIBLE_MEMBER!>baz<!>()
 }
 
-fun f(<!UNUSED_PARAMETER!>unused<!>: Any) {}
\ No newline at end of file
+fun f(<!UNUSED_PARAMETER!>unused<!>: Any) {}
diff --git a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt
index 95de9ebe69f..500609fcadb 100644
--- a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt
@@ -12,4 +12,4 @@ class A {
 
 fun <!EXPOSED_FUNCTION_RETURN_TYPE!>f1<!>() = A.<!INVISIBLE_REFERENCE!>Companion<!>.<!INVISIBLE_REFERENCE!>B<!>.<!INVISIBLE_MEMBER!>C<!>
 
-fun f2() = A.<!INVISIBLE_REFERENCE!>Companion<!>.<!INVISIBLE_REFERENCE!>B<!>.<!INVISIBLE_REFERENCE!>C<!>.<!INVISIBLE_MEMBER!>foo<!>()
\ No newline at end of file
+fun f2() = A.<!INVISIBLE_REFERENCE!>Companion<!>.<!INVISIBLE_REFERENCE!>B<!>.<!INVISIBLE_REFERENCE!>C<!>.<!INVISIBLE_MEMBER!>foo<!>()
diff --git a/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject.fir.kt b/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject.fir.kt
index d55f0669343..e2eb8b5226b 100644
--- a/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject.fir.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject.fir.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -ProhibitTypeParametersInAnonymousObjects
-// !DIAGNOSTICS: -UNUSED_VARIABLE!
+// !DIAGNOSTICS: -UNUSED_VARIABLE
 // ISSUE: KT-28999
 
 fun case_1() {
@@ -37,4 +37,4 @@ inline fun <reified T> case_5() {
         // z is {T!! & T!!} (smart cast from T)
         <!UNRESOLVED_REFERENCE!>println<!>(z)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject.kt b/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject.kt
index 6ffa6c57dca..002ce8da2e0 100644
--- a/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: -ProhibitTypeParametersInAnonymousObjects
-// !DIAGNOSTICS: -UNUSED_VARIABLE!
+// !DIAGNOSTICS: -UNUSED_VARIABLE
 // ISSUE: KT-28999
 
 fun case_1() {
@@ -37,4 +37,4 @@ inline fun <reified T> case_5() {
         // z is {T!! & T!!} (smart cast from T)
         <!UNRESOLVED_REFERENCE!>println<!>(z)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject_after.fir.kt b/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject_after.fir.kt
index 8a5ed8f3ddc..e7f7ba14ef1 100644
--- a/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject_after.fir.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject_after.fir.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +ProhibitTypeParametersInAnonymousObjects
-// !DIAGNOSTICS: -UNUSED_VARIABLE!
+// !DIAGNOSTICS: -UNUSED_VARIABLE
 // ISSUE: KT-28999
 
 fun case_1() {
@@ -37,4 +37,4 @@ inline fun <reified T> case_5() {
         // z is {T!! & T!!} (smart cast from T)
         <!UNRESOLVED_REFERENCE!>println<!>(z)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject_after.kt b/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject_after.kt
index 3ebe56c899a..c49a042b252 100644
--- a/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject_after.kt
+++ b/compiler/testData/diagnostics/tests/classObjects/typeParametersInAnnonymousObject_after.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +ProhibitTypeParametersInAnonymousObjects
-// !DIAGNOSTICS: -UNUSED_VARIABLE!
+// !DIAGNOSTICS: -UNUSED_VARIABLE
 // ISSUE: KT-28999
 
 fun case_1() {
@@ -37,4 +37,4 @@ inline fun <reified T> case_5() {
         // z is {T!! & T!!} (smart cast from T)
         <!UNRESOLVED_REFERENCE!>println<!>(z)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.fir.kt
index 8d8a92f1776..4e31748b737 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.fir.kt
@@ -28,4 +28,4 @@ fun test6() {}
 fun test7() {}
 
 @Foo(<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>[<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>two<!>]<!>, [], [])
-fun test8() {}
\ No newline at end of file
+fun test8() {}
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.kt b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.kt
index 6edf95ba193..ceef3df9972 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.kt
@@ -9,7 +9,7 @@ fun test1() {}
 @Foo([], [], [])
 fun test2() {}
 
-@Foo([<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1f<!>], <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>[' ']<!>, [<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>])
+@Foo([<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1f<!>], <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>[' ']<!>, [<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>])
 fun test3() {}
 
 @Foo(c = [1f], b = [""], a = [1])
@@ -28,4 +28,4 @@ fun test6() {}
 fun test7() {}
 
 @Foo(<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>[<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>two<!>]<!>, [], [])
-fun test8() {}
\ No newline at end of file
+fun test8() {}
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.fir.kt
index 7257757a18f..9a5435fc1a9 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.fir.kt
@@ -28,4 +28,4 @@ fun test5() {}
 fun test6() {}
 
 @Bar
-fun test7() {}
\ No newline at end of file
+fun test7() {}
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.kt b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.kt
index d6b580b90c3..dd2544879a2 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.kt
@@ -21,11 +21,11 @@ fun test3() {}
 @Foo([<!CLASS_LITERAL_LHS_NOT_A_CLASS!>Gen<Int>::class<!>])
 fun test4() {}
 
-@Foo(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>[""]<!>)
+@Foo(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>[""]<!>)
 fun test5() {}
 
-@Foo(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>[Int::class, 1]<!>)
+@Foo(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>[Int::class, 1]<!>)
 fun test6() {}
 
 @Bar
-fun test7() {}
\ No newline at end of file
+fun test7() {}
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.kt b/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.kt
index 3a7a4ec7c5e..07786079938 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.kt
@@ -3,11 +3,11 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE, -UNSUPPORTED
 
 fun test() {
-    val a = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>[]<!>
+    val a = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>[]<!>
     val b: Array<Int> = []
     val c = [1, 2]
     val d: Array<Int> = [1, 2]
-    val e: Array<String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>[1]<!>
+    val e: Array<String> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>[1]<!>
 
     val f: IntArray = [1, 2]
     val g = [f]
@@ -20,5 +20,5 @@ fun check() {
     val f: IntArray = [1]
     [f] checkType { _<Array<IntArray>>() }
 
-    [1, ""] checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Array<Any>>() }
-}
\ No newline at end of file
+    [1, ""] checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Array<Any>>() }
+}
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt
index 2da19fbbd30..a0006c690cd 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt
@@ -17,7 +17,7 @@ fun test1_0() {}
 @Ann1(*["a", "b"])
 fun test1_1() {}
 
-@Ann1(*<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>["a", 1, <!ANNOTATION_ARGUMENT_MUST_BE_CONST!>null<!>]<!>)
+@Ann1(*<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>["a", 1, <!ANNOTATION_ARGUMENT_MUST_BE_CONST!>null<!>]<!>)
 fun test1_2() {}
 
 @Ann2(*[])
@@ -34,8 +34,8 @@ fun test6() {}
 
 annotation class AnnArray(val a: Array<String>)
 
-@AnnArray(<!OI;NON_VARARG_SPREAD!>*<!>["/"])
+@AnnArray(<!NON_VARARG_SPREAD{OI}!>*<!>["/"])
 fun testArray() {}
 
-@Ann1(<!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>[""]<!>)
-fun testVararg() {}
\ No newline at end of file
+@Ann1(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>[""]<!>)
+fun testVararg() {}
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.fir.kt
index 430fa697b4d..a1bfe7d140d 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.fir.kt
@@ -23,4 +23,4 @@ annotation class Base(
 annotation class Err(
         val a: IntArray = [1L],
         val b: Array<String> = [1]
-)
\ No newline at end of file
+)
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.kt b/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.kt
index 7cac11d1d28..066ee75a200 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.kt
@@ -8,9 +8,9 @@ annotation class Foo(
 )
 
 annotation class Bar(
-        val a: Array<String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>[' ']<!>,
-        val b: Array<String> = <!ANNOTATION_PARAMETER_DEFAULT_VALUE_MUST_BE_CONSTANT, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>["", <!EMPTY_CHARACTER_LITERAL!>''<!>]<!>,
-        val c: Array<String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>[1]<!>
+        val a: Array<String> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>[' ']<!>,
+        val b: Array<String> = <!ANNOTATION_PARAMETER_DEFAULT_VALUE_MUST_BE_CONSTANT, TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>["", <!EMPTY_CHARACTER_LITERAL!>''<!>]<!>,
+        val c: Array<String> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>[1]<!>
 )
 
 annotation class Base(
@@ -22,5 +22,5 @@ annotation class Base(
 
 annotation class Err(
         val a: IntArray = [<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1L<!>],
-        val b: Array<String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>[1]<!>
-)
\ No newline at end of file
+        val b: Array<String> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>[1]<!>
+)
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.fir.kt
index 9683fe6ce68..8d9d3afaa65 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.fir.kt
@@ -13,4 +13,4 @@ fun test(): Array<Int> {
 
 fun foo(a: Array<String> = [""]) {}
 
-class A(val a: Array<Int> = [])
\ No newline at end of file
+class A(val a: Array<Int> = [])
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.kt b/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.kt
index c0540ede71d..c304ad29e5a 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.kt
@@ -6,11 +6,11 @@ fun test(): Array<Int> {
 
     foo(<!UNSUPPORTED!>[""]<!>)
 
-    val <!UNUSED_VARIABLE!>p<!> = <!UNSUPPORTED!>[1, 2]<!> <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>+<!> <!OI;UNSUPPORTED!>[3, 4]<!>
+    val <!UNUSED_VARIABLE!>p<!> = <!UNSUPPORTED!>[1, 2]<!> <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>+<!> <!UNSUPPORTED{OI}!>[3, 4]<!>
 
     return <!UNSUPPORTED!>[1, 2]<!>
 }
 
 fun foo(<!UNUSED_PARAMETER!>a<!>: Array<String> = <!UNSUPPORTED!>[""]<!>) {}
 
-class A(val a: Array<Int> = <!UNSUPPORTED!>[]<!>)
\ No newline at end of file
+class A(val a: Array<Int> = <!UNSUPPORTED!>[]<!>)
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt
index f05e034c6d9..49aaab0a508 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt
@@ -241,7 +241,7 @@ class Outer() {
 }
 
 class ForwardAccessToBackingField() { //kt-147
-    val a = <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;UNINITIALIZED_VARIABLE, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>a<!> // error
+    val a = <!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE{OI}!>a<!> // error
     val b = <!UNINITIALIZED_VARIABLE!>c<!> // error
     val c = 1
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.kt
index 285fee4684d..b0c9a2b188f 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.kt
@@ -12,16 +12,16 @@ else {
 }
 
 val ww = if (true) {
-    <!OI;TYPE_MISMATCH!>{ true }<!> <!USELESS_ELVIS!>?: null!!<!>
+    <!TYPE_MISMATCH{OI}!>{ true }<!> <!USELESS_ELVIS!>?: null!!<!>
 }
 else if (true) {
-    <!OI;TYPE_MISMATCH!>{ true }<!> <!USELESS_ELVIS!>?: null!!<!>
+    <!TYPE_MISMATCH{OI}!>{ true }<!> <!USELESS_ELVIS!>?: null!!<!>
 }
 else {
     null!!
 }
 
-val <!OI;IMPLICIT_NOTHING_PROPERTY_TYPE!>n<!> = null ?: (null ?: <!OI;TYPE_MISMATCH!>{ true }<!>)
+val <!IMPLICIT_NOTHING_PROPERTY_TYPE{OI}!>n<!> = null ?: (null ?: <!TYPE_MISMATCH{OI}!>{ true }<!>)
 
 fun l(): (() -> Boolean)? = null
 
@@ -34,6 +34,6 @@ val bbb = null ?: ( l() <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>)
 val bbbb = ( l() <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>) ?: ( l() <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>)
 
 fun f(x : Long?): Long {
-    var a = x ?: (<!OI;TYPE_MISMATCH!>fun() {}<!> <!USELESS_ELVIS!>?: <!OI;TYPE_MISMATCH!>fun() {}<!><!>)
-    return <!NI;TYPE_MISMATCH, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>
+    var a = x ?: (<!TYPE_MISMATCH{OI}!>fun() {}<!> <!USELESS_ELVIS!>?: <!TYPE_MISMATCH{OI}!>fun() {}<!><!>)
+    return <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, TYPE_MISMATCH{NI}!>a<!>
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/initializationInLambda.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/initializationInLambda.kt
index 82b424397a1..324128fc16e 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/initializationInLambda.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/initializationInLambda.kt
@@ -74,4 +74,4 @@ val z = if (true) {
     }
     42
 }
-else 0
\ No newline at end of file
+else 0
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.fir.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.fir.kt
index 35863e4997f..324a2ca54f3 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.fir.kt
@@ -10,4 +10,4 @@ else if (true) {
 }
 else {
     null!!
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.kt
index b756f2953c5..e1635a535e2 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.kt
@@ -2,12 +2,12 @@
 // AssertionError for nested ifs with lambdas and Nothing as results
 // NI_EXPECTED_FILE
 
-val <!OI;IMPLICIT_NOTHING_PROPERTY_TYPE!>fn<!> = if (true) {
-    <!OI;TYPE_MISMATCH!>{ true }<!>
+val <!IMPLICIT_NOTHING_PROPERTY_TYPE{OI}!>fn<!> = if (true) {
+    <!TYPE_MISMATCH{OI}!>{ true }<!>
 } 
 else if (true) {
-    <!OI;TYPE_MISMATCH!>{ true }<!>
+    <!TYPE_MISMATCH{OI}!>{ true }<!>
 }
 else {
     null!!
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unnecessaryLateinit/lateinitWithErroneousDelegation.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/unnecessaryLateinit/lateinitWithErroneousDelegation.kt
index 36b4329af77..758d32d3b6a 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unnecessaryLateinit/lateinitWithErroneousDelegation.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/unnecessaryLateinit/lateinitWithErroneousDelegation.kt
@@ -8,4 +8,4 @@ class Foo {
     }
 
     constructor(x: String, y: String): <!NONE_APPLICABLE!>this<!>(y.hashCode())
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.kt b/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.kt
index 301875344bf..ee459b76cc7 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.kt
@@ -13,4 +13,4 @@ fun test(c: Coll?) {
   if (c != null) {
     for(x in <!DEBUG_INFO_SMARTCAST!>c<!>) {}
   }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
index 659695922fc..b52322eb1bf 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
@@ -52,4 +52,4 @@ fun bindNoGeneric(r: SimpleOption): SimpleOption {
         if (true) SimpleNone() else r
     }
     else r
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.kt b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.kt
index 50ce5450183..70d7296007c 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.kt
@@ -9,7 +9,7 @@ class None<T> : Option<T>
 fun <T> bind(r: Option<T>): Option<T> {
     return if (r is Some) {
         // Ideally we should infer Option<T> here (see KT-10896)
-        (<!OI;TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT!>if<!> (true) <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>None()<!> else <!OI;DEBUG_INFO_SMARTCAST!>r<!>) checkType { <!OI;TYPE_MISMATCH!>_<!><Option<T>>() }
+        (<!TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT{OI}!>if<!> (true) <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>None()<!> else <!DEBUG_INFO_SMARTCAST{OI}!>r<!>) checkType { <!TYPE_MISMATCH{OI}!>_<!><Option<T>>() }
         // Works correctly
         if (true) None() else r
     }
@@ -25,9 +25,9 @@ fun <T> bind2(r: Option<T>): Option<T> {
 }
 
 fun <T, R> bind3(r: Option<T>): Option<T> {
-    return if (r is Some) <!NI;TYPE_MISMATCH!>{
+    return if (r is Some) <!TYPE_MISMATCH{NI}!>{
         // Diagnoses an error correctly
-        if (true) <!OI;TYPE_MISMATCH!>None<R>()<!> else r
+        if (true) <!TYPE_MISMATCH{OI}!>None<R>()<!> else r
     }<!>
     else r
 }
@@ -52,4 +52,4 @@ fun bindNoGeneric(r: SimpleOption): SimpleOption {
         if (true) SimpleNone() else r
     }
     else r
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.kt b/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.kt
index ddc70e1faf6..81e9c4c25ad 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.kt
@@ -1,9 +1,9 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
-val test1 = { if (true) <!OI;IMPLICIT_CAST_TO_ANY!>1<!> else <!OI;IMPLICIT_CAST_TO_ANY!>""<!> }
+val test1 = { if (true) <!IMPLICIT_CAST_TO_ANY{OI}!>1<!> else <!IMPLICIT_CAST_TO_ANY{OI}!>""<!> }
 
-val test2 = { { if (true) <!OI;IMPLICIT_CAST_TO_ANY!>1<!> else <!OI;IMPLICIT_CAST_TO_ANY!>""<!> } }
+val test2 = { { if (true) <!IMPLICIT_CAST_TO_ANY{OI}!>1<!> else <!IMPLICIT_CAST_TO_ANY{OI}!>""<!> } }
 
 val test3: (Boolean) -> Any = { if (it) 1 else "" }
 
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt
index e51b1f00981..83926c282f8 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt
@@ -59,4 +59,4 @@ val testUsage3 =
         else println()
 
 val testUsage4: Any get() =
-        if (true) 42 else println()
\ No newline at end of file
+        if (true) 42 else println()
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.kt b/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.kt
index 0683a8d26f9..13910df8e7a 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.kt
@@ -17,8 +17,8 @@ fun testResultOfLambda2() =
 
 fun testResultOfAnonFun1() =
         run(fun () =
-                if (true) <!OI;IMPLICIT_CAST_TO_ANY!>42<!>
-                else <!OI;IMPLICIT_CAST_TO_ANY!>println()<!>
+                if (true) <!IMPLICIT_CAST_TO_ANY{OI}!>42<!>
+                else <!IMPLICIT_CAST_TO_ANY{OI}!>println()<!>
         )
 
 fun testResultOfAnonFun2() =
@@ -28,7 +28,7 @@ fun testResultOfAnonFun2() =
 
 fun testReturnFromAnonFun() =
         run(fun () {
-            return <!NI;TYPE_MISMATCH!>if (true) <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!> else println()<!>
+            return <!TYPE_MISMATCH{NI}!>if (true) <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>42<!> else println()<!>
         })
 
 fun <!IMPLICIT_NOTHING_RETURN_TYPE!>testReturn1<!>() =
@@ -59,4 +59,4 @@ val testUsage3 =
         else <!IMPLICIT_CAST_TO_ANY!>println()<!>
 
 val testUsage4: Any get() =
-        if (true) 42 else println()
\ No newline at end of file
+        if (true) 42 else println()
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.kt b/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.kt
index e1919cfa837..74a3a404a95 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.kt
@@ -20,10 +20,10 @@ val xx6 = null ?: <!INVALID_IF_AS_EXPRESSION!>if<!> (true) 42
 val xx7 = "" + <!INVALID_IF_AS_EXPRESSION!>if<!> (true) 42
 
 val wxx1 = <!NO_ELSE_IN_WHEN!>when<!> { true -> 42 }
-val wxx2: Unit = <!NI;TYPE_MISMATCH!><!NO_ELSE_IN_WHEN!>when<!> { true -> <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!> }<!>
+val wxx2: Unit = <!TYPE_MISMATCH{NI}!><!NO_ELSE_IN_WHEN!>when<!> { true -> <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>42<!> }<!>
 val wxx3 = idAny(<!NO_ELSE_IN_WHEN!>when<!> { true -> 42 })
 val wxx4 = id(<!NO_ELSE_IN_WHEN!>when<!> { true -> 42 })
-val wxx5 = idUnit(<!NI;TYPE_MISMATCH!><!NO_ELSE_IN_WHEN!>when<!> { true -> <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!> }<!>)
+val wxx5 = idUnit(<!TYPE_MISMATCH{NI}!><!NO_ELSE_IN_WHEN!>when<!> { true -> <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>42<!> }<!>)
 val wxx6 = null ?: <!NO_ELSE_IN_WHEN!>when<!> { true -> 42 }
 val wxx7 = "" + <!NO_ELSE_IN_WHEN!>when<!> { true -> 42 }
 
@@ -51,8 +51,8 @@ fun g1() = <!NO_ELSE_IN_WHEN!>when<!> { true -> work() }
 fun g2() = <!NO_ELSE_IN_WHEN!>when<!> { true -> mlist.add() }
 fun g3() = <!NO_ELSE_IN_WHEN!>when<!> { true -> 42 }
 fun g4(): Unit = <!NO_ELSE_IN_WHEN!>when<!> { true -> work() }
-fun g5(): Unit = <!NI;TYPE_MISMATCH!><!NO_ELSE_IN_WHEN!>when<!> { true -> <!OI;TYPE_MISMATCH!>mlist.add()<!> }<!>
-fun g6(): Unit = <!NI;TYPE_MISMATCH!><!NO_ELSE_IN_WHEN!>when<!> { true -> <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!> }<!>
+fun g5(): Unit = <!TYPE_MISMATCH{NI}!><!NO_ELSE_IN_WHEN!>when<!> { true -> <!TYPE_MISMATCH{OI}!>mlist.add()<!> }<!>
+fun g6(): Unit = <!TYPE_MISMATCH{NI}!><!NO_ELSE_IN_WHEN!>when<!> { true -> <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>42<!> }<!>
 
 fun foo1(x: String?) {
     "" + <!INVALID_IF_AS_EXPRESSION!>if<!> (true) 42
diff --git a/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt
index 37264a2ff93..c36cb381506 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt
@@ -31,4 +31,4 @@ fun example() {
     }
 
     return if (true) true else {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.kt b/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.kt
index d66646b08e3..8d2405da327 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.kt
@@ -30,5 +30,5 @@ fun example() {
         return <!TYPE_MISMATCH!><!INVALID_IF_AS_EXPRESSION!>if<!> (true) true<!>
     }
 
-    return <!NI;TYPE_MISMATCH!>if (true) <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>true<!> else {}<!>
-}
\ No newline at end of file
+    return <!TYPE_MISMATCH{NI}!>if (true) <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>true<!> else {}<!>
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt10717.kt b/compiler/testData/diagnostics/tests/controlStructures/kt10717.kt
index 9fd3e1f8d1f..b60a60d110b 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt10717.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt10717.kt
@@ -1,21 +1,21 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNREACHABLE_CODE -UNUSED_PARAMETER -RETURN_NOT_ALLOWED
 
 fun <!IMPLICIT_NOTHING_RETURN_TYPE!>test1<!>() = run {
-    return <!TYPE_MISMATCH("String", "Nothing")!>"OK"<!>
+    return <!TYPE_MISMATCH("String; Nothing")!>"OK"<!>
 }
 
 fun <!IMPLICIT_NOTHING_RETURN_TYPE!>test2<!>() = run {
     fun local(): String {
         return ""
     }
-    return <!TYPE_MISMATCH("String", "Nothing")!>""<!>
+    return <!TYPE_MISMATCH("String; Nothing")!>""<!>
 }
 
 inline fun <T, R> Iterable<T>.map(transform: (T) -> R): List<R> = null!!
 fun test3(a: List<String>, b: List<Int>) = a.map {
-    if (it.length == 3) return <!TYPE_MISMATCH("Nothing?", "List<Int>")!>null<!>
-    if (it.length == 4) return <!TYPE_MISMATCH("String", "List<Int>")!>""<!>
-    if (it.length == 4) return <!TYPE_MISMATCH("Int", "List<Int>")!>5<!>
+    if (it.length == 3) return <!TYPE_MISMATCH("Nothing?; List<Int>")!>null<!>
+    if (it.length == 4) return <!TYPE_MISMATCH("String; List<Int>")!>""<!>
+    if (it.length == 4) return <!TYPE_MISMATCH("Int; List<Int>")!>5<!>
     if (it.length == 4) return b
     1
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt1075.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/kt1075.fir.kt
index 6883418762e..467ad06f857 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt1075.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt1075.fir.kt
@@ -9,4 +9,4 @@ fun foo(b: String) {
         <!INAPPLICABLE_CANDIDATE!>in<!> 1..10 -> 1 //no type mismatch, but it should be here
         else -> 2
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt1075.kt b/compiler/testData/diagnostics/tests/controlStructures/kt1075.kt
index 98b5c0b356a..e7adc4b5300 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt1075.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt1075.kt
@@ -5,8 +5,8 @@ package kt1075
 
 fun foo(b: String) {
     if (<!TYPE_MISMATCH!>b<!> in 1..10) {} //type mismatch
-    when (<!NI;TYPE_MISMATCH!>b<!>) {
+    when (<!TYPE_MISMATCH{NI}!>b<!>) {
         <!TYPE_MISMATCH_IN_RANGE!>in<!> 1..10 -> <!UNUSED_EXPRESSION!>1<!> //no type mismatch, but it should be here
         else -> <!UNUSED_EXPRESSION!>2<!>
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt4310.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/kt4310.fir.kt
index 4096d674340..257f5363802 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt4310.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt4310.fir.kt
@@ -9,4 +9,4 @@ fun test(a: Boolean, b: Boolean): Int {
             3
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt4310.kt b/compiler/testData/diagnostics/tests/controlStructures/kt4310.kt
index 90d1e3ba2f7..61d0be8b5de 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt4310.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt4310.kt
@@ -4,9 +4,9 @@ package f
 fun test(a: Boolean, b: Boolean): Int {
     return if(a) {
         1
-    } else <!NI;TYPE_MISMATCH!>{
-        <!OI;TYPE_MISMATCH!><!INVALID_IF_AS_EXPRESSION!>if<!> (b) {
+    } else <!TYPE_MISMATCH{NI}!>{
+        <!TYPE_MISMATCH{OI}!><!INVALID_IF_AS_EXPRESSION!>if<!> (b) {
             3
         }<!>
     }<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.fir.kt
new file mode 100644
index 00000000000..2588f6cc895
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.fir.kt
@@ -0,0 +1,160 @@
+// !WITH_NEW_INFERENCE
+// !DIAGNOSTICS: -UNREACHABLE_CODE
+package kt770_351_735
+
+
+//KT-770 Reference is not resolved to anything, but is not marked unresolved
+fun main() {
+    var i = 0
+    when (i) {
+        1 -> i--
+        2 -> i = 2  // i is surrounded by a black border
+        else -> <!UNRESOLVED_REFERENCE!>j<!> = 2
+    }
+    System.out.println(i)
+}
+
+//KT-351 Distinguish statement and expression positions
+val w = <!EXPRESSION_REQUIRED!>while (true) {}<!>
+
+fun foo() {
+    var z = 2
+    val r = {  // type fun(): Any is inferred
+        if (true) {
+            2
+        }
+        else {
+            z = 34
+        }
+    }
+    val f: ()-> Int = r
+    val g: ()-> Any = r
+}
+
+//KT-735 Statements without braces are prohibited on the right side of when entries.
+fun box() : Int {
+    val d = 2
+    var z = 0
+    when(d) {
+        5, 3 -> z++
+        else -> z = -1000
+    }
+    return z
+}
+
+//More tests
+
+fun test1() { while(true) {} }
+fun test2(): Unit { while(true) {} }
+
+fun testCoercionToUnit() {
+    val simple: ()-> Unit = {
+        41
+    }
+    val withIf: ()-> Unit = {
+        if (true) {
+            3
+        } else {
+            45
+        }
+    }
+    val i = 34
+    val withWhen : () -> Unit = {
+        when(i) {
+            1 -> {
+                val d = 34
+                "1"
+                doSmth(d)
+
+            }
+            2 -> '4'
+            else -> true
+        }
+    }
+
+    var x = 43
+    val checkType = {
+        if (true) {
+            x = 4
+        } else {
+            45
+        }
+    }
+    val f : () -> String = checkType
+}
+
+fun doSmth(i: Int) {}
+
+fun testImplicitCoercion() {
+    val d = 21
+    var z = 0
+    var i = when(d) {
+        3 -> null
+        4 -> { val z = 23 }
+        else -> z = 20
+    }
+
+    var u = when(d) {
+        3 -> { z = 34 }
+        else -> z--
+    }
+
+    var iff = if (true) {
+        z = 34
+    }
+    val g = if (true) 4
+    val h = if (false) 4 else {}
+
+    <!INAPPLICABLE_CANDIDATE!>bar<!>(if (true) {
+        4
+    } else {
+        z = 342
+    })
+}
+
+fun fooWithAnyArg(arg: Any) {}
+fun fooWithAnyNullableArg(arg: Any?) {}
+
+fun testCoercionToAny() {
+    val d = 21
+    val x1: Any = if (1>2) 1 else 2.0
+    val x2: Any? = if (1>2) 1 else 2.0
+    val x3: Any? = if (1>2) 1 else (if (1>2) null else 2.0)
+
+    fooWithAnyArg(if (1>2) 1 else 2.0)
+    fooWithAnyNullableArg(if (1>2) 1 else 2.0)
+    fooWithAnyNullableArg(if (1>2) 1 else (if (1>2) null else 2.0))
+
+    val y1: Any = when(d) { 1 -> 1.0 else -> 2.0 }
+    val y2: Any? = when(d) { 1 -> 1.0 else -> 2.0 }
+    val y3: Any? = when(d) { 1 -> 1.0; 2 -> null; else -> 2.0 }
+
+    fooWithAnyArg(when(d) { 1 -> 1.0 else -> 2.0 })
+    fooWithAnyNullableArg(when(d) { 1 -> 1.0 else -> 2.0 })
+    fooWithAnyNullableArg(when(d) { 1 -> 1.0; 2 -> null; else -> 2.0 })
+}
+
+fun fooWithAnuNullableResult(s: String?, name: String, optional: Boolean): Any? {
+    return if (s == null) {
+        if (!optional) {
+            throw java.lang.IllegalArgumentException("Parameter '$name' was not found in the request")
+        }
+        null
+    } else {
+        name
+    }
+}
+
+fun bar(a: Unit) {}
+
+fun testStatementInExpressionContext() {
+    var z = 34
+    val a1: Unit = <!EXPRESSION_REQUIRED!>z = 334<!>
+    val f = for (i in 1..10) {}
+    if (true) return <!EXPRESSION_REQUIRED!>z = 34<!>
+    return <!EXPRESSION_REQUIRED!>while (true) {}<!>
+}
+
+fun testStatementInExpressionContext2() {
+    val a2: Unit = <!EXPRESSION_REQUIRED!>while(true) {}<!>
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt
index 801f663679e..f1a587fb3e9 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt
@@ -95,9 +95,7 @@ fun testImplicitCoercion() {
     }
 
     var <!UNUSED_VARIABLE!>u<!> = when(d) {
-        3 -> {
-        <!IMPLICIT_CAST_TO_ANY!><!UNUSED_VALUE!>z =<!> 34<!>
-    }
+        3 -> { <!IMPLICIT_CAST_TO_ANY!><!UNUSED_VALUE!>z =<!> 34<!> }
         else -> <!IMPLICIT_CAST_TO_ANY, UNUSED_CHANGED_VALUE!>z--<!>
     }
 
@@ -107,10 +105,9 @@ fun testImplicitCoercion() {
     val <!UNUSED_VARIABLE!>g<!> = <!INVALID_IF_AS_EXPRESSION!>if<!> (true) 4
     val <!UNUSED_VARIABLE!>h<!> = if (false) <!IMPLICIT_CAST_TO_ANY!>4<!> else <!IMPLICIT_CAST_TO_ANY!>{}<!>
 
-    bar(<!NI;TYPE_MISMATCH!>if (true) {
-        <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>4<!>
-    }
-        else {
+    bar(<!TYPE_MISMATCH{NI}!>if (true) {
+        <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>4<!>
+    } else {
         <!UNUSED_VALUE!>z =<!> 342
     }<!>)
 }
@@ -160,4 +157,4 @@ fun testStatementInExpressionContext() {
 
 fun testStatementInExpressionContext2() {
     val <!UNUSED_VARIABLE!>a2<!>: Unit = <!EXPRESSION_EXPECTED!>while(true) {}<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.fir.kt
index f4dc5a89eb4..438b7887dd8 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.fir.kt
@@ -13,4 +13,4 @@ fun test() {
 
     1 ?: { }
     use(1 ?: { })
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt b/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt
index 595266bd73c..f1af079ad20 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt
@@ -8,9 +8,9 @@ fun test() {
     use({ }<!NOT_NULL_ASSERTION_ON_LAMBDA_EXPRESSION!>!!<!>);
 
     // KT-KT-9070
-    <!OI;TYPE_MISMATCH!>{ }<!> <!USELESS_ELVIS!>?: 1<!>
+    <!TYPE_MISMATCH{OI}!>{ }<!> <!USELESS_ELVIS!>?: 1<!>
     use({ 2 } <!USELESS_ELVIS!>?: 1<!>);
 
-    1 <!USELESS_ELVIS!>?: <!OI;TYPE_MISMATCH, UNUSED_LAMBDA_EXPRESSION!>{ }<!><!>
+    1 <!USELESS_ELVIS!>?: <!TYPE_MISMATCH{OI}, UNUSED_LAMBDA_EXPRESSION!>{ }<!><!>
     use(1 <!USELESS_ELVIS!>?: { }<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt b/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt
index 44b9f7eb7a3..40149769d1b 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt
@@ -14,11 +14,11 @@ fun foo() : Int {
 }
 
 fun bar() : Int =
-    try <!NI;TYPE_MISMATCH!>{
-        <!OI;TYPE_MISMATCH!>doSmth()<!>
+    try <!TYPE_MISMATCH{NI}!>{
+        <!TYPE_MISMATCH{OI}!>doSmth()<!>
     }<!>
-    catch (e: Exception) <!NI;TYPE_MISMATCH!>{
-        <!OI;TYPE_MISMATCH!>""<!>
+    catch (e: Exception) <!TYPE_MISMATCH{NI}!>{
+        <!TYPE_MISMATCH{OI}!>""<!>
     }<!>
     finally {
         <!UNUSED_EXPRESSION!>""<!>
diff --git a/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt
index 195ba2a2ef4..f6e4e1acd21 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt
@@ -18,4 +18,4 @@ fun test11() {
     // not 'String!'
     A.foo()!! checkType { _<String>() }
     A.foo()!! checkType { <!INAPPLICABLE_CANDIDATE!>_<!><String?>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.kt b/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.kt
index 61b56f1dee4..eb61e614c46 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.kt
@@ -13,9 +13,9 @@ fun <T: Any> exclExcl(t: T?): T = t!!
 fun test11() {
     // not 'String!'
     exclExcl(A.foo()) checkType { _<String>() }
-    exclExcl(A.foo()) checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String?>() }
+    exclExcl(A.foo()) checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String?>() }
 
     // not 'String!'
     A.foo()!! checkType { _<String>() }
-    A.foo()!! checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String?>() }
-}
\ No newline at end of file
+    A.foo()!! checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String?>() }
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.fir.kt
new file mode 100644
index 00000000000..fc5d5665024
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.fir.kt
@@ -0,0 +1,41 @@
+//KT-234 Force when() expressions to have an 'else' branch
+//KT-973 Unreachable code
+
+package kt234_kt973
+
+class Pair<A, B>(a: A, b: B)
+
+fun test(t : Pair<Int, Int>) : Int {
+    when (t) {
+        Pair(10, 10) -> return 1
+    }
+    return 0 // unreachable code
+}
+
+fun test1(t : Pair<Int, Int>) : Int {
+    when (t) {
+        Pair(10, 10) -> return 1
+        else -> return 2
+    }
+    return 0 // unreachable code
+}
+
+//more tests
+fun t1(x: Int) = when(x) {
+    else -> 1
+}
+
+fun t5(x: Int) = when (x) {
+    is Int -> 1
+    2 -> 2
+}
+
+fun foo3(x: Int) = when(x) {
+    else -> 1
+    2 -> 2
+}
+
+fun foo4(x: Int) = when(x) {
+    2 -> x
+    else -> 3
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.kt b/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.kt
index 3df703a08dd..313dbe03628 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.kt
@@ -38,4 +38,4 @@ fun foo3(x: Int) = when(x) {
 fun foo4(x: Int) = when(x) {
     2 -> x
     else -> 3
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.kt b/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.kt
index aadd5e8df21..cbd87e68ebe 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.kt
@@ -1,9 +1,9 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
-val test1 = { when (true) { true -> <!OI;IMPLICIT_CAST_TO_ANY!>1<!>; else -> <!OI;IMPLICIT_CAST_TO_ANY!>""<!> } }
+val test1 = { when (true) { true -> <!IMPLICIT_CAST_TO_ANY{OI}!>1<!>; else -> <!IMPLICIT_CAST_TO_ANY{OI}!>""<!> } }
 
-val test2 = { { when (true) { true -> <!OI;IMPLICIT_CAST_TO_ANY!>1<!>; else -> <!OI;IMPLICIT_CAST_TO_ANY!>""<!> } } }
+val test2 = { { when (true) { true -> <!IMPLICIT_CAST_TO_ANY{OI}!>1<!>; else -> <!IMPLICIT_CAST_TO_ANY{OI}!>""<!> } } }
 
 val test3: (Boolean) -> Any = { when (true) { true -> 1; else -> "" } }
 
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_before.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_before.kt
index 5848a03a29e..8c903d2ab6b 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_before.kt
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_before.kt
@@ -12,4 +12,4 @@ public class C {
     class Foo : <!DEPRECATED_ACCESS_BY_SHORT_NAME!>Data<!>()
 
     companion <!CYCLIC_SCOPES_WITH_COMPANION!>object<!> : DerivedAbstract()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.kt b/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.kt
index 73f40f6d67d..37949e24699 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.kt
+++ b/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.kt
@@ -9,7 +9,7 @@ fun foo(): Int {
     val d: Data<Int>? = null
     // An error must be here
     val (x, y) = <!COMPONENT_FUNCTION_ON_NULLABLE, COMPONENT_FUNCTION_ON_NULLABLE!>d<!>
-    return <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED!>+<!> <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>y<!>
+    return <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}!>x<!> <!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}!>y<!>
 }
 
 data class NormalData<T>(val x: T, val y: T)
@@ -18,5 +18,5 @@ fun bar(): Int {
     val d: NormalData<Int>? = null
     // An error must be here
     val (x, y) = <!COMPONENT_FUNCTION_ON_NULLABLE, COMPONENT_FUNCTION_ON_NULLABLE!>d<!>
-    return <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>y<!>
+    return <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>y<!>
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/IsExpression.kt b/compiler/testData/diagnostics/tests/dataFlow/IsExpression.kt
index 269dae1d105..2b33b708e80 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/IsExpression.kt
+++ b/compiler/testData/diagnostics/tests/dataFlow/IsExpression.kt
@@ -3,4 +3,4 @@ fun f(<!UNUSED_PARAMETER!>a<!>: Boolean, <!UNUSED_PARAMETER!>b<!>: Int) {}
 fun foo(a: Any) {
     f(a is Int, <!TYPE_MISMATCH!>a<!>)
     1 <!NONE_APPLICABLE!>+<!> a
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.kt b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.kt
index 38b9340f85a..9be2ebf0d6d 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.kt
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.kt
@@ -13,4 +13,4 @@ fun f(a: Any?) {
 interface B {
   fun foo() {}
 }
-open class X(<!UNUSED_PARAMETER!>b<!>: B)
\ No newline at end of file
+open class X(<!UNUSED_PARAMETER!>b<!>: B)
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt
index 48408d23083..2cb8c28f603 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt
@@ -6,6 +6,6 @@ fun foo() {
     val x: Int? = null
 
     bar(1 + (if (x == null) 0 else x))
-    bar(<!NI;TYPE_MISMATCH!>if (x == null) <!DEBUG_INFO_CONSTANT, OI;TYPE_MISMATCH!>x<!> else x<!>)
+    bar(<!TYPE_MISMATCH{NI}!>if (x == null) <!DEBUG_INFO_CONSTANT, TYPE_MISMATCH{OI}!>x<!> else x<!>)
     if (x != null) bar(x + x/(x-x*x))
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.fir.kt
index 049a47d1388..321146b1b63 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.fir.kt
@@ -18,4 +18,4 @@ fun test(mc1: MyClass, mc2: MyClass2) {
     use(a, b, c)
 }
 
-fun use(vararg a: Any?) = a
\ No newline at end of file
+fun use(vararg a: Any?) = a
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt
index 5679433248b..c754b55d98d 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt
@@ -12,10 +12,10 @@ class MyClass2 {}
 
 fun test(mc1: MyClass, mc2: MyClass2) {
     val (<!OPERATOR_MODIFIER_REQUIRED!>a<!>, b) = <!COMPONENT_FUNCTION_MISSING, COMPONENT_FUNCTION_MISSING!>mc1<!>
-    val (c) = <!NI;COMPONENT_FUNCTION_MISSING, OI;COMPONENT_FUNCTION_AMBIGUITY!>mc2<!>
+    val (c) = <!COMPONENT_FUNCTION_AMBIGUITY{OI}, COMPONENT_FUNCTION_MISSING{NI}!>mc2<!>
 
     //a,b,c are error types
     use(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>, <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!>, <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>c<!>)
 }
 
-fun use(vararg a: Any?) = a
\ No newline at end of file
+fun use(vararg a: Any?) = a
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.fir.kt
index 4905cc7020e..3edf127831d 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.fir.kt
@@ -3,10 +3,10 @@
 // KT-3464 Front-end shouldn't allow override modifier in class declaration
 
 override class A {
-    override companion <!REDECLARATION!>object<!> {}
-    open companion <!MANY_COMPANION_OBJECTS, REDECLARATION!>object<!> {}
-    abstract companion <!MANY_COMPANION_OBJECTS, REDECLARATION!>object<!> {}
-    final companion <!MANY_COMPANION_OBJECTS, REDECLARATION!>object<!> {}
+    override companion object {}
+    open companion object {}
+    abstract companion object {}
+    final companion object {}
 }
 
 override object B1 {}
@@ -16,4 +16,4 @@ final object B4 {}
 
 override enum class C {}
 override interface D {}
-override annotation class E
\ No newline at end of file
+override annotation class E
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
index a2f8773eb3c..1dbaf72091f 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.kt
@@ -16,4 +16,4 @@ final object B4 {}
 
 <!WRONG_MODIFIER_TARGET!>override<!> enum class C {}
 <!WRONG_MODIFIER_TARGET!>override<!> interface D {}
-<!WRONG_MODIFIER_TARGET!>override<!> annotation class E
\ No newline at end of file
+<!WRONG_MODIFIER_TARGET!>override<!> annotation class E
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.kt b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.kt
index b151998c589..2e17cc98e51 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.kt
@@ -11,10 +11,10 @@ fun test() {
     <!WRONG_MODIFIER_TARGET!>const<!> val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING!><T><!> a3 = 0
     <!INAPPLICABLE_LATEINIT_MODIFIER, INAPPLICABLE_LATEINIT_MODIFIER, INAPPLICABLE_LATEINIT_MODIFIER!>lateinit<!> val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING!><T><!> a4 = 0
     val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING!><T><!> a5 by Delegate<Int>()
-    val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING!><T><!> a6 by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>Delegate<<!UNRESOLVED_REFERENCE!>T<!>>()<!>
+    val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS_WARNING!><T><!> a6 by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!>Delegate<<!UNRESOLVED_REFERENCE!>T<!>>()<!>
 }
 
 class Delegate<F> {
     operator fun getValue(thisRef: Any?, property: KProperty<*>): String = ""
     operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.kt b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.kt
index 2efda07b425..07574de6669 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.kt
@@ -11,10 +11,10 @@ fun test() {
     <!WRONG_MODIFIER_TARGET!>const<!> val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS!><T><!> a3 = 0
     <!INAPPLICABLE_LATEINIT_MODIFIER, INAPPLICABLE_LATEINIT_MODIFIER, INAPPLICABLE_LATEINIT_MODIFIER!>lateinit<!> val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS!><T><!> a4 = 0
     val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS!><T><!> a5 by Delegate<Int>()
-    val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS!><T><!> a6 by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>Delegate<<!UNRESOLVED_REFERENCE!>T<!>>()<!>
+    val <!LOCAL_VARIABLE_WITH_TYPE_PARAMETERS!><T><!> a6 by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!>Delegate<<!UNRESOLVED_REFERENCE!>T<!>>()<!>
 }
 
 class Delegate<F> {
     operator fun getValue(thisRef: Any?, property: KProperty<*>): String = ""
     operator fun setValue(thisRef: Any?, property: KProperty<*>, value: String) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/mulitpleVarargParameters.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/mulitpleVarargParameters.fir.kt
index f8e2c2e73d7..a51b6884050 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/mulitpleVarargParameters.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/mulitpleVarargParameters.fir.kt
@@ -2,7 +2,7 @@
 fun test(vararg x1: Int, vararg x2: Int) {
     fun test2(vararg x1: Int, vararg x2: Int) {
         class LocalClass(vararg x1: Int, vararg x2: Int) {
-        <!PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED!>constructor(vararg x1: Int, vararg x2: Int, xx: Int)<!> {}
+        constructor(vararg x1: Int, vararg x2: Int, xx: Int) {}
     }
         fun test3(vararg x1: Int, vararg x2: Int) {}
     }
@@ -20,7 +20,7 @@ abstract class C(vararg x1: Int, vararg x2: Int, b: Boolean) {
     abstract fun test2(vararg x1: Int, vararg x2: Int)
 
     class CC(vararg x1: Int, vararg x2: Int, b: Boolean) {
-        <!PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED!>constructor(vararg x1: Int, vararg x2: Int)<!> {}
+        constructor(vararg x1: Int, vararg x2: Int) {}
         fun test(vararg x1: Int, vararg x2: Int) {}
     }
 }
@@ -29,7 +29,7 @@ object O {
     fun test(vararg x1: Int, vararg x2: Int) {}
 
     class CC(vararg x1: Int, vararg x2: Int, b: Boolean) {
-        <!PRIMARY_CONSTRUCTOR_DELEGATION_CALL_EXPECTED!>constructor(vararg x1: Int, vararg x2: Int)<!> {}
+        constructor(vararg x1: Int, vararg x2: Int) {}
         fun test(vararg x1: Int, vararg x2: Int) {}
     }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.kt b/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.kt
index 9c6548e0a8a..baff5fa8bbd 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.kt
@@ -7,8 +7,8 @@ fun test() {
     val x = fun <!ANONYMOUS_FUNCTION_WITH_NAME!>named1<!>(x: Int): Int { return 1 }
     x checkType { _<Function1<Int, Int>>() }
 
-    foo <!NI;TYPE_MISMATCH!>{ <!EXPECTED_TYPE_MISMATCH("() -> Int")!>fun named2(): Int {return 1}<!> }<!>
-    foo(<!NI;TYPE_MISMATCH!>{ <!EXPECTED_TYPE_MISMATCH!>fun named3() = 1<!> }<!>)
+    foo <!TYPE_MISMATCH{NI}!>{ <!EXPECTED_TYPE_MISMATCH("() -> Int")!>fun named2(): Int {return 1}<!> }<!>
+    foo(<!TYPE_MISMATCH{NI}!>{ <!EXPECTED_TYPE_MISMATCH!>fun named3() = 1<!> }<!>)
 
     val x1 =
     <!INVALID_IF_AS_EXPRESSION!>if<!> (1 == 1)
@@ -27,15 +27,15 @@ fun test() {
     <!SYNTAX!><!>fun named7() = 1
 
     val x3 = when (1) {
-        0 -> <!OI;EXPECTED_TYPE_MISMATCH!>fun <!NI;ANONYMOUS_FUNCTION_WITH_NAME!>named8<!>(): Int {return 1}<!>
-        else -> <!OI;EXPECTED_TYPE_MISMATCH!>fun <!NI;ANONYMOUS_FUNCTION_WITH_NAME!>named9<!>() = 1<!>
+        0 -> <!EXPECTED_TYPE_MISMATCH{OI}!>fun <!ANONYMOUS_FUNCTION_WITH_NAME{NI}!>named8<!>(): Int {return 1}<!>
+        else -> <!EXPECTED_TYPE_MISMATCH{OI}!>fun <!ANONYMOUS_FUNCTION_WITH_NAME{NI}!>named9<!>() = 1<!>
     }
 
     val x31 = when (1) {
         0 -> {
-            <!OI;EXPECTED_TYPE_MISMATCH!>fun named10(): Int {return 1}<!>
+            <!EXPECTED_TYPE_MISMATCH{OI}!>fun named10(): Int {return 1}<!>
         }
-        else -> <!OI;EXPECTED_TYPE_MISMATCH!>fun <!NI;ANONYMOUS_FUNCTION_WITH_NAME!>named11<!>() = 1<!>
+        else -> <!EXPECTED_TYPE_MISMATCH{OI}!>fun <!ANONYMOUS_FUNCTION_WITH_NAME{NI}!>named11<!>() = 1<!>
     }
 
     val x4 = {
@@ -65,11 +65,11 @@ fun success() {
 
     val y = when (1) {
         0 -> {
-            <!OI;EXPECTED_TYPE_MISMATCH!>fun named4(): Int {return 1}<!>
+            <!EXPECTED_TYPE_MISMATCH{OI}!>fun named4(): Int {return 1}<!>
         }
         else -> {
-            <!OI;EXPECTED_TYPE_MISMATCH!>fun named5(): Int {return 1}<!>
+            <!EXPECTED_TYPE_MISMATCH{OI}!>fun named5(): Int {return 1}<!>
         }
     }
-    y checkType { <!OI;TYPE_MISMATCH!>_<!><Unit>() }
+    y checkType { <!TYPE_MISMATCH{OI}!>_<!><Unit>() }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.fir.kt
index f26dc514958..b0de7ed12c4 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.fir.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UPPER_BOUND_VIOLATED
 
-//// FILE: D.java
+// FILE: D.java
 public interface D<W> {}
 
 // FILE: Q.java
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.kt b/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.kt
index 42f0721e23d..ae3d83acd23 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UPPER_BOUND_VIOLATED
 
-//// FILE: D.java
+// FILE: D.java
 public interface D<W> {}
 
 // FILE: Q.java
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.fir.kt
index 0e95d892f06..df74bc5ac09 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.fir.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UPPER_BOUND_VIOLATED
 
-//// FILE: D.java
+// FILE: D.java
 public interface D<W> {}
 
 // FILE: Q.java
@@ -13,4 +13,4 @@ public interface C<X> extends D<P<X,X>> {}
 public interface P<Y1, Y2> extends Q<C<Y1>, C<D<Y2>>> {}
 
 // FILE: 1.kt
-interface P1<YY1, YY2> : P<YY1, YY2>
\ No newline at end of file
+interface P1<YY1, YY2> : P<YY1, YY2>
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.kt b/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.kt
index 112724526b5..3fd3aba4f5b 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/nonExpansiveInheritanceRestriction/JavaWithKotlin2.kt
@@ -1,6 +1,6 @@
 // !DIAGNOSTICS: -UPPER_BOUND_VIOLATED
 
-//// FILE: D.java
+// FILE: D.java
 public interface D<W> {}
 
 // FILE: Q.java
@@ -13,4 +13,4 @@ public interface C<X> extends D<P<X,X>> {}
 public interface P<Y1, Y2> extends Q<C<Y1>, C<D<Y2>>> {}
 
 // FILE: 1.kt
-<!EXPANSIVE_INHERITANCE_IN_JAVA!>interface P1<YY1, YY2> : P<YY1, YY2><!>
\ No newline at end of file
+<!EXPANSIVE_INHERITANCE_IN_JAVA!>interface P1<YY1, YY2> : P<YY1, YY2><!>
diff --git a/compiler/testData/diagnostics/tests/defaultArguments/superCall.fir.kt b/compiler/testData/diagnostics/tests/defaultArguments/superCall.fir.kt
index d61a4e53aae..2361d21397f 100644
--- a/compiler/testData/diagnostics/tests/defaultArguments/superCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/defaultArguments/superCall.fir.kt
@@ -18,11 +18,11 @@ open class B : A() {
         super.foo2("123")
         super.foo2()
 
-        super.<!ABSTRACT_SUPER_CALL!>foo3<!>("123")
-        super.<!ABSTRACT_SUPER_CALL!>foo3<!>()
+        super.foo3("123")
+        super.foo3()
     }
 
     override fun foo3(a: String) {
         throw UnsupportedOperationException()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/defaultArguments/superCall.kt b/compiler/testData/diagnostics/tests/defaultArguments/superCall.kt
index d1c64d8efcb..7091ae75d08 100644
--- a/compiler/testData/diagnostics/tests/defaultArguments/superCall.kt
+++ b/compiler/testData/diagnostics/tests/defaultArguments/superCall.kt
@@ -25,4 +25,4 @@ open class B : A() {
     override fun foo3(a: String) {
         throw UnsupportedOperationException()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt
index b6f86b26639..a7b588e8532 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt
@@ -10,10 +10,10 @@ class A(outer: Outer) {
     var g: String by  outer.getContainer().getMyProperty()
 
 
-    var b: String by  <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>foo(<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getMyProperty<!>())<!>
-    var r: String by  <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>foo(outer.getContainer().<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getMyProperty<!>())<!>
-    var e: String by  <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>(<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getMyProperty<!>())
-    var f: String by  <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>(<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getMyProperty<!>()) <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>-<!> 1
+    var b: String by  <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!>foo(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>getMyProperty<!>())<!>
+    var r: String by  <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!>foo(outer.getContainer().<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>getMyProperty<!>())<!>
+    var e: String by  <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>getMyProperty<!>())
+    var f: String by  <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>getMyProperty<!>()) <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>-<!> 1
 }
 
 fun <A, B> foo(<!UNUSED_PARAMETER!>a<!>: Any?) = MyProperty<A, B>()
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt
index 352b8c0ae37..2f324ff3368 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt
@@ -4,10 +4,10 @@ package foo
 import kotlin.reflect.KProperty
 
 open class A {
-    val B.w: Int by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!><!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>MyProperty<!>()<!>
+    val B.w: Int by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!><!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>MyProperty<!>()<!>
 }
 
-val B.r: Int by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!><!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>MyProperty<!>()<!>
+val B.r: Int by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!><!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>MyProperty<!>()<!>
 
 val A.e: Int by MyProperty()
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.kt
index aac12d41280..35f9b9fd1a3 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.kt
@@ -8,7 +8,7 @@ class A<R>() {
     operator fun <T> setValue(t: Any?, p: KProperty<*>, x: T) = Unit
 }
 
-var a1: Int by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!><!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>A<!>()<!>
+var a1: Int by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>A<!>()<!>
 var a2: Int by A<String>()
 
 class B<R>() {
@@ -25,4 +25,4 @@ class C<R>() {
 }
 
 var c1: Int by C()
-var c2: Int by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, OI;DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH!>C<Number>()<!>
+var c2: Int by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}, DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH{OI}!>C<Number>()<!>
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.fir.kt
index 1814104f163..6fc5a1d7f20 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.fir.kt
@@ -23,4 +23,4 @@ package second
 import first.A
 import kotlin.reflect.KProperty
 
-public operator fun <T> A.getValue(thisRef: Any?, property: KProperty<*>): T = null!!
\ No newline at end of file
+public operator fun <T> A.getValue(thisRef: Any?, property: KProperty<*>): T = null!!
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.kt
index 48d970aad18..42617293537 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.kt
@@ -5,7 +5,7 @@ package test
 import first.*
 import second.*
 
-val a12 by <!NI;DELEGATE_SPECIAL_FUNCTION_AMBIGUITY, OI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>A()<!>
+val a12 by <!DELEGATE_SPECIAL_FUNCTION_AMBIGUITY{NI}, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{OI}!>A()<!>
 
 // FILE: first.kt
 package first
@@ -23,4 +23,4 @@ package second
 import first.A
 import kotlin.reflect.KProperty
 
-public operator fun <T> A.getValue(thisRef: Any?, property: KProperty<*>): T = null!!
\ No newline at end of file
+public operator fun <T> A.getValue(thisRef: Any?, property: KProperty<*>): T = null!!
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt
index 5227d682af4..5d01b27f7c9 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt
@@ -4,8 +4,8 @@ package foo
 import kotlin.reflect.KProperty
 
 class A {
-    var a5: String by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!><!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>MyProperty1<!>()<!>
-    var b5: String by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!><!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getMyProperty1<!>()<!>
+    var a5: String by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>MyProperty1<!>()<!>
+    var b5: String by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>getMyProperty1<!>()<!>
 }
 
 fun <A, B> getMyProperty1() = MyProperty1<A, B>()
@@ -24,8 +24,8 @@ class MyProperty1<T, R> {
 // -----------------
 
 class B {
-    var a5: String by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!><!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>MyProperty2<!>()<!>
-    var b5: String by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!><!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getMyProperty2<!>()<!>
+    var a5: String by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>MyProperty2<!>()<!>
+    var b5: String by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>getMyProperty2<!>()<!>
 }
 
 fun <A, B> getMyProperty2() = MyProperty2<A, B>()
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt
index 7e0fb50564f..d45fa55448f 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt
@@ -3,7 +3,7 @@
 import kotlin.reflect.KProperty
 
 class A {
-    var a by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!><!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>MyProperty<!>()<!>
+    var a by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>MyProperty<!>()<!>
 }
 
 class MyProperty<T, R> {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt b/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt
index 71f08682264..e781087d43f 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt
@@ -1,3 +1,3 @@
-val a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING("getValue(Nothing?, KProperty<*>)", "A", "delegate")!>A()<!>
+val a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING("getValue(Nothing?, KProperty<*>); A; delegate")!>A()<!>
 
 class A
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt b/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt
index e47ac927b04..0efa688953e 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt
@@ -2,7 +2,7 @@
 
 import kotlin.reflect.KProperty
 
-var a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING("setValue(Nothing?, KProperty<*>, Int)", "A", "delegate for var (read-write property)")!>A()<!>
+var a: Int by <!DELEGATE_SPECIAL_FUNCTION_MISSING("setValue(Nothing?, KProperty<*>, Int); A; delegate for var (read-write property)")!>A()<!>
 
 class A {
     operator fun getValue(t: Any?, p: KProperty<*>): Int {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt
index 7a2be4ecb26..d52d6595da2 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt
@@ -5,7 +5,7 @@
 import kotlin.reflect.KProperty
 
 class B {
-    val c by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>Delegate(<!UNRESOLVED_REFERENCE!>ag<!>)<!>
+    val c by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!>Delegate(<!UNRESOLVED_REFERENCE!>ag<!>)<!>
 }
 
 class Delegate<T: Any>(val init: T) {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.fir.kt
index 1da5044c59f..d2af39476f1 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.fir.kt
@@ -11,4 +11,4 @@ object CommonCase {
 
     val Long.test1: String by delegate() // common test, not working because of Inference1
     val Long.test2: String by delegate<CommonCase, Long, String>() // should work
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.kt
index 52a71f4abe5..4ef9df38b8a 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.kt
@@ -9,6 +9,6 @@ object CommonCase {
     operator fun <D, E, R> Fas<D, E, R>.provideDelegate(host: D, p: Any?): Fas<D, E, R> = TODO()
     operator fun <D, E, R> Fas<D, E, R>.getValue(receiver: E, p: Any?): R = TODO()
 
-    val Long.test1: String by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!><!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>delegate<!>()<!> // common test, not working because of Inference1
+    val Long.test1: String by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>delegate<!>()<!> // common test, not working because of Inference1
     val Long.test2: String by delegate<CommonCase, Long, String>() // should work
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.fir.kt
index da6ca89dba2..6fb1bd69fdd 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.fir.kt
@@ -11,4 +11,4 @@ object T2 {
 
     val String.test1: String by delegate()
     val test2: String by <!INAPPLICABLE_CANDIDATE!>delegate()<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.kt
index fe84deddff2..644faba331d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.kt
@@ -10,5 +10,5 @@ object T2 {
     operator fun <T> Foo<T>.getValue(receiver: String, p: Any?): T = TODO()
 
     val String.test1: String by delegate()
-    val test2: String by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!><!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>delegate<!>()<!>
-}
\ No newline at end of file
+    val test2: String by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!><!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>delegate<!>()<!>
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.kt
index 052baa62c34..8684d3a2324 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.kt
@@ -9,7 +9,7 @@ object Inference1 {
     operator fun <T> Foo<T>.getValue(receiver: T, p: Any?): String = TODO()
 
     // not working because resulting descriptor for getValue contains type `???` instead of `T`
-    val test1: String by <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>delegate<!>()
+    val test1: String by <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>delegate<!>()
 
     val test2: String by delegate<Inference1>()
 }
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.kt
index f1b9220922f..5fc6f90c5a1 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.kt
@@ -9,6 +9,6 @@ object Inference2 {
     operator fun <T> Foo<T>.provideDelegate(host: T, p: Any?): Foo<T> = TODO()
     operator fun <T> Foo<T>.getValue(receiver: Inference2, p: Any?): String = TODO()
 
-    val test1: String by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!><!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>delegate<!>()<!> // same story like in Inference1
+    val test1: String by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>delegate<!>()<!> // same story like in Inference1
     val test2: String by delegate<Inference2>()
 }
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.kt
index cd106361977..fb1953e5a2d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.kt
@@ -13,6 +13,6 @@ fun String.provideDelegate(a: Any?, p: KProperty<*>) = StringDelegate(this)
 operator fun String.getValue(a: Any?, p: KProperty<*>) = this
 
 val test1: String by "OK"
-val test2: Int by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, OI;DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH!>"OK"<!>
+val test2: Int by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}, DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH{OI}!>"OK"<!>
 val test3 by "OK"
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.fir.kt
index 03d0eae31be..5983c6ad6d7 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.fir.kt
@@ -14,4 +14,4 @@ var test2: String by Delegate<String>()
 var test3: String by "OK"
 
 var test4: String by "OK".provideDelegate(null, "")
-var test5: String by "OK".provideDelegate<String>(null, "")
\ No newline at end of file
+var test5: String by "OK".provideDelegate<String>(null, "")
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.kt
index d2fa2d829b6..414d14999a2 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.kt
@@ -8,10 +8,10 @@ operator fun <T> Delegate<T>.setValue(receiver: Any?, p: Any, value: T) {}
 
 operator fun <T> String.provideDelegate(receiver: Any?, p: Any) = Delegate<T>()
 
-var test1: String by <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Delegate<!>()
+var test1: String by <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>Delegate<!>()
 var test2: String by Delegate<String>()
 
-var test3: String by <!NI;DELEGATE_SPECIAL_FUNCTION_MISSING, NI;DELEGATE_SPECIAL_FUNCTION_MISSING, NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, OI;DELEGATE_SPECIAL_FUNCTION_MISSING, OI;DELEGATE_SPECIAL_FUNCTION_MISSING, OI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE!>"OK"<!>
+var test3: String by <!DELEGATE_SPECIAL_FUNCTION_MISSING{NI}, DELEGATE_SPECIAL_FUNCTION_MISSING{NI}, DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}!>"OK"<!>
 
-var test4: String by "OK".<!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>provideDelegate<!>(null, "")
-var test5: String by "OK".provideDelegate<String>(null, "")
\ No newline at end of file
+var test4: String by "OK".<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>provideDelegate<!>(null, "")
+var test5: String by "OK".provideDelegate<String>(null, "")
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.fir.kt
index cd1410a8fc1..18936afb9d9 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.fir.kt
@@ -12,4 +12,4 @@ operator fun String.getValue(thisRef: Any?, prop: Any) = this
 
 val test1: String by "OK"
 val test2: Int by "OK"
-val test3 by "OK"
\ No newline at end of file
+val test3 by "OK"
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.kt
index 1e2af347ffe..d1eb083a09d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.kt
@@ -11,5 +11,5 @@ class WrongDelegate(val x: Int) {
 operator fun String.getValue(thisRef: Any?, prop: Any) = this
 
 val test1: String by "OK"
-val test2: Int by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, OI;DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH!>"OK"<!>
-val test3 by "OK"
\ No newline at end of file
+val test2: Int by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}, DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH{OI}!>"OK"<!>
+val test3 by "OK"
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
index 476124fd689..d74411e9801 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
@@ -4,12 +4,12 @@
 
 import kotlin.reflect.KProperty
 
-val a by <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OI;TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>a<!>
+val a by <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM{OI}!>a<!>
 
-val b by Delegate(<!NI;DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>b<!>)
+val b by Delegate(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>b<!>)
 
 val c by <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, UNINITIALIZED_VARIABLE!>d<!>
-val d by <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OI;TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>c<!>
+val d by <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM{OI}!>c<!>
 
 class Delegate(i: Int) {
   operator fun getValue(t: Any?, p: KProperty<*>): Int {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt
index d86d06065ff..71d1c3892b4 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt
@@ -3,7 +3,7 @@
 
 import kotlin.reflect.KProperty
 
-val c: Int by <!NI;DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE, OI;DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH!>Delegate()<!>
+val c: Int by <!DELEGATE_SPECIAL_FUNCTION_NONE_APPLICABLE{NI}, DELEGATE_SPECIAL_FUNCTION_RETURN_TYPE_MISMATCH{OI}!>Delegate()<!>
 
 class Delegate {
   operator fun getValue(t: Any?, p: KProperty<*>): String {
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.fir.kt b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.fir.kt
index 3a14bea8dbe..54e8098621f 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.fir.kt
@@ -23,4 +23,4 @@ fun <T> boo(t: T): A<T> = AImpl()
 
 class E : A<Int> by boo("")
 
-class F : A<Int> by AImpl<String>()
\ No newline at end of file
+class F : A<Int> by AImpl<String>()
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt
index 6b1fb85839c..f077deba150 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt
@@ -21,6 +21,6 @@ class D : A<Int> by baz({ it + 1 })
 
 fun <T> boo(t: T): A<T> = AImpl()
 
-class E : A<Int> by <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>boo("")<!>
+class E : A<Int> by <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>boo("")<!>
 
-class F : A<Int> by <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>AImpl<String>()<!>
\ No newline at end of file
+class F : A<Int> by <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>AImpl<String>()<!>
diff --git a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt
index 20ed233ab7c..e27eeeae382 100644
--- a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt
+++ b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt
@@ -16,7 +16,7 @@ fun test(i: Int?) {
     val a: Int = <!REDUNDANT_LABEL_WARNING!>l4@<!> <!TYPE_MISMATCH!>""<!>
     val b: Int = (<!TYPE_MISMATCH!>""<!>)
     val c: Int = checkSubtype<Int>(<!TYPE_MISMATCH!>""<!>)
-    val d: Int = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>checkSubtype<Long>(<!TYPE_MISMATCH!>""<!>)<!>
+    val d: Int = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>checkSubtype<Long>(<!TYPE_MISMATCH!>""<!>)<!>
 
 
     foo(<!REDUNDANT_LABEL_WARNING!>l4@<!> <!TYPE_MISMATCH!>""<!>)
diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinDeclaration.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinDeclaration.kt
index bf687e49b2a..6a70d00b41b 100644
--- a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinDeclaration.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/deprecatedSinceKotlinDeclaration.kt
@@ -41,4 +41,4 @@ fun fooDefault() {}
 
 @Deprecated("")
 @DeprecatedSinceKotlin("1.1", "1.1", "1.1")
-fun fooEqual() {}
\ No newline at end of file
+fun fooEqual() {}
diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.fir.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.fir.kt
index c7c4185d33f..3caf335a2aa 100644
--- a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.fir.kt
@@ -6,4 +6,4 @@ fun foo() {}
 
 fun test() {
     foo()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.kt b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.kt
index 50900ce316a..c786d91af9d 100644
--- a/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.kt
+++ b/compiler/testData/diagnostics/tests/deprecated/deprecatedSinceKotlin/messageFromDeprecatedAnnotation.kt
@@ -5,5 +5,5 @@ package kotlin
 fun foo() {}
 
 fun test() {
-    <!DEPRECATION("foo(): Unit", "foo test")!>foo<!>()
-}
\ No newline at end of file
+    <!DEPRECATION("foo(): Unit; foo test")!>foo<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.kt b/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.kt
index f2ff95977a5..0cf6063c8de 100644
--- a/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.kt
+++ b/compiler/testData/diagnostics/tests/dynamicTypes/withInvisibleSynthesized.kt
@@ -32,4 +32,4 @@ class K: J.C() {
         <!INVISIBLE_MEMBER!>sam<!>(null)
     }
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt
index 17a55c71aec..7e54fe89e29 100644
--- a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt
+++ b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt
@@ -2,6 +2,6 @@
 enum class E : Cloneable {
     A;
     <!OVERRIDING_FINAL_MEMBER!>override<!> fun clone(): Any {
-        return <!AMBIGUOUS_SUPER!>super<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>clone<!>()
+        return <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>clone<!>()
     }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.kt b/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.kt
index bcdc62dcf12..9a9aa2db970 100644
--- a/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.kt
+++ b/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.kt
@@ -27,4 +27,4 @@ fun test() {
     fooShort(<!TYPE_MISMATCH!>1 - 1.toByte()<!>)
     fooShort(<!TYPE_MISMATCH!>1 - 1.toLong()<!>)
     fooShort(<!TYPE_MISMATCH!>1 - 1.toShort()<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.fir.kt b/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.fir.kt
index e01ed0a6cd6..7620688ffe8 100644
--- a/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.fir.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +InlineClasses
-// JAVAC_SKIP
+// SKIP_JAVAC
 
 // FILE: uint.kt
 
@@ -41,4 +41,4 @@ const val explicit: <!UNRESOLVED_REFERENCE!>UInt<!> = <!UNRESOLVED_REFERENCE!>UI
 
 const val nullable: <!UNRESOLVED_REFERENCE!>UInt?<!> = <!UNRESOLVED_REFERENCE!>UInt<!>(3)
 
-annotation class NullableAnno(val u: <!UNRESOLVED_REFERENCE!>UInt?<!>)
\ No newline at end of file
+annotation class NullableAnno(val u: <!UNRESOLVED_REFERENCE!>UInt?<!>)
diff --git a/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.kt b/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.kt
index 58aced46d5b..125438f99e8 100644
--- a/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.kt
+++ b/compiler/testData/diagnostics/tests/evaluate/inlineClasses/constructorOfUnsignedType.kt
@@ -1,5 +1,5 @@
 // !LANGUAGE: +InlineClasses
-// JAVAC_SKIP
+// SKIP_JAVAC
 
 // FILE: uint.kt
 
@@ -41,4 +41,4 @@ const val explicit: UInt = UInt(2)
 
 <!TYPE_CANT_BE_USED_FOR_CONST_VAL!>const<!> val nullable: UInt? = UInt(3)
 
-annotation class NullableAnno(val u: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>UInt?<!>)
\ No newline at end of file
+annotation class NullableAnno(val u: <!NULLABLE_TYPE_OF_ANNOTATION_MEMBER!>UInt?<!>)
diff --git a/compiler/testData/diagnostics/tests/evaluate/logicWithNumber.kt b/compiler/testData/diagnostics/tests/evaluate/logicWithNumber.kt
index 0ca70e913b1..6042fe96bd7 100644
--- a/compiler/testData/diagnostics/tests/evaluate/logicWithNumber.kt
+++ b/compiler/testData/diagnostics/tests/evaluate/logicWithNumber.kt
@@ -5,4 +5,4 @@ fun bar() {
 // See exception in KT-13421
 fun foo() {
     42 and <!CONSTANT_EXPECTED_TYPE_MISMATCH!>false<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.kt b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.kt
index 8c42ae04c06..28abfb82456 100644
--- a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.kt
+++ b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.kt
@@ -23,4 +23,4 @@ fun test() {
     fooByte(1 <!INFIX_MODIFIER_REQUIRED!>rem<!> 1)
     fooLong(1 <!INFIX_MODIFIER_REQUIRED!>rem<!> 1)
     fooShort(1 <!INFIX_MODIFIER_REQUIRED!>rem<!> 1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.kt b/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.kt
index 40a393d0021..aca2edfe15c 100644
--- a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.kt
+++ b/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.kt
@@ -38,4 +38,4 @@ fun test() {
     fooByte(<!TYPE_MISMATCH!>p4<!>)
     fooByte(<!TYPE_MISMATCH!>p5<!>)
     fooByte(<!TYPE_MISMATCH!>p6<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt
index efd4ec1e4d1..44614eb1728 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// FILE: b.kt
+// FILE: a.kt
 package outer
 
 fun Int?.optint() : Unit {}
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt
index ee0741ebe16..a50ae0c9328 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// FILE: b.kt
+// FILE: a.kt
 package outer
 
 fun Int?.optint() : Unit {}
@@ -20,7 +20,7 @@ class A
 infix operator fun A.plus(<!UNUSED_PARAMETER!>a<!> : Any) {
 
   1.foo()
-  true.<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>(<!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>)<!>
+  true.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>(<!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>)<!>
 
   <!UNUSED_EXPRESSION!>1<!>
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/kt1875.kt b/compiler/testData/diagnostics/tests/extensions/kt1875.kt
index 107e9706daf..f626f080da3 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt1875.kt
+++ b/compiler/testData/diagnostics/tests/extensions/kt1875.kt
@@ -18,4 +18,4 @@ fun test1(t: T?) {
     t?.<!UNSAFE_IMPLICIT_INVOKE_CALL!>f<!>(1)
     t<!UNSAFE_CALL!>.<!>f?.invoke(1)
     t?.f?.invoke(1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.fir.kt b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.fir.kt
index 101fc69277d..fa574807616 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.fir.kt
@@ -53,4 +53,4 @@ fun test7(l: List<String?>) {
 
 fun test8(l: List<Any>?) {
     l.<!INAPPLICABLE_CANDIDATE!>b<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt
index d8b20080c1d..89da8c15289 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt
@@ -35,22 +35,22 @@ fun test4() {
 // should be an error on receiver, shouldn't be thrown away
 
 fun test5() {
-    <!OI;TYPE_MISMATCH!>1<!>.<!NI;FUNCTION_EXPECTED!>(fun String.()=1)<!>()
+    <!TYPE_MISMATCH{OI}!>1<!>.<!FUNCTION_EXPECTED{NI}!>(fun String.()=1)<!>()
 }
 
 fun <R: Any> R?.sure() : R = this!!
 
 fun <T> test6(l: List<T>?) {
-    <!OI;TYPE_MISMATCH!>l<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>sure<!><<!OI;UPPER_BOUND_VIOLATED!>T<!>>()
+    <!TYPE_MISMATCH{OI}!>l<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>sure<!><<!UPPER_BOUND_VIOLATED{OI}!>T<!>>()
 }
 
 
 fun List<String>.b() {}
 
 fun test7(l: List<String?>) {
-    <!OI;TYPE_MISMATCH!>l<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>b<!>()
+    <!TYPE_MISMATCH{OI}!>l<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>b<!>()
 }
 
 fun test8(l: List<Any>?) {
-    <!OI;TYPE_MISMATCH!>l<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>b<!>()
-}
\ No newline at end of file
+    <!TYPE_MISMATCH{OI}!>l<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>b<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/funInterface/funInterfaceDeclarationCheck.kt b/compiler/testData/diagnostics/tests/funInterface/funInterfaceDeclarationCheck.kt
index 7df2da4d4a0..bda27bd3ca9 100644
--- a/compiler/testData/diagnostics/tests/funInterface/funInterfaceDeclarationCheck.kt
+++ b/compiler/testData/diagnostics/tests/funInterface/funInterfaceDeclarationCheck.kt
@@ -101,3 +101,4 @@ interface BaseWithDefaultValue {
 }
 
 <!FUN_INTERFACE_ABSTRACT_METHOD_WITH_DEFAULT_VALUE!>fun<!> interface DeriveDefault : BaseWithDefaultValue
+
diff --git a/compiler/testData/diagnostics/tests/funInterface/noCompatibilityResolveForFunInterfaces.kt b/compiler/testData/diagnostics/tests/funInterface/noCompatibilityResolveForFunInterfaces.kt
index 97a44d5746c..630092b5763 100644
--- a/compiler/testData/diagnostics/tests/funInterface/noCompatibilityResolveForFunInterfaces.kt
+++ b/compiler/testData/diagnostics/tests/funInterface/noCompatibilityResolveForFunInterfaces.kt
@@ -62,4 +62,4 @@ object Test5 {
             <!DEBUG_INFO_CALL("fqName: Test5.Scope.foo; typeCall: function")!>foo { }<!>
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.fir.kt b/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.fir.kt
index 8a6a7e6d36b..d5cd7b305ed 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.fir.kt
@@ -17,4 +17,4 @@ fun test2(a: () -> List<Int>) {
 
 val a: (Int) -> Unit = fun(x) { checkSubtype<Int>(x) }
 
-val b: (Int) -> Unit = fun(x: String) {}
\ No newline at end of file
+val b: (Int) -> Unit = fun(x: String) {}
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.kt b/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.kt
index 0fce1feccb1..f8cbaed0d9e 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.kt
@@ -12,9 +12,9 @@ fun test(a: (Int) -> Int) {
 }
 
 fun test2(a: () -> List<Int>) {
-    test2(fun () = <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>listOf<!>())
+    test2(fun () = <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>listOf<!>())
 }
 
 val a: (Int) -> Unit = fun(x) { checkSubtype<Int>(x) }
 
-val b: (Int) -> Unit = <!TYPE_MISMATCH!>fun(<!EXPECTED_PARAMETER_TYPE_MISMATCH!>x: String<!>) {}<!>
\ No newline at end of file
+val b: (Int) -> Unit = <!TYPE_MISMATCH!>fun(<!EXPECTED_PARAMETER_TYPE_MISMATCH!>x: String<!>) {}<!>
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.fir.kt b/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.fir.kt
index 1ce99177991..46d054100dc 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.fir.kt
@@ -24,4 +24,4 @@ fun test2(a: (Int) -> Unit) {
 
 fun test3(a: (Int, String) -> Unit) {
     <!INAPPLICABLE_CANDIDATE!>test3<!>(fun (x: String) {})
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.kt b/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.kt
index 2a4e5fbf600..5b37017cfc2 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.kt
@@ -19,9 +19,9 @@ fun test1(a: (Int) -> Unit) {
 }
 
 fun test2(a: (Int) -> Unit) {
-    test2(<!NI;TYPE_MISMATCH, TYPE_MISMATCH!>fun (<!EXPECTED_PARAMETER_TYPE_MISMATCH!>x: String<!>) {}<!>)
+    test2(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>fun (<!EXPECTED_PARAMETER_TYPE_MISMATCH!>x: String<!>) {}<!>)
 }
 
 fun test3(a: (Int, String) -> Unit) {
-    test3(<!NI;TYPE_MISMATCH, TYPE_MISMATCH!>fun <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>(<!EXPECTED_PARAMETER_TYPE_MISMATCH!>x: String<!>)<!> {}<!>)
-}
\ No newline at end of file
+    test3(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>fun <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>(<!EXPECTED_PARAMETER_TYPE_MISMATCH!>x: String<!>)<!> {}<!>)
+}
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.fir.kt b/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.fir.kt
index bcfd7229a3b..a4249156f1e 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.fir.kt
@@ -1,3 +1,3 @@
 // !WITH_NEW_INFERENCE
 fun foo(f: String.() -> Int) {}
-val test = foo(fun () = <!UNRESOLVED_REFERENCE!>length<!>)
\ No newline at end of file
+val test = foo(fun () = <!UNRESOLVED_REFERENCE!>length<!>)
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.kt b/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.kt
index f517152c8f1..d5123b957fa 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.kt
@@ -1,3 +1,3 @@
 // !WITH_NEW_INFERENCE
 fun foo(<!UNUSED_PARAMETER!>f<!>: String.() -> Int) {}
-val test = foo(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>fun <!NI;EXPECTED_PARAMETERS_NUMBER_MISMATCH!>()<!> = <!UNRESOLVED_REFERENCE!>length<!><!>)
\ No newline at end of file
+val test = foo(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>fun <!EXPECTED_PARAMETERS_NUMBER_MISMATCH{NI}!>()<!> = <!UNRESOLVED_REFERENCE!>length<!><!>)
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.fir.kt b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.fir.kt
index 78ce746b50e..d6e72349531 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.fir.kt
@@ -16,4 +16,4 @@ fun outer() {
     devNull(fun <T> (): T = null!!)
     devNull(fun <T> (t: T) {})
     devNull(fun <T> () where T:A {})
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt
index 16c1fafa81c..b0ba25b3c96 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt
@@ -12,8 +12,8 @@ fun fun_with_where() = fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> T.(t: T): T whe
 
 fun outer() {
     devNull(fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!>() {})
-    devNull(fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> <!NI;UNRESOLVED_REFERENCE!>T<!>.() {})
-    devNull(fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> (): <!NI;UNRESOLVED_REFERENCE!>T<!> = null!!)
-    devNull(fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> (t: <!NI;UNRESOLVED_REFERENCE!>T<!>) {})
+    devNull(fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> <!UNRESOLVED_REFERENCE{NI}!>T<!>.() {})
+    devNull(fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> (): <!UNRESOLVED_REFERENCE{NI}!>T<!> = null!!)
+    devNull(fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> (t: <!UNRESOLVED_REFERENCE{NI}!>T<!>) {})
     devNull(fun <!TYPE_PARAMETERS_NOT_ALLOWED!><T><!> () where T:A {})
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt
index 2bf2645eee8..89294444aab 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt
@@ -16,6 +16,6 @@ fun test(s: Sub) {
         t: Trait -> s
     }
 
-    foo(<!NI;TYPE_MISMATCH, TYPE_MISMATCH!>fun(<!EXPECTED_PARAMETER_TYPE_MISMATCH!>t: Sub<!>) = s<!>)
+    foo(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>fun(<!EXPECTED_PARAMETER_TYPE_MISMATCH!>t: Sub<!>) = s<!>)
     foo(<!TYPE_MISMATCH!>fun(t): Super = s<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt
index cc3dc836f84..1d277074ce7 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt
@@ -9,37 +9,37 @@ fun test1() {
     foo0 {
         ""
     }
-    foo0 <!NI;TYPE_MISMATCH!>{
+    foo0 <!TYPE_MISMATCH{NI}!>{
         <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!><!UNUSED_ANONYMOUS_PARAMETER!>s<!>: String<!>-> ""
     }<!>
-    foo0 <!NI;TYPE_MISMATCH!>{
+    foo0 <!TYPE_MISMATCH{NI}!>{
         <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!><!CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER!>x<!>, <!CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER!>y<!><!> -> ""
     }<!>
 
     foo1 {
         ""
     }
-    foo1 <!NI;TYPE_MISMATCH!>{
+    foo1 <!TYPE_MISMATCH{NI}!>{
         <!EXPECTED_PARAMETER_TYPE_MISMATCH!><!UNUSED_ANONYMOUS_PARAMETER!>s<!>: String<!> -> ""
     }<!>
-    foo1 <!NI;TYPE_MISMATCH!>{
+    foo1 <!TYPE_MISMATCH{NI}!>{
         <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!><!UNUSED_ANONYMOUS_PARAMETER!>x<!>, <!CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER!>y<!><!> -> ""
     }<!>
-    foo1 <!NI;TYPE_MISMATCH!>{
-        <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!><!>-> <!CONSTANT_EXPECTED_TYPE_MISMATCH, NI;CONSTANT_EXPECTED_TYPE_MISMATCH, NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!>
+    foo1 <!TYPE_MISMATCH{NI}!>{
+        <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!><!>-> <!CONSTANT_EXPECTED_TYPE_MISMATCH, CONSTANT_EXPECTED_TYPE_MISMATCH{NI}, CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>42<!>
     }<!>
 
 
     foo2 <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>{<!>
         ""
     }
-    foo2 <!NI;TYPE_MISMATCH!>{
+    foo2 <!TYPE_MISMATCH{NI}!>{
         <!EXPECTED_PARAMETERS_NUMBER_MISMATCH, EXPECTED_PARAMETER_TYPE_MISMATCH!><!UNUSED_ANONYMOUS_PARAMETER!>s<!>: String<!> -> ""
     }<!>
-    foo2 <!NI;TYPE_MISMATCH!>{
+    foo2 <!TYPE_MISMATCH{NI}!>{
         <!EXPECTED_PARAMETERS_NUMBER_MISMATCH, UNUSED_ANONYMOUS_PARAMETER!>x<!> -> ""
     }<!>
-    foo2 <!NI;TYPE_MISMATCH!>{
-         <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!><!>-> <!CONSTANT_EXPECTED_TYPE_MISMATCH, NI;CONSTANT_EXPECTED_TYPE_MISMATCH, NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!>
+    foo2 <!TYPE_MISMATCH{NI}!>{
+         <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!><!>-> <!CONSTANT_EXPECTED_TYPE_MISMATCH, CONSTANT_EXPECTED_TYPE_MISMATCH{NI}, CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>42<!>
     }<!>
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt b/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt
index 4309c625107..2d2440d2ffa 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt
@@ -10,7 +10,7 @@ fun <T> foo(<!UNUSED_PARAMETER!>a<!>: A, f: () -> T): T = f()
 fun <T> foo(<!UNUSED_PARAMETER!>b<!>: B, f: () -> T): T = f()
 
 fun test(c: C) {
-    <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>foo<!>(c) f@ {
+    <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!>(c) f@ {
         c<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.kt b/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.kt
index 25f8f6c12fa..b1fb7adeecf 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.kt
@@ -12,5 +12,5 @@ fun test(bal: Array<Int>) {
 
     val <!UNUSED_VARIABLE!>e<!>: Unit = run { bar += 4 }
 
-    val <!UNUSED_VARIABLE!>f<!>: Int = <!NI;TYPE_MISMATCH!>run { <!NI;TYPE_MISMATCH, OI;ASSIGNMENT_TYPE_MISMATCH!>bar += 4<!> }<!>
+    val <!UNUSED_VARIABLE!>f<!>: Int = <!TYPE_MISMATCH{NI}!>run { <!ASSIGNMENT_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>bar += 4<!> }<!>
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.kt
index 80f29ecddf8..c0c10550f24 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.kt
@@ -30,10 +30,10 @@ fun bar(aInstance: A, bInstance: B) {
         d checkType { _<Short>() }
     }
 
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>(bInstance) {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>(bInstance) {
         <!CANNOT_INFER_PARAMETER_TYPE!>(a, b)<!>, (c, d) ->
-        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
         c checkType { _<Double>() }
         d checkType { _<Short>() }
     }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.kt
index 0a571abc9d0..e37741fc27a 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.kt
@@ -27,8 +27,8 @@ fun bar(aList: List<A>) {
         b checkType { _<String>() }
     }
 
-    aList.<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>foo<!> { <!NI;EXPECTED_PARAMETER_TYPE_MISMATCH!>(a, b): B<!> ->
-        b checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><Int>() }
-        a checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String>() }
+    aList.<!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>foo<!> { <!EXPECTED_PARAMETER_TYPE_MISMATCH{NI}!>(a, b): B<!> ->
+        b checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Int>() }
+        a checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String>() }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt
index f4b19e76869..7e9b68f8dc5 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt
@@ -26,7 +26,7 @@ fun bar() {
     y2 checkType { _<(A) -> Unit>() }
 
     val z = { <!CANNOT_INFER_PARAMETER_TYPE!>(a: Int, b: String)<!> ->
-        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><String>() }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.kt
index 3c6b2355a3b..b6936a6d809 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.kt
@@ -8,23 +8,23 @@ fun foo(block: (A, B) -> Unit) { }
 
 fun bar() {
     foo { (<!REDECLARATION, UNUSED_DESTRUCTURED_PARAMETER_ENTRY!>a<!>, <!REDECLARATION!>a<!>), b ->
-        a checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><Int>() }
-        b checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String>() }
+        a checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Int>() }
+        b checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String>() }
     }
 
     foo { (<!REDECLARATION, UNUSED_DESTRUCTURED_PARAMETER_ENTRY!>a<!>, b), <!REDECLARATION!>a<!> ->
-        a checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><Int>() }
+        a checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Int>() }
         b checkType { _<String>() }
     }
 
     foo { <!REDECLARATION!>a<!>, (<!REDECLARATION!>a<!>, b) ->
-        a checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><Int>() }
-        b checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String>() }
+        a checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Int>() }
+        b checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String>() }
     }
 
     foo { (a, <!REDECLARATION, UNUSED_DESTRUCTURED_PARAMETER_ENTRY!>b<!>), (c, <!REDECLARATION!>b<!>) ->
         a checkType { _<Int>() }
-        b checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String>() }
-        c checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><B>() }
+        b checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String>() }
+        c checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><B>() }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.kt
index 5ef660246c2..11e4b0ed95c 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.kt
@@ -47,7 +47,7 @@ fun bar() {
         b checkType { _<String>() }
     }
 
-    foo <!NI;TYPE_MISMATCH!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>(a, b): B<!> ->
+    foo <!TYPE_MISMATCH{NI}!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>(a, b): B<!> ->
         a checkType { _<Double>() }
         b checkType { _<Short>() }
     }<!>
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.kt
index 8178d868850..a786272443d 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.kt
@@ -8,35 +8,35 @@ fun foo(block: (A) -> Unit) { }
 
 fun bar() {
     foo { (_, b) ->
-        <!UNRESOLVED_REFERENCE!>_<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>hashCode<!>()
+        <!UNRESOLVED_REFERENCE!>_<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>hashCode<!>()
         b checkType { _<String>() }
     }
 
     foo { (a, _) ->
         a checkType { _<Int>() }
-        <!UNRESOLVED_REFERENCE!>_<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>hashCode<!>()
+        <!UNRESOLVED_REFERENCE!>_<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>hashCode<!>()
     }
 
     foo { (_, _) ->
-        <!UNRESOLVED_REFERENCE!>_<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>hashCode<!>()
+        <!UNRESOLVED_REFERENCE!>_<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>hashCode<!>()
     }
 
     foo { (_: Int, b: String) ->
-        <!UNRESOLVED_REFERENCE!>_<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>hashCode<!>()
+        <!UNRESOLVED_REFERENCE!>_<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>hashCode<!>()
         b checkType { _<String>() }
     }
 
     foo { (a: Int, _: String) ->
         a checkType { _<Int>() }
-        <!UNRESOLVED_REFERENCE!>_<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>hashCode<!>()
+        <!UNRESOLVED_REFERENCE!>_<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>hashCode<!>()
     }
 
     foo { (_: Int, _: String) ->
-        <!UNRESOLVED_REFERENCE!>_<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>hashCode<!>()
+        <!UNRESOLVED_REFERENCE!>_<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>hashCode<!>()
     }
 
     foo { (_, _): A ->
-        <!UNRESOLVED_REFERENCE!>_<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>hashCode<!>()
+        <!UNRESOLVED_REFERENCE!>_<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>hashCode<!>()
     }
 
     foo { (`_`, _) ->
@@ -52,12 +52,12 @@ fun bar() {
     }
 
     foo { (<!COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH!>_: String<!>, b) ->
-        <!UNRESOLVED_REFERENCE!>_<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>hashCode<!>()
+        <!UNRESOLVED_REFERENCE!>_<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>hashCode<!>()
         b checkType { _<String>() }
     }
 
-    foo <!NI;TYPE_MISMATCH!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>(_, b): B<!> ->
-        <!UNRESOLVED_REFERENCE!>_<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>hashCode<!>()
+    foo <!TYPE_MISMATCH{NI}!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>(_, b): B<!> ->
+        <!UNRESOLVED_REFERENCE!>_<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>hashCode<!>()
         b checkType { _<Short>() }
     }<!>
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.kt b/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.kt
index de7b36e9e14..0b06daa66a4 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.kt
@@ -3,5 +3,5 @@
 
 fun foo() {
     val f : Function1<*, *> = { x -> x.toString() }
-    <!OI;MEMBER_PROJECTED_OUT!>f<!>(<!NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
+    <!MEMBER_PROJECTED_OUT{OI}!>f<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>1<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt
index ea7ca3be1ac..dd114afd6b4 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt
@@ -1,10 +1,10 @@
 // !WITH_NEW_INFERENCE
 fun test(a: Int) {
     run<Int>f@{
-      if (a > 0) return@f <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>""<!>
+      if (a > 0) return@f <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>""<!>
       return@f 1
     }
 
-    run<Int>{ <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>""<!> }
+    run<Int>{ <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>""<!> }
     run<Int>{ 1 }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.fir.kt
index 22e46bb749e..350f0877d5d 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.fir.kt
@@ -16,4 +16,4 @@ fun commonSystemFailed(a: List<Int>) {
         if (it == 0) listOf()
         else listOf(it)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.kt
index 633740ece71..a415838ef30 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.kt
@@ -6,14 +6,14 @@ fun <T> listOf(vararg <!UNUSED_PARAMETER!>values<!>: T): List<T> = null!!
 fun commonSystemFailed(a: List<Int>) {
     a.map {
         if (it == 0) return@map listOf(it)
-        <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>listOf<!>()
+        <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>listOf<!>()
     }
     a.map {
-        if (it == 0) return@map <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>listOf<!>()
+        if (it == 0) return@map <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>listOf<!>()
         listOf(it)
     }
     a.map {
         if (it == 0) listOf()
         else listOf(it)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.fir.kt
index a9649e4b4db..428aa4895de 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.fir.kt
@@ -16,4 +16,4 @@ val b /*: Int? */ = let { // but must be Int
 
 val c /*: Int*/ = let {
     if (it != null) it else 5
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.kt
index 40da50eef87..3b988552a87 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.kt
@@ -10,10 +10,10 @@ val a /* :(Int?) -> Int? */ = l@ { it: Int? -> // but must be (Int?) -> Int
 fun <R> let(<!UNUSED_PARAMETER!>f<!>: (Int?) -> R): R = null!!
 
 val b /*: Int? */ = let { // but must be Int
-    if (it != null) return@let <!NI;DEBUG_INFO_SMARTCAST!>it<!>
+    if (it != null) return@let <!DEBUG_INFO_SMARTCAST{NI}!>it<!>
     5
 }
 
 val c /*: Int*/ = let {
     if (it != null) <!DEBUG_INFO_SMARTCAST!>it<!> else 5
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.fir.kt
index 491a77d8ad3..98fce09583a 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.fir.kt
@@ -8,4 +8,4 @@ fun test(handlers: Map<String, Element.()->Unit>) {
     handlers.getOrElse("name", l@ { return@l null })
 }
 
-fun <K,V> Map<K,V>.getOrElse(key: K, defaultValue: ()-> V) : V = throw Exception("$key $defaultValue")
\ No newline at end of file
+fun <K,V> Map<K,V>.getOrElse(key: K, defaultValue: ()-> V) : V = throw Exception("$key $defaultValue")
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.kt b/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.kt
index ffab35ee182..97c1866b3d7 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.kt
@@ -5,7 +5,7 @@ interface Element
 
 fun test(handlers: Map<String, Element.()->Unit>) {
 
-    handlers.getOrElse("name", l@ { return@l <!OI;NULL_FOR_NONNULL_TYPE!>null<!> })
+    handlers.getOrElse("name", l@ { return@l <!NULL_FOR_NONNULL_TYPE{OI}!>null<!> })
 }
 
-fun <K,V> Map<K,V>.getOrElse(key: K, defaultValue: ()-> V) : V = throw Exception("$key $defaultValue")
\ No newline at end of file
+fun <K,V> Map<K,V>.getOrElse(key: K, defaultValue: ()-> V) : V = throw Exception("$key $defaultValue")
diff --git a/compiler/testData/diagnostics/tests/generics/Projections.fir.kt b/compiler/testData/diagnostics/tests/generics/Projections.fir.kt
index e28b7ae63cd..65ab20e0ec9 100644
--- a/compiler/testData/diagnostics/tests/generics/Projections.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/Projections.fir.kt
@@ -51,4 +51,4 @@ fun testInOut() {
     (null as Inv<*>).outf()
 
     Inv<Int>().<!INAPPLICABLE_CANDIDATE!>outf<!>(1) // Wrong Arg
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/Projections.kt b/compiler/testData/diagnostics/tests/generics/Projections.kt
index 8c3847e51af..820d719ae62 100644
--- a/compiler/testData/diagnostics/tests/generics/Projections.kt
+++ b/compiler/testData/diagnostics/tests/generics/Projections.kt
@@ -37,13 +37,13 @@ fun testInOut() {
 
     Inv<Int>().f(1)
     (null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<in Int>).f(1)
-    (null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<out Int>).<!OI;MEMBER_PROJECTED_OUT!>f<!>(<!NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>) // !!
-    (null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<*>).<!OI;MEMBER_PROJECTED_OUT!>f<!>(<!NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>) // !!
+    (null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<out Int>).<!MEMBER_PROJECTED_OUT{OI}!>f<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>1<!>) // !!
+    (null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<*>).<!MEMBER_PROJECTED_OUT{OI}!>f<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>1<!>) // !!
 
     Inv<Int>().inf(1)
     (null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<in Int>).inf(1)
-    (null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<out Int>).<!OI;MEMBER_PROJECTED_OUT!>inf<!>(<!NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>) // !!
-    (null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<*>).<!OI;MEMBER_PROJECTED_OUT!>inf<!>(<!NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>) // !!
+    (null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<out Int>).<!MEMBER_PROJECTED_OUT{OI}!>inf<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>1<!>) // !!
+    (null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<*>).<!MEMBER_PROJECTED_OUT{OI}!>inf<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>1<!>) // !!
 
     Inv<Int>().outf()
     checkSubtype<Int>(<!TYPE_MISMATCH!>(null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<in Int>).outf()<!>) // Type mismatch
@@ -51,4 +51,4 @@ fun testInOut() {
     (null <!CAST_NEVER_SUCCEEDS!>as<!> Inv<*>).outf()
 
     Inv<Int>().outf(<!TOO_MANY_ARGUMENTS!>1<!>) // Wrong Arg
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/bareTypesWithStarProjections.fir.kt b/compiler/testData/diagnostics/tests/generics/bareTypesWithStarProjections.fir.kt
deleted file mode 100644
index 6c8fcf68cb7..00000000000
--- a/compiler/testData/diagnostics/tests/generics/bareTypesWithStarProjections.fir.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-// SKIP_TXT
-// IGNORE_FIR
-// !CHECK_TYPE
-// !LANGUAGE: +NewInference
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// !FIR_IGNORE
-
-interface FirMemberDeclaration : FirDeclaration
-interface TypeConstructorMarker
-
-interface FirElement
-interface FirDeclaration : FirElement
-interface FirStatement : FirElement
-interface FirSymbolOwner<E> : FirElement where E : FirSymbolOwner<E>, E : FirDeclaration
-
-interface FirCallableDeclaration<F : FirCallableDeclaration<F>> : FirDeclaration, FirSymbolOwner<F>
-
-interface FirBasedSymbol<E> where E : FirSymbolOwner<E>, E : FirDeclaration
-interface AbstractFirBasedSymbol<E> : FirBasedSymbol<E> where E : FirSymbolOwner<E>, E : FirDeclaration
-
-interface FirVariable<F : FirVariable<F>> : FirCallableDeclaration<F>, FirDeclaration, FirStatement
-
-interface FirCallableSymbol<D : FirCallableDeclaration<D>> : AbstractFirBasedSymbol<D>
-interface FirVariableSymbol<D : FirVariable<D>> : FirCallableSymbol<D>
-interface FirPropertySymbol : FirVariableSymbol<FirProperty>
-
-interface FirCallableMemberDeclaration<F : FirCallableMemberDeclaration<F>> : FirCallableDeclaration<F>, FirMemberDeclaration
-
-interface FirProperty : FirVariable<FirProperty>, FirCallableMemberDeclaration<FirProperty>
-
-fun <D> AbstractFirBasedSymbol<D>.phasedFir(): D where D : FirDeclaration, D : FirSymbolOwner<D> = TODO()
-
-fun foo(coneSymbol: AbstractFirBasedSymbol<*>) {
-    if (coneSymbol !is FirVariableSymbol) return
-    // For bare types, smart cast should be performed to FirVariableSymbol<*> not to FirVariableSymbol<out FirVariable<*>>
-    coneSymbol.phasedFir() checkType { _<FirVariable<*>>() }
-
-    if (coneSymbol !is FirPropertySymbol) return
-    coneSymbol.phasedFir() checkType { _<FirProperty>() }
-}
diff --git a/compiler/testData/diagnostics/tests/generics/bareTypesWithStarProjections.kt b/compiler/testData/diagnostics/tests/generics/bareTypesWithStarProjections.kt
index 6c8fcf68cb7..3d7a9391c30 100644
--- a/compiler/testData/diagnostics/tests/generics/bareTypesWithStarProjections.kt
+++ b/compiler/testData/diagnostics/tests/generics/bareTypesWithStarProjections.kt
@@ -1,9 +1,8 @@
+// FIR_IDENTICAL
 // SKIP_TXT
-// IGNORE_FIR
 // !CHECK_TYPE
 // !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !FIR_IGNORE
 
 interface FirMemberDeclaration : FirDeclaration
 interface TypeConstructorMarker
diff --git a/compiler/testData/diagnostics/tests/generics/capturedParameters/captured.kt b/compiler/testData/diagnostics/tests/generics/capturedParameters/captured.kt
index b69a24e3589..df1878010e7 100644
--- a/compiler/testData/diagnostics/tests/generics/capturedParameters/captured.kt
+++ b/compiler/testData/diagnostics/tests/generics/capturedParameters/captured.kt
@@ -10,11 +10,11 @@ class X {
 
 
 fun testStar(y: X.Y<*>, t: Any) {
-    X().foo(y, <!TYPE_MISMATCH("CapturedType(*)", "Any")!>t<!>)
+    X().foo(y, <!TYPE_MISMATCH("CapturedType(*); Any")!>t<!>)
 }
 
 fun testOut(y: X.Y<out Any>, t: Any) {
-    X().foo(y, <!TYPE_MISMATCH("CapturedType(out Any)", "Any")!>t<!>)
+    X().foo(y, <!TYPE_MISMATCH("CapturedType(out Any); Any")!>t<!>)
 }
 
 fun testIn(y: X.Y<in Any>, t: Any) {
@@ -22,9 +22,9 @@ fun testIn(y: X.Y<in Any>, t: Any) {
 }
 
 fun <T : Any> testWithParameter(y: X.Y<T>, t: Any) {
-    X().foo(y, <!TYPE_MISMATCH("T", "Any")!>t<!>)
+    X().foo(y, <!TYPE_MISMATCH("T; Any")!>t<!>)
 }
 
 fun <T : Any> testWithCapturedParameter(y: X.Y<out T>, t: Any) {
-    X().foo(y, <!TYPE_MISMATCH("CapturedType(out T)", "Any")!>t<!>)
+    X().foo(y, <!TYPE_MISMATCH("CapturedType(out T); Any")!>t<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/generics/finalUpperBoundWithoutOverride.kt b/compiler/testData/diagnostics/tests/generics/finalUpperBoundWithoutOverride.kt
index 546c9eab658..a35a01fc012 100644
--- a/compiler/testData/diagnostics/tests/generics/finalUpperBoundWithoutOverride.kt
+++ b/compiler/testData/diagnostics/tests/generics/finalUpperBoundWithoutOverride.kt
@@ -79,4 +79,4 @@ object MessageManager15 : Manager<Int> {
     var <T : <!FINAL_UPPER_BOUND!>Int<!>> T.y
         get() = 10
         set(value) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.kt
index e4967fe102f..b47238bcf09 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.kt
@@ -45,7 +45,7 @@ fun test() {
     x().foo().a() checkType { _<A<String, Double, Short, Long>>() }
     x().bar() checkType { _<A<String, Double, Short, Char>>() }
 
-    x = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>foobar<Int>()<!>
+    x = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>foobar<Int>()<!>
 
     var y = noParameters()
     y = noParameters()
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.kt
index d5fdd6a53e9..0dde5e49efa 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.kt
@@ -46,8 +46,8 @@ class Outer<T> {
             x().foo().a() checkType { _<A<T, F, String, Double, Short, Long>>() }
             x().bar() checkType { _<A<T, F, String, Double, Short, Char>>() }
 
-            x = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>foobar<Int>()<!>
-            x = <!TYPE_MISMATCH!>z.<!NI;TYPE_MISMATCH!>foobar<String>()<!><!>
+            x = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>foobar<Int>()<!>
+            x = <!TYPE_MISMATCH!>z.<!TYPE_MISMATCH{NI}!>foobar<String>()<!><!>
 
             var y = noParameters()
             y = noParameters()
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.kt
index 6719bcf122f..1e47b515c93 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.kt
@@ -32,7 +32,7 @@ fun main() {
     checkSubtype<Outer<*>.Inner<*>>(outer.Inner<Int>())
 
     checkSubtype<Outer<CharSequence>.Inner<CharSequence>>(<!TYPE_MISMATCH!>outer.bar()<!>)
-    checkSubtype<Outer<CharSequence>.Inner<CharSequence>>(<!NI;TYPE_MISMATCH!>outer.<!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>Inner()<!><!>)
+    checkSubtype<Outer<CharSequence>.Inner<CharSequence>>(<!TYPE_MISMATCH{NI}!>outer.<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>Inner()<!><!>)
 
     outer.set(outer.bar())
     outer.set(outer.Inner())
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.kt
index d766cbcf95a..54281b0ef71 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.kt
@@ -15,7 +15,7 @@ class Outer<E> {
         if (y is <!NO_TYPE_ARGUMENTS_ON_RHS!>Inner<!>) return
 
         if (z is Inner) {
-            <!OI;DEBUG_INFO_SMARTCAST!>z<!>.prop.checkType { _<Any?>() }
+            <!DEBUG_INFO_SMARTCAST{OI}!>z<!>.prop.checkType { _<Any?>() }
             return
         }
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.kt
index ed2212cf62a..64b3a129de1 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.kt
@@ -33,5 +33,5 @@ fun foo() {
 
     val csIt: Iterator<CharSequence> = A<String>().iterator()
 
-    commonSupertype(A<String>().iterator(), A<Int>().iterator()).checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><A<out Any>.MyIt>() }
+    commonSupertype(A<String>().iterator(), A<Int>().iterator()).checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><A<out Any>.MyIt>() }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.kt
index c8b9fbeb0b9..c9c5da69d80 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.kt
@@ -6,7 +6,7 @@ class Outer<T> {
     inner class Inner
     fun foo(x: Outer<String>.Inner, y: <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Outer<!>.Inner, z: Inner) {
         var inner = Inner()
-        x.checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><Inner>() }
+        x.checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Inner>() }
         x.checkType { _<Outer<String>.Inner>() }
         z.checkType { _<Inner>() }
         z.checkType { _<Outer<T>.Inner>() }
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.kt
index 11897eb8fcc..c7b41148d8c 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.kt
@@ -29,9 +29,9 @@ fun main() {
     checkSubtype<Outer<out CharSequence>.Inner>(outer.bar())
     checkSubtype<Outer<out CharSequence>.Inner>(outer.Inner())
 
-    outer.<!OI;MEMBER_PROJECTED_OUT!>set<!>(<!NI;TYPE_MISMATCH!>outer.bar()<!>)
-    outer.<!OI;MEMBER_PROJECTED_OUT!>set<!>(<!NI;TYPE_MISMATCH!>outer.Inner()<!>)
+    outer.<!MEMBER_PROJECTED_OUT{OI}!>set<!>(<!TYPE_MISMATCH{NI}!>outer.bar()<!>)
+    outer.<!MEMBER_PROJECTED_OUT{OI}!>set<!>(<!TYPE_MISMATCH{NI}!>outer.Inner()<!>)
 
     val x: Outer<String>.Inner = factoryString()
-    outer.<!OI;MEMBER_PROJECTED_OUT!>set<!>(<!NI;TYPE_MISMATCH!>x<!>)
+    outer.<!MEMBER_PROJECTED_OUT{OI}!>set<!>(<!TYPE_MISMATCH{NI}!>x<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/generics/kt30590.kt b/compiler/testData/diagnostics/tests/generics/kt30590.kt
index b66ca971e1d..9e5d418b52f 100644
--- a/compiler/testData/diagnostics/tests/generics/kt30590.kt
+++ b/compiler/testData/diagnostics/tests/generics/kt30590.kt
@@ -6,4 +6,4 @@ interface A
 fun <T: A, R: T> emptyStrangeMap(): Map<T, R> = TODO()
 fun test7() : Map<A, A> = emptyStrangeMap()
 
-fun test() = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyStrangeMap<!>()
+fun test() = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyStrangeMap<!>()
diff --git a/compiler/testData/diagnostics/tests/generics/kt34729.kt b/compiler/testData/diagnostics/tests/generics/kt34729.kt
index 665129cf9bd..f07d2e3ee0c 100644
--- a/compiler/testData/diagnostics/tests/generics/kt34729.kt
+++ b/compiler/testData/diagnostics/tests/generics/kt34729.kt
@@ -14,6 +14,6 @@ fun <T : ILength> bar(a: (Int) -> T) {
 }
 
 fun test() {
-    foo<String> <!NI;TYPE_MISMATCH!>{ <!OI;TYPE_MISMATCH!><!>}<!>
-    bar<Impl> <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>{ <!OI;TYPE_MISMATCH!><!>}<!>
+    foo<String> <!TYPE_MISMATCH{NI}!>{ <!TYPE_MISMATCH{OI}!><!>}<!>
+    bar<Impl> <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>{ <!TYPE_MISMATCH{OI}!><!>}<!>
 }
diff --git a/compiler/testData/diagnostics/tests/generics/kt9203.kt b/compiler/testData/diagnostics/tests/generics/kt9203.kt
index 83f420d2152..93fcc651c8a 100644
--- a/compiler/testData/diagnostics/tests/generics/kt9203.kt
+++ b/compiler/testData/diagnostics/tests/generics/kt9203.kt
@@ -8,4 +8,4 @@ fun main() {
     val xs = IntStream.<!INTERFACE_STATIC_METHOD_CALL_FROM_JAVA6_TARGET_ERROR!>range<!>(0, 10).mapToObj { it.toString() }
             .collect(Collectors.toList())
     xs[0]
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.kt b/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.kt
index aba7d454da2..73ec1f43bd2 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.kt
@@ -7,13 +7,13 @@ fun <E : CharSequence> foo1(x: E) {}
 fun <E : CharSequence> E.foo2() {}
 
 fun <F : String?> bar(x: F) {
-    <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>A<!>(<!NI;TYPE_MISMATCH!>x<!>)
+    <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>A<!>(<!TYPE_MISMATCH{NI}!>x<!>)
     A<<!UPPER_BOUND_VIOLATED!>F<!>>(x)
 
-    <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>foo1<!>(<!NI;TYPE_MISMATCH!>x<!>)
+    <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo1<!>(<!TYPE_MISMATCH{NI}!>x<!>)
     foo1<<!UPPER_BOUND_VIOLATED!>F<!>>(x)
 
-    x<!NI;UNSAFE_CALL!>.<!><!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>foo2<!>()
+    x<!UNSAFE_CALL{NI}!>.<!><!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo2<!>()
     x.foo2<<!UPPER_BOUND_VIOLATED!>F<!>>()
 }
 
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/functionalBound.kt b/compiler/testData/diagnostics/tests/generics/nullability/functionalBound.kt
index 2944a0a2b31..16f0fb94a1a 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/functionalBound.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/functionalBound.kt
@@ -10,4 +10,4 @@ fun <E : String?, T : ((CharSequence) -> Unit)?> foo(x: E, y: T) {
     if (x != null && y != null) {
         <!DEBUG_INFO_SMARTCAST!>y<!>(<!DEBUG_INFO_SMARTCAST!>x<!>)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/nullToGeneric.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/nullToGeneric.fir.kt
index 3cba1b9f73f..98f6fa489f0 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/nullToGeneric.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/nullToGeneric.fir.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun <E> bar(x: E) {}
 
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/nullToGeneric.kt b/compiler/testData/diagnostics/tests/generics/nullability/nullToGeneric.kt
index c831d9dc3f4..b6be648e521 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/nullToGeneric.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/nullToGeneric.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun <E> bar(x: E) {}
 
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.kt
index daa9c8164a1..25d9392afdb 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.kt
@@ -15,9 +15,9 @@ fun <T : CharSequence?> foo(x: T) {
         <!DEBUG_INFO_SMARTCAST!>x<!>.length
         x<!UNNECESSARY_SAFE_CALL!>?.<!>length
 
-        <!NI;DEBUG_INFO_SMARTCAST!>x<!>.bar1()
+        <!DEBUG_INFO_SMARTCAST{NI}!>x<!>.bar1()
         x.bar2()
-        <!NI;DEBUG_INFO_SMARTCAST!>x<!>.<!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>bar3<!>()
+        <!DEBUG_INFO_SMARTCAST{NI}!>x<!>.<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar3<!>()
         <!DEBUG_INFO_SMARTCAST!>x<!>.bar4()
 
 
@@ -30,7 +30,7 @@ fun <T : CharSequence?> foo(x: T) {
         <!DEBUG_INFO_SMARTCAST!>x<!>.length
         x<!UNNECESSARY_SAFE_CALL!>?.<!>length
 
-        <!NI;DEBUG_INFO_SMARTCAST!>x<!>.bar1()
+        <!DEBUG_INFO_SMARTCAST{NI}!>x<!>.bar1()
         x.bar2()
         <!DEBUG_INFO_SMARTCAST!>x<!>.bar3()
     }
@@ -39,7 +39,7 @@ fun <T : CharSequence?> foo(x: T) {
         <!DEBUG_INFO_SMARTCAST!>x<!>.length
         x<!UNNECESSARY_SAFE_CALL!>?.<!>length
 
-        <!NI;DEBUG_INFO_SMARTCAST!>x<!>.bar1()
+        <!DEBUG_INFO_SMARTCAST{NI}!>x<!>.bar1()
         x.bar2()
         <!DEBUG_INFO_SMARTCAST!>x<!>.bar3()
     }
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.kt
index 2cf4d6f80ab..4196c852c6e 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.kt
@@ -11,13 +11,13 @@ fun <T : String?> T.foo() {
     if (this != null) {
         if (<!SENSELESS_COMPARISON!>this != null<!>) {}
 
-        <!NI;DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>length<!>
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}!>length<!>
         this<!UNNECESSARY_SAFE_CALL!>?.<!>length
 
-        <!NI;DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>bar1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}!>bar1<!>()
         bar2()
-        <!NI;DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST, OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>bar3<!>()
-        <!NI;DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>bar4<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}, TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar3<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}!>bar4<!>()
 
 
         this<!UNNECESSARY_SAFE_CALL!>?.<!>bar1()
@@ -29,8 +29,8 @@ fun <T : String?> T.foo() {
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>length<!>
         this<!UNNECESSARY_SAFE_CALL!>?.<!>length
 
-        <!NI;DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>bar1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}!>bar1<!>()
         bar2()
-        <!NI;DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST, OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>bar3<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST{NI}, TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar3<!>()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.fir.kt
index 8c40082a63f..75812a0174a 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.fir.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// !DIAGNOSTICS: -UNUSED_EXPRESSION,-UNUSED_VARIABLE,-UNUSED_PARAMETER,-ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE,-UNUSED_VALUE
+// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_VARIABLE -UNUSED_PARAMETER -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE
 
 fun <T : CharSequence> bar1(x: T) {}
 fun bar2(x: CharSequence) {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt
index 7449ffe9b10..a9c752df1e0 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// !DIAGNOSTICS: -UNUSED_EXPRESSION,-UNUSED_VARIABLE,-UNUSED_PARAMETER,-ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE,-UNUSED_VALUE
+// !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_VARIABLE -UNUSED_PARAMETER -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE
 
 fun <T : CharSequence> bar1(x: T) {}
 fun bar2(x: CharSequence) {}
@@ -14,7 +14,7 @@ fun <T : CharSequence?> foo(x: T) {
         y1 = <!DEBUG_INFO_SMARTCAST!>x<!>
         y2 = <!TYPE_MISMATCH!>x<!>
 
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>bar1<!>(<!NI;DEBUG_INFO_SMARTCAST!>x<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar1<!>(<!DEBUG_INFO_SMARTCAST{NI}!>x<!>)
         bar1<CharSequence>(<!DEBUG_INFO_SMARTCAST!>x<!>)
         bar2(<!DEBUG_INFO_SMARTCAST!>x<!>)
         bar3(<!TYPE_MISMATCH!>x<!>)
@@ -40,13 +40,13 @@ fun <T : CharSequence?> foo(x: T) {
 
     if (1 == 1) {
         val y = x!!
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>bar1<!>(<!NI;DEBUG_INFO_SMARTCAST!>x<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar1<!>(<!DEBUG_INFO_SMARTCAST{NI}!>x<!>)
         bar1<CharSequence>(<!DEBUG_INFO_SMARTCAST!>x<!>)
         bar2(<!DEBUG_INFO_SMARTCAST!>x<!>)
         bar3(<!TYPE_MISMATCH!>x<!>)
 
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>bar1<!>(y)
-        bar2(<!OI;DEBUG_INFO_SMARTCAST!>y<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar1<!>(y)
+        bar2(<!DEBUG_INFO_SMARTCAST{OI}!>y<!>)
         bar3(<!TYPE_MISMATCH!>y<!>)
     }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.fir.kt
index a9741f314d2..2d2cdac7f92 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.fir.kt
@@ -1,6 +1,6 @@
 // !WITH_NEW_INFERENCE
 // !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 class A<F> {
     fun <E : F> foo1(x: E) = x
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.kt b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.kt
index 254e02a3aa8..851db406158 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.kt
@@ -1,6 +1,6 @@
 // !WITH_NEW_INFERENCE
 // !CHECK_TYPE
-// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 class A<F> {
     fun <E : F> foo1(x: E) = x
@@ -18,7 +18,7 @@ class A<F> {
         x2.checkType { _<F>() }
 
         foo1<<!UPPER_BOUND_VIOLATED!>F?<!>>(y)
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>foo1<!>(<!NI;TYPE_MISMATCH!>y<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo1<!>(<!TYPE_MISMATCH{NI}!>y<!>)
         foo2<F?>(y)
 
         val x3 = foo2(y)
@@ -38,7 +38,7 @@ class A<F> {
         x4.checkType { _<Z>() }
 
         foo1<<!UPPER_BOUND_VIOLATED!>W<!>>(w)
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>foo1<!>(<!NI;TYPE_MISMATCH!>w<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo1<!>(<!TYPE_MISMATCH{NI}!>w<!>)
         foo2<W>(w)
 
         val x6 = foo2(w)
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.kt b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.kt
index dd1e245e7a5..990c6ae3038 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.kt
@@ -20,7 +20,7 @@ class A<F> {
         fooInv1<Inv<F>>(Inv<F>())
         fooInv2<<!UPPER_BOUND_VIOLATED!>Inv<F><!>>(Inv<F>())
         fooInv1(Inv<F>())
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>fooInv2<!>(<!NI;TYPE_MISMATCH!>Inv<F>()<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooInv2<!>(<!TYPE_MISMATCH{NI}!>Inv<F>()<!>)
 
         fooIn1<In<F?>>(In<F?>())
         fooIn2<In<F?>>(In<F?>())
@@ -35,13 +35,13 @@ class A<F> {
         // Z
         fooInv1<<!UPPER_BOUND_VIOLATED!>Inv<Z><!>>(Inv<Z>())
         fooInv2<<!UPPER_BOUND_VIOLATED!>Inv<Z><!>>(Inv<Z>())
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>fooInv1<!>(<!NI;TYPE_MISMATCH!>Inv<Z>()<!>)
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>fooInv2<!>(<!NI;TYPE_MISMATCH!>Inv<Z>()<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooInv1<!>(<!TYPE_MISMATCH{NI}!>Inv<Z>()<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooInv2<!>(<!TYPE_MISMATCH{NI}!>Inv<Z>()<!>)
 
         fooIn1<<!UPPER_BOUND_VIOLATED!>In<Z?><!>>(In<Z?>())
         fooIn2<<!UPPER_BOUND_VIOLATED!>In<Z?><!>>(In<Z?>())
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>fooIn1<!>(<!NI;TYPE_MISMATCH!>In<Z?>()<!>)
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>fooIn2<!>(<!NI;TYPE_MISMATCH!>In<Z?>()<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooIn1<!>(<!TYPE_MISMATCH{NI}!>In<Z?>()<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooIn2<!>(<!TYPE_MISMATCH{NI}!>In<Z?>()<!>)
 
         fooOut1<Out<Z>>(Out<Z>())
         fooOut2<Out<Z>>(Out<Z>())
@@ -51,17 +51,17 @@ class A<F> {
         // W
         fooInv1<<!UPPER_BOUND_VIOLATED!>Inv<W><!>>(Inv<W>())
         fooInv2<<!UPPER_BOUND_VIOLATED!>Inv<W><!>>(Inv<W>())
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>fooInv1<!>(<!NI;TYPE_MISMATCH!>Inv<W>()<!>)
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>fooInv2<!>(<!NI;TYPE_MISMATCH!>Inv<W>()<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooInv1<!>(<!TYPE_MISMATCH{NI}!>Inv<W>()<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooInv2<!>(<!TYPE_MISMATCH{NI}!>Inv<W>()<!>)
 
         fooIn1<<!UPPER_BOUND_VIOLATED!>In<W?><!>>(In<W?>())
         fooIn2<<!UPPER_BOUND_VIOLATED!>In<W?><!>>(In<W?>())
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>fooIn1<!>(<!NI;TYPE_MISMATCH!>In<W?>()<!>)
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>fooIn2<!>(<!NI;TYPE_MISMATCH!>In<W?>()<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooIn1<!>(<!TYPE_MISMATCH{NI}!>In<W?>()<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooIn2<!>(<!TYPE_MISMATCH{NI}!>In<W?>()<!>)
 
         fooOut1<<!UPPER_BOUND_VIOLATED!>Out<W><!>>(Out<W>())
         fooOut2<Out<W>>(Out<W>())
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>fooOut1<!>(<!NI;TYPE_MISMATCH!>Out<W>()<!>)
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>fooOut1<!>(<!TYPE_MISMATCH{NI}!>Out<W>()<!>)
         fooOut2(Out<W>())
     }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.fir.kt
index 3e24720fdd3..de78b5e4e64 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.fir.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// !DIAGNOSTICS: -UNUSED_VALUE,-UNUSED_VARIABLE,-ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE,-VARIABLE_WITH_REDUNDANT_INITIALIZER
+// !DIAGNOSTICS: -UNUSED_VALUE -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 
 class A<T : CharSequence?, E1 : T, E2: T?> {
     fun T.bar() {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.kt b/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.kt
index 2294e02915e..0f76856a0b6 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// !DIAGNOSTICS: -UNUSED_VALUE,-UNUSED_VARIABLE,-ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE,-VARIABLE_WITH_REDUNDANT_INITIALIZER
+// !DIAGNOSTICS: -UNUSED_VALUE -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 
 class A<T : CharSequence?, E1 : T, E2: T?> {
     fun T.bar() {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.kt b/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.kt
index dd60e28621f..d17ab31de17 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.kt
@@ -21,7 +21,7 @@ fun <T : String?> foo(x: T) {
     x?.bar1()
     x?.bar2()
 
-    x<!NI;UNSAFE_CALL!>.<!><!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>bar3<!>()
+    x<!UNSAFE_CALL{NI}!>.<!><!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar3<!>()
 
-    x?.let { it<!OI;UNSAFE_CALL!>.<!>length }
+    x?.let { it<!UNSAFE_CALL{OI}!>.<!>length }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.fir.kt
index 5cb21bcd5fb..311cb420ec3 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.fir.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun <T : CharSequence?> bar1(x: T) {}
 
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.kt b/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.kt
index 2567d0a09f3..b3436752d5c 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
-// !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun <T : CharSequence?> bar1(x: T) {}
 
@@ -13,6 +13,6 @@ fun <T : String?> foo(x: T) {
     bar1(x)
     bar2(x)
 
-    <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>bar3<!>(<!NI;TYPE_MISMATCH!>x<!>)
+    <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>bar3<!>(<!TYPE_MISMATCH{NI}!>x<!>)
     bar4(<!TYPE_MISMATCH!>x<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.kt
index 8ee2dc801f5..2f66883b44b 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.kt
@@ -15,18 +15,18 @@ fun <T> mc(): MC<T> = null!!
 fun <T> c(): C<T> = null!!
 
 fun foo(x: MC<out Open>) {
-    x.addAll(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>x<!>)
-    x.addAllMC(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>x<!>)
+    x.addAll(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>x<!>)
+    x.addAllMC(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>x<!>)
 
-    x.addAll(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>mc<Open>()<!>)
-    x.addAllMC(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>mc<Open>()<!>)
+    x.addAll(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>mc<Open>()<!>)
+    x.addAllMC(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>mc<Open>()<!>)
 
-    x.addAll(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>mc<Derived>()<!>)
-    x.addAllMC(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>mc<Derived>()<!>)
+    x.addAll(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>mc<Derived>()<!>)
+    x.addAllMC(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>mc<Derived>()<!>)
 
     x.addAll(c())
     x.addAll(c<Nothing>())
 
-    x.<!OI;MEMBER_PROJECTED_OUT!>addAllInv<!>(<!NI;TYPE_MISMATCH!>mc<Open>()<!>)
+    x.<!MEMBER_PROJECTED_OUT{OI}!>addAllInv<!>(<!TYPE_MISMATCH{NI}!>mc<Open>()<!>)
     x.addAll(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.kt
index dc3b18c6bc2..6a65475cc85 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.kt
@@ -9,10 +9,10 @@ fun test(x: A<out CharSequence>, y: Out<CharSequence>) {
     with(x) {
         // TODO: this diagnostic could be replaced with TYPE_MISMATCH_DUE_TO_TYPE_PROJECTION
         "".<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>foo<!>()
-        <!OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>y<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>bar<!>()
+        <!TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>y<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>bar<!>()
 
         with(y) {
-            <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>bar<!>()
+            <!TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>bar<!>()
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.kt
index deec48f3d5b..a4ecece652a 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.kt
@@ -5,5 +5,5 @@ interface B<E> {
 }
 
 fun foo(x: B<in CharSequence>, y: A<CharSequence>) {
-    x.foo(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>y<!>)
+    x.foo(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>y<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.kt
index b007e3623e8..280493caf68 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.kt
@@ -6,5 +6,5 @@ class A<T> {
 }
 
 fun test(a: A<out CharSequence>) {
-    a.<!OI;MEMBER_PROJECTED_OUT!>foo<!>(<!NI;TYPE_MISMATCH!>""<!>, <!NI;TYPE_MISMATCH!>""<!>)
+    a.<!MEMBER_PROJECTED_OUT{OI}!>foo<!>(<!TYPE_MISMATCH{NI}!>""<!>, <!TYPE_MISMATCH{NI}!>""<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.kt
index b3461fe40b9..0af707c81eb 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.kt
@@ -8,7 +8,7 @@ class A<T> {
 }
 
 fun test(a: A<out CharSequence>) {
-    a <!OI;MEMBER_PROJECTED_OUT!>+<!> <!NI;TYPE_MISMATCH!>""<!>
-    <!OI;MEMBER_PROJECTED_OUT!>a[1]<!> = <!NI;TYPE_MISMATCH!>""<!>
-    <!OI;MEMBER_PROJECTED_OUT!>a[<!NI;TYPE_MISMATCH!>""<!>]<!>
+    a <!MEMBER_PROJECTED_OUT{OI}!>+<!> <!TYPE_MISMATCH{NI}!>""<!>
+    <!MEMBER_PROJECTED_OUT{OI}!>a[1]<!> = <!TYPE_MISMATCH{NI}!>""<!>
+    <!MEMBER_PROJECTED_OUT{OI}!>a[<!TYPE_MISMATCH{NI}!>""<!>]<!>
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.kt
index 32877a619a6..afe772cfb44 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.kt
@@ -6,18 +6,18 @@ class C<R> {
 }
 
 fun foo(x: Any?, y: C<*>) {
-    y.<!OI;MEMBER_PROJECTED_OUT!>bindTo<!>(<!NI;TYPE_MISMATCH!>""<!>)
+    y.<!MEMBER_PROJECTED_OUT{OI}!>bindTo<!>(<!TYPE_MISMATCH{NI}!>""<!>)
 
     if (x is C<*>) {
-        <!DEBUG_INFO_SMARTCAST!>x<!>.<!OI;MEMBER_PROJECTED_OUT!>bindTo<!>(<!NI;TYPE_MISMATCH!>""<!>)
+        <!DEBUG_INFO_SMARTCAST!>x<!>.<!MEMBER_PROJECTED_OUT{OI}!>bindTo<!>(<!TYPE_MISMATCH{NI}!>""<!>)
         with(<!DEBUG_INFO_SMARTCAST!>x<!>) {
-            <!OI;MEMBER_PROJECTED_OUT!>bindTo<!>(<!NI;TYPE_MISMATCH!>""<!>)
+            <!MEMBER_PROJECTED_OUT{OI}!>bindTo<!>(<!TYPE_MISMATCH{NI}!>""<!>)
         }
     }
 
     with(x) {
         if (this is C<*>) {
-            <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST, OI;MEMBER_PROJECTED_OUT!>bindTo<!>(<!NI;TYPE_MISMATCH!>""<!>)
+            <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST, MEMBER_PROJECTED_OUT{OI}!>bindTo<!>(<!TYPE_MISMATCH{NI}!>""<!>)
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.kt
index 16b8448b167..dcb3fddb8b9 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.kt
@@ -10,9 +10,9 @@ class A<T> {
 class Out<out F>
 
 fun test(a: A<out CharSequence>, y: Out<CharSequence>) {
-    a + <!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>y<!>
-    a[1] = <!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>y<!>
-    a[<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>y<!>]
+    a + <!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>y<!>
+    a[1] = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>y<!>
+    a[<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>y<!>]
 
     a + Out<Nothing>()
     a[1] = Out<Nothing>()
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.kt
index be388ac63a8..2fc1b3659f2 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.kt
@@ -14,14 +14,14 @@ class A<E> {
 fun test(a: A<out CharSequence>, z: Out<CharSequence>) {
     a.foo {
         val x: String = <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!> // Should be no TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS
-        <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>""<!>
+        <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>""<!>
     }
-    a.bar { <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>Out<CharSequence>()<!> }
+    a.bar { <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>Out<CharSequence>()<!> }
     a.bar { Out() }
-    a.bar { <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>z.id()<!> }
+    a.bar { <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>z.id()<!> }
 
     a.foo {
-        z.foobar(if (1 > 2) return@foo <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>""<!> else "")
-        <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>""<!>
+        z.foobar(if (1 > 2) return@foo <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>""<!> else "")
+        <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>""<!>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.kt
index e5d8d0dc248..9b3e6464052 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.kt
@@ -13,15 +13,15 @@ class A<T> {
 }
 
 fun foo2(a: A<out CharSequence>, b: A<in CharSequence>) {
-    a.<!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>foo1<!>(<!NI;TYPE_MISMATCH!>Out<CharSequence>()<!>)
-    a.foo1<<!UPPER_BOUND_VIOLATED!>Out<CharSequence><!>>(<!NI;TYPE_MISMATCH!>Out()<!>)
+    a.<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo1<!>(<!TYPE_MISMATCH{NI}!>Out<CharSequence>()<!>)
+    a.foo1<<!UPPER_BOUND_VIOLATED!>Out<CharSequence><!>>(<!TYPE_MISMATCH{NI}!>Out()<!>)
 
     a.foo1(Out())
     a.foo1(Out<Nothing>())
 
-    a.<!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>foo2<!>(<!NI;TYPE_MISMATCH!><!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Inv<!>()<!>)
-    a.<!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>foo2<!>(<!NI;TYPE_MISMATCH!>Inv<CharSequence>()<!>)
-    a.foo2<<!UPPER_BOUND_VIOLATED!>Inv<CharSequence><!>>(<!NI;TYPE_MISMATCH!>Inv()<!>)
+    a.<!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>foo2<!>(<!TYPE_MISMATCH{NI}!><!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>Inv<!>()<!>)
+    a.<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo2<!>(<!TYPE_MISMATCH{NI}!>Inv<CharSequence>()<!>)
+    a.foo2<<!UPPER_BOUND_VIOLATED!>Inv<CharSequence><!>>(<!TYPE_MISMATCH{NI}!>Inv()<!>)
 
     a.foo3(In())
     a.foo3(In<CharSequence>())
@@ -31,13 +31,13 @@ fun foo2(a: A<out CharSequence>, b: A<in CharSequence>) {
     b.foo1(Out<CharSequence>())
     b.foo1<Out<CharSequence>>(Out())
 
-    b.<!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>foo2<!>(<!NI;TYPE_MISMATCH!><!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Inv<!>()<!>)
-    b.<!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>foo2<!>(<!NI;TYPE_MISMATCH!>Inv<CharSequence>()<!>)
-    b.foo2<<!UPPER_BOUND_VIOLATED!>Inv<CharSequence><!>>(<!NI;TYPE_MISMATCH!>Inv()<!>)
+    b.<!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>foo2<!>(<!TYPE_MISMATCH{NI}!><!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>Inv<!>()<!>)
+    b.<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo2<!>(<!TYPE_MISMATCH{NI}!>Inv<CharSequence>()<!>)
+    b.foo2<<!UPPER_BOUND_VIOLATED!>Inv<CharSequence><!>>(<!TYPE_MISMATCH{NI}!>Inv()<!>)
 
 
-    b.<!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>foo3<!>(<!NI;TYPE_MISMATCH!>In<CharSequence>()<!>)
-    b.foo3<<!UPPER_BOUND_VIOLATED!>In<CharSequence><!>>(<!NI;TYPE_MISMATCH!>In()<!>)
+    b.<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo3<!>(<!TYPE_MISMATCH{NI}!>In<CharSequence>()<!>)
+    b.foo3<<!UPPER_BOUND_VIOLATED!>In<CharSequence><!>>(<!TYPE_MISMATCH{NI}!>In()<!>)
 
     b.foo3(In<Any?>())
     b.foo3(In())
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.kt
index d5dfe3c9f6b..1b7ec4bcafe 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.kt
@@ -6,8 +6,8 @@ class A<T> {
 }
 
 fun test(a: A<out CharSequence>, y: Array<out CharSequence>) {
-    a.<!OI;MEMBER_PROJECTED_OUT!>foo<!>(<!NI;TYPE_MISMATCH!>""<!>, <!NI;TYPE_MISMATCH!>""<!>, <!NI;TYPE_MISMATCH!>""<!>)
-    a.foo(*<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>y<!>)
+    a.<!MEMBER_PROJECTED_OUT{OI}!>foo<!>(<!TYPE_MISMATCH{NI}!>""<!>, <!TYPE_MISMATCH{NI}!>""<!>, <!TYPE_MISMATCH{NI}!>""<!>)
+    a.foo(*<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>y<!>)
     // TODO: TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS probably redundant
-    a.<!OI;MEMBER_PROJECTED_OUT!>foo<!>(*<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>y<!>, <!NI;TYPE_MISMATCH!>""<!>)
+    a.<!MEMBER_PROJECTED_OUT{OI}!>foo<!>(*<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>y<!>, <!TYPE_MISMATCH{NI}!>""<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/generics/starProjections/invalid.kt b/compiler/testData/diagnostics/tests/generics/starProjections/invalid.kt
index 6c61d165fb9..40880d0e20f 100644
--- a/compiler/testData/diagnostics/tests/generics/starProjections/invalid.kt
+++ b/compiler/testData/diagnostics/tests/generics/starProjections/invalid.kt
@@ -17,7 +17,7 @@ fun main(a: A<*>, j: JavaClass<*>, i2: Inv2<*>) {
     j.foo() checkType { _<Any?>() }
     i2.x checkType { _<Any?>() }
 
-    j.bar(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!>, <!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>Any()<!>)
+    j.bar(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!>, <!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>Any()<!>)
     j.bar(null)
 }
 
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.fir.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.fir.kt
index 241f164149f..9016284cedf 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.fir.kt
@@ -14,4 +14,4 @@ fun <A> main() {
 
     // TODO svtk, uncomment when extensions are called for nested calls!
     //val < !UNUSED_VARIABLE!>с< !>: C<A> = id(< !TYPE_PARAMETER_AS_REIFIED!>C< !>())
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt
index 3597b3f194c..75fc67d093b 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt
@@ -4,7 +4,7 @@ class C<<!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T>
 fun <T> id(p: T): T = p
 
 fun <A> main() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>C<!>()
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>C<!>()
 
     val <!UNUSED_VARIABLE!>a<!>: C<A> = <!TYPE_PARAMETER_AS_REIFIED!>C<!>()
     C<<!TYPE_PARAMETER_AS_REIFIED!>A<!>>()
@@ -14,4 +14,4 @@ fun <A> main() {
 
     // TODO svtk, uncomment when extensions are called for nested calls!
     //val < !UNUSED_VARIABLE!>с< !>: C<A> = id(< !TYPE_PARAMETER_AS_REIFIED!>C< !>())
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.fir.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.fir.kt
index bdac536027a..fd1d243cb7e 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.fir.kt
@@ -15,4 +15,4 @@ fun <A> main() {
     f<Int>()
 
     val с: A = id(f())
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt
index 7bc217846ee..154c954adb1 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt
@@ -6,7 +6,7 @@ inline fun <reified T> f(): T = throw UnsupportedOperationException()
 fun <T> id(p: T): T = p
 
 fun <A> main() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>f<!>()
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>f<!>()
 
     val <!UNUSED_VARIABLE!>a<!>: A = <!TYPE_PARAMETER_AS_REIFIED!>f<!>()
     f<<!TYPE_PARAMETER_AS_REIFIED!>A<!>>()
@@ -15,4 +15,4 @@ fun <A> main() {
     f<Int>()
 
     val <!UNUSED_VARIABLE!>с<!>: A = id(<!TYPE_PARAMETER_AS_REIFIED!>f<!>())
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/generics/wildcardInValueParameter.fir.kt b/compiler/testData/diagnostics/tests/generics/wildcardInValueParameter.fir.kt
index 4cb4e519fcf..f0568b2dff3 100644
--- a/compiler/testData/diagnostics/tests/generics/wildcardInValueParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/wildcardInValueParameter.fir.kt
@@ -1,4 +1,4 @@
-// JAVAC_SKIP
+// SKIP_JAVAC
 // FILE: JavaClass.java
 public class JavaClass {
     public void foo(? x) {}
diff --git a/compiler/testData/diagnostics/tests/generics/wildcardInValueParameter.kt b/compiler/testData/diagnostics/tests/generics/wildcardInValueParameter.kt
index f66b9bb2389..6281dc58eda 100644
--- a/compiler/testData/diagnostics/tests/generics/wildcardInValueParameter.kt
+++ b/compiler/testData/diagnostics/tests/generics/wildcardInValueParameter.kt
@@ -1,4 +1,4 @@
-// JAVAC_SKIP
+// SKIP_JAVAC
 // FILE: JavaClass.java
 public class JavaClass {
     public void foo(? x) {}
diff --git a/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.kt b/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.kt
index f3ff59c862a..dbe5097d6f5 100644
--- a/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.kt
+++ b/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.kt
@@ -5,12 +5,12 @@ fun myFun(i : String) {}
 fun myFun(i : Int) {}
 
 fun test1() {
-    <!NI;NONE_APPLICABLE!>myFun<!><!OI;WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>(3)
+    <!NONE_APPLICABLE{NI}!>myFun<!><!WRONG_NUMBER_OF_TYPE_ARGUMENTS{OI}!><Int><!>(3)
     <!NONE_APPLICABLE!>myFun<!><String>('a')
 }
 
 fun test2() {
-    val m0 = java.util.<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>HashMap<!>()
+    val m0 = java.util.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>HashMap<!>()
     val m1 = java.util.HashMap<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><String, String, String><!>()
     val m2 = java.util.HashMap<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><String><!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/implicitIntersection.fir.kt b/compiler/testData/diagnostics/tests/implicitIntersection.fir.kt
index 2877bb09372..603d7123d64 100644
--- a/compiler/testData/diagnostics/tests/implicitIntersection.fir.kt
+++ b/compiler/testData/diagnostics/tests/implicitIntersection.fir.kt
@@ -27,4 +27,4 @@ fun bar(b: B): String {
     // Error: local function
     fun foo(b: B) = if (b is A && b is C) b else null
     return tmp.toString()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/implicitIntersection.kt b/compiler/testData/diagnostics/tests/implicitIntersection.kt
index 590eef5ab5b..228697fac03 100644
--- a/compiler/testData/diagnostics/tests/implicitIntersection.kt
+++ b/compiler/testData/diagnostics/tests/implicitIntersection.kt
@@ -7,24 +7,24 @@ interface A
 interface C
 
 // Error!
-fun <!OI;IMPLICIT_INTERSECTION_TYPE!>foo<!>(b: B) = if (b is A && b is C) b else null
+fun <!IMPLICIT_INTERSECTION_TYPE{OI}!>foo<!>(b: B) = if (b is A && b is C) b else null
 
 // Ok: given explicitly
 fun gav(b: B): A? = if (b is A && b is C) <!DEBUG_INFO_SMARTCAST!>b<!> else null
 
 class My(b: B) {
     // Error!
-    val <!OI;IMPLICIT_INTERSECTION_TYPE!>x<!> = if (b is A && b is C) b else null
+    val <!IMPLICIT_INTERSECTION_TYPE{OI}!>x<!> = if (b is A && b is C) b else null
     // Ok: given explicitly
     val y: C? = if (b is A && b is C) <!DEBUG_INFO_SMARTCAST!>b<!> else null
     // Error!
-    fun <!OI;IMPLICIT_INTERSECTION_TYPE!>foo<!>(b: B) = if (b is A && b is C) b else null
+    fun <!IMPLICIT_INTERSECTION_TYPE{OI}!>foo<!>(b: B) = if (b is A && b is C) b else null
 }
 
 fun bar(b: B): String {
     // Ok: local variable
     val tmp = if (b is A && b is C) b else null
     // Error: local function
-    fun <!OI;IMPLICIT_INTERSECTION_TYPE!>foo<!>(b: B) = if (b is A && b is C) b else null
+    fun <!IMPLICIT_INTERSECTION_TYPE{OI}!>foo<!>(b: B) = if (b is A && b is C) b else null
     return tmp.toString()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/implicitNestedIntersection.kt b/compiler/testData/diagnostics/tests/implicitNestedIntersection.kt
index 29c06aa94ef..02a83df85a8 100644
--- a/compiler/testData/diagnostics/tests/implicitNestedIntersection.kt
+++ b/compiler/testData/diagnostics/tests/implicitNestedIntersection.kt
@@ -8,7 +8,7 @@ open class B : In<B>
 
 fun <T> select(x: T, y: T) = x
 
-fun <!OI;IMPLICIT_INTERSECTION_TYPE!>foo2<!>() = select(A(), B()) // Type "In<A & B>" is prohibited in return position
+fun <!IMPLICIT_INTERSECTION_TYPE{OI}!>foo2<!>() = select(A(), B()) // Type "In<A & B>" is prohibited in return position
 
 
 
@@ -21,4 +21,4 @@ open class H : In<H>
 
 fun <S> select8(a: S, b: S, c: S, d: S, e: S, f: S, g: S, h: S) = a
 
-fun <!OI;IMPLICIT_INTERSECTION_TYPE!>foo8<!>() = select8(A(), B(), C(), D(), E(), F(), G(), H())
+fun <!IMPLICIT_INTERSECTION_TYPE{OI}!>foo8<!>() = select8(A(), B(), C(), D(), E(), F(), G(), H())
diff --git a/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility2.kt b/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility2.kt
index 16f5465c871..5c27abda677 100644
--- a/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility2.kt
+++ b/compiler/testData/diagnostics/tests/imports/CheckJavaVisibility2.kt
@@ -22,24 +22,24 @@ import j.JavaProtected
 import j.JavaPackageLocal
 
 class A {
-    val p1 = JavaPackageLocal.<!INVISIBLE_MEMBER("javaPPackage", "package-private", "'JavaPackageLocal'")!>javaPPackage<!>
-    val p2 = JavaProtected.<!INVISIBLE_MEMBER("javaPProtectedStatic", "protected", "'JavaProtected'")!>javaPProtectedStatic<!>
-    val p3 = JavaProtected().<!INVISIBLE_MEMBER("javaPProtectedPackage", "protected", "'JavaProtected'")!>javaPProtectedPackage<!>
+    val p1 = JavaPackageLocal.<!INVISIBLE_MEMBER("javaPPackage; package-private; 'JavaPackageLocal'")!>javaPPackage<!>
+    val p2 = JavaProtected.<!INVISIBLE_MEMBER("javaPProtectedStatic; protected; 'JavaProtected'")!>javaPProtectedStatic<!>
+    val p3 = JavaProtected().<!INVISIBLE_MEMBER("javaPProtectedPackage; protected; 'JavaProtected'")!>javaPProtectedPackage<!>
 
     fun test() {
-        JavaProtected.<!INVISIBLE_MEMBER("javaMProtectedStatic", "protected", "'JavaProtected'")!>javaMProtectedStatic<!>()
-        JavaPackageLocal.<!INVISIBLE_MEMBER("javaMPackage", "package-private", "'JavaPackageLocal'")!>javaMPackage<!>()
+        JavaProtected.<!INVISIBLE_MEMBER("javaMProtectedStatic; protected; 'JavaProtected'")!>javaMProtectedStatic<!>()
+        JavaPackageLocal.<!INVISIBLE_MEMBER("javaMPackage; package-private; 'JavaPackageLocal'")!>javaMPackage<!>()
     }
 }
 
 class B : JavaProtected() {
-    val p1 = JavaPackageLocal.<!INVISIBLE_MEMBER("javaPPackage", "package-private", "'JavaPackageLocal'")!>javaPPackage<!>
+    val p1 = JavaPackageLocal.<!INVISIBLE_MEMBER("javaPPackage; package-private; 'JavaPackageLocal'")!>javaPPackage<!>
     val p2 = JavaProtected.javaPProtectedStatic
     val p3 = javaPProtectedPackage
 
     fun test() {
         JavaProtected.javaMProtectedStatic()
-        JavaPackageLocal.<!INVISIBLE_MEMBER("javaMPackage", "package-private", "'JavaPackageLocal'")!>javaMPackage<!>()
+        JavaPackageLocal.<!INVISIBLE_MEMBER("javaMPackage; package-private; 'JavaPackageLocal'")!>javaMPackage<!>()
     }
 }
 
@@ -59,4 +59,4 @@ class C {
         JavaProtected.javaMProtectedStatic()
         JavaPackageLocal.javaMPackage()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/imports/CheckVisibility.txt b/compiler/testData/diagnostics/tests/imports/CheckVisibility.txt
index 6af6faf3f6d..5b4adcaeb22 100644
--- a/compiler/testData/diagnostics/tests/imports/CheckVisibility.txt
+++ b/compiler/testData/diagnostics/tests/imports/CheckVisibility.txt
@@ -39,7 +39,7 @@ package k {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
+
diff --git a/compiler/testData/diagnostics/tests/imports/ClassClash.txt b/compiler/testData/diagnostics/tests/imports/ClassClash.txt
index e92c79007c4..bd9dd8cb9c5 100644
--- a/compiler/testData/diagnostics/tests/imports/ClassClash.txt
+++ b/compiler/testData/diagnostics/tests/imports/ClassClash.txt
@@ -12,7 +12,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -27,13 +26,11 @@ package a {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(/*0*/ b: a.B): kotlin.Unit
 
-
 // -- Module: <top_m1> --
 package
 
@@ -45,7 +42,6 @@ public final class B {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <top_m2> --
 package
 
@@ -57,9 +53,9 @@ public final class B {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <top_m3> --
 package
 
 public fun test(/*0*/ b: B): kotlin.Unit
 public fun test2(/*0*/ b: B): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.fir.kt b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.fir.kt
index 73e0517a257..4d6a9736661 100644
--- a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.fir.kt
@@ -73,4 +73,4 @@ fun test(b: B) {
 
     val b_4 = <!UNRESOLVED_REFERENCE!>a<!>.<!UNRESOLVED_REFERENCE!>B<!>()
     b_4.<!UNRESOLVED_REFERENCE!>m2<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt
index 4d71e4b4e5f..54fe75a775d 100644
--- a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt
+++ b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt
@@ -71,6 +71,6 @@ fun test(b: B) {
     val b_3 = B()
     b_3.m2()
 
-    val b_4 = <!UNRESOLVED_REFERENCE!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>B<!>()
-    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b_4<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>m2<!>()
-}
\ No newline at end of file
+    val b_4 = <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>B<!>()
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b_4<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>m2<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.txt b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.txt
index d57fdc91579..7d582071e4d 100644
--- a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.txt
+++ b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.txt
@@ -12,7 +12,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -27,13 +26,11 @@ package a {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(/*0*/ b: a.B): kotlin.Unit
 
-
 // -- Module: <top_m1> --
 package
 
@@ -45,7 +42,6 @@ public final class B {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <top_m2> --
 package
 
@@ -57,8 +53,8 @@ public final class B {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <top_m3> --
 package
 
 public fun test(/*0*/ b: B): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.fir.kt b/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.fir.kt
index 1c31f98ab46..9894d98ef89 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.fir.kt
@@ -15,7 +15,7 @@ fun foo(): Klass {
     return Klass()
 }
 
-// FILE: anotherFromRootPackage.kt
+// FILE: yetAnotherFromRootPackage.kt
 package pkg
 
 import Klass
@@ -29,4 +29,4 @@ fun foo(): Klass {
 }
 
 val v: Nested = Nested()
-val x: NotImported = <!UNRESOLVED_REFERENCE!>NotImported<!>()
\ No newline at end of file
+val x: NotImported = <!UNRESOLVED_REFERENCE!>NotImported<!>()
diff --git a/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.kt b/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.kt
index db84d03504d..cbfa85a8f91 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.kt
+++ b/compiler/testData/diagnostics/tests/imports/ImportFromRootPackage.kt
@@ -15,7 +15,7 @@ fun foo(): Klass {
     return Klass()
 }
 
-// FILE: anotherFromRootPackage.kt
+// FILE: yetAnotherFromRootPackage.kt
 package pkg
 
 import Klass
@@ -29,4 +29,4 @@ fun foo(): Klass {
 }
 
 val v: Nested = Nested()
-val x: <!UNRESOLVED_REFERENCE!>NotImported<!> = <!UNRESOLVED_REFERENCE!>NotImported<!>()
\ No newline at end of file
+val x: <!UNRESOLVED_REFERENCE!>NotImported<!> = <!UNRESOLVED_REFERENCE!>NotImported<!>()
diff --git a/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.kt b/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.kt
index 223bc346c43..d6d091c0325 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.kt
+++ b/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.kt
@@ -42,4 +42,4 @@ fun test() {
     all()
     all(1)
     all("")
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.kt b/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.kt
index 568b1a01e0c..97c25f8d526 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.kt
+++ b/compiler/testData/diagnostics/tests/imports/ImportPrivateMember.kt
@@ -34,4 +34,4 @@ fun testAccess() {
     <!INVISIBLE_MEMBER!>InNested<!>()
     <!INVISIBLE_MEMBER!>NestedEntry<!>
     inObject()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.kt b/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.kt
index ea887baae85..d764dd4e60b 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.kt
+++ b/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.kt
@@ -1,5 +1,5 @@
 // FIR_IDENTICAL
-// FILE: b.kt
+// FILE: a.kt
 // KT-355 Resolve imports after all symbols are built
 
 package a
@@ -12,12 +12,12 @@ package b
 
   }
 
-// FILE: b.kt
+// FILE: c.kt
 package c
   import d.X
   val x : X = X()
 
-// FILE: b.kt
+// FILE: d.kt
 package d
   class X() {
 
diff --git a/compiler/testData/diagnostics/tests/imports/Imports.fir.kt b/compiler/testData/diagnostics/tests/imports/Imports.fir.kt
index e0d485a9252..592aaf07f9b 100644
--- a/compiler/testData/diagnostics/tests/imports/Imports.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/Imports.fir.kt
@@ -99,4 +99,4 @@ class A() {
         open class B() {}
         object C : B() {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/imports/Imports.kt b/compiler/testData/diagnostics/tests/imports/Imports.kt
index 3c311aaa7e1..fdd7ddd18f6 100644
--- a/compiler/testData/diagnostics/tests/imports/Imports.kt
+++ b/compiler/testData/diagnostics/tests/imports/Imports.kt
@@ -82,7 +82,7 @@ object C {
 }
 
 fun foo() {
-    if (<!UNRESOLVED_REFERENCE!>i<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> 3) <!UNRESOLVED_REFERENCE!>f<!>()
+    if (<!UNRESOLVED_REFERENCE!>i<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>==<!> 3) <!UNRESOLVED_REFERENCE!>f<!>()
 }
 
 //FILE:d.kt
@@ -99,4 +99,4 @@ class A() {
         open class B() {}
         object C : B() {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/imports/PackageLocalClassReferencedError.kt b/compiler/testData/diagnostics/tests/imports/PackageLocalClassReferencedError.kt
index 1919f02f6de..8e95fd5850d 100644
--- a/compiler/testData/diagnostics/tests/imports/PackageLocalClassReferencedError.kt
+++ b/compiler/testData/diagnostics/tests/imports/PackageLocalClassReferencedError.kt
@@ -8,4 +8,4 @@ package a
 
 import pack1.*
 
-private class X : <!INVISIBLE_MEMBER, INVISIBLE_REFERENCE!>SomeClass<!>()
\ No newline at end of file
+private class X : <!INVISIBLE_MEMBER, INVISIBLE_REFERENCE!>SomeClass<!>()
diff --git a/compiler/testData/diagnostics/tests/imports/PackageVsClass.txt b/compiler/testData/diagnostics/tests/imports/PackageVsClass.txt
index 53b074e7577..691923f3175 100644
--- a/compiler/testData/diagnostics/tests/imports/PackageVsClass.txt
+++ b/compiler/testData/diagnostics/tests/imports/PackageVsClass.txt
@@ -24,7 +24,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -48,7 +47,6 @@ package a {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -60,7 +58,6 @@ package a {
     public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 }
 
-
 // -- Module: <m4> --
 package
 
@@ -71,3 +68,4 @@ package a {
     public fun test(/*0*/ a_b: a.b): kotlin.Unit
     public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 }
+
diff --git a/compiler/testData/diagnostics/tests/imports/PrivateClassReferencedError.kt b/compiler/testData/diagnostics/tests/imports/PrivateClassReferencedError.kt
index 496ea86f828..9be9ddb70ef 100644
--- a/compiler/testData/diagnostics/tests/imports/PrivateClassReferencedError.kt
+++ b/compiler/testData/diagnostics/tests/imports/PrivateClassReferencedError.kt
@@ -11,4 +11,4 @@ package a
 
 import pack1.SomeClass.*
 
-private class X : <!FINAL_SUPERTYPE, INVISIBLE_MEMBER, INVISIBLE_REFERENCE!>N<!>()
\ No newline at end of file
+private class X : <!FINAL_SUPERTYPE, INVISIBLE_MEMBER, INVISIBLE_REFERENCE!>N<!>()
diff --git a/compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.txt b/compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.txt
index 21b3b083234..061a09d153b 100644
--- a/compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.txt
+++ b/compiler/testData/diagnostics/tests/imports/TopLevelClassVsPackage.txt
@@ -21,7 +21,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -43,10 +42,10 @@ public final class a {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(/*0*/ a_b: a.b): kotlin.Unit
 public fun test2(/*0*/ _a: a): kotlin.Unit
 public fun test3(/*0*/ _a: a): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/imports/WrongImport.fir.kt b/compiler/testData/diagnostics/tests/imports/WrongImport.fir.kt
index 5cd8ecce24e..a27c1812348 100644
--- a/compiler/testData/diagnostics/tests/imports/WrongImport.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/WrongImport.fir.kt
@@ -1,7 +1,7 @@
 // FILE:a.kt
 package a.b
 
-// FILE:a.kt
+// FILE:b.kt
 package a
 
 val foo = object {
@@ -47,7 +47,7 @@ class D {
 }
 
 
-// FILE:b.kt
+// FILE:c.kt
 import a
 import a.b
 
@@ -75,4 +75,4 @@ import a.D.bar.foo
 import a.D.Companion.foo
 import a.D.Companion.foo.bar
 import a.D.Companion.bar
-import a.D.Companion.bar.foo
\ No newline at end of file
+import a.D.Companion.bar.foo
diff --git a/compiler/testData/diagnostics/tests/imports/WrongImport.kt b/compiler/testData/diagnostics/tests/imports/WrongImport.kt
index 6124b2f935a..75ec168560f 100644
--- a/compiler/testData/diagnostics/tests/imports/WrongImport.kt
+++ b/compiler/testData/diagnostics/tests/imports/WrongImport.kt
@@ -1,7 +1,7 @@
 // FILE:a.kt
 package a.b
 
-// FILE:a.kt
+// FILE:b.kt
 package a
 
 val foo = object {
@@ -47,7 +47,7 @@ class D {
 }
 
 
-// FILE:b.kt
+// FILE:c.kt
 import <!PACKAGE_CANNOT_BE_IMPORTED!>a<!>
 import a.<!PACKAGE_CANNOT_BE_IMPORTED!>b<!>
 
@@ -75,4 +75,4 @@ import a.D.<!UNRESOLVED_REFERENCE!>bar<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!
 import a.D.Companion.foo
 import a.D.Companion.<!UNRESOLVED_REFERENCE!>foo<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>bar<!>
 import a.D.Companion.bar
-import a.D.Companion.<!UNRESOLVED_REFERENCE!>bar<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>
\ No newline at end of file
+import a.D.Companion.<!UNRESOLVED_REFERENCE!>bar<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>
diff --git a/compiler/testData/diagnostics/tests/imports/invisibleFakeReferenceInImport.kt b/compiler/testData/diagnostics/tests/imports/invisibleFakeReferenceInImport.kt
index 575c053a893..c96ca429845 100644
--- a/compiler/testData/diagnostics/tests/imports/invisibleFakeReferenceInImport.kt
+++ b/compiler/testData/diagnostics/tests/imports/invisibleFakeReferenceInImport.kt
@@ -13,4 +13,4 @@ object B : C<String>()
 
 open class C<T> {
     private var foo: String = "abc"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/imports/twoImportLists.kt b/compiler/testData/diagnostics/tests/imports/twoImportLists.kt
index beb036785ad..e9d4ec5ce4a 100644
--- a/compiler/testData/diagnostics/tests/imports/twoImportLists.kt
+++ b/compiler/testData/diagnostics/tests/imports/twoImportLists.kt
@@ -85,7 +85,7 @@ object C {
 }
 
 fun foo() {
-    if (<!UNRESOLVED_REFERENCE!>i<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> 3) <!UNRESOLVED_REFERENCE!>f<!>()
+    if (<!UNRESOLVED_REFERENCE!>i<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>==<!> 3) <!UNRESOLVED_REFERENCE!>f<!>()
 }
 
 //FILE:d.kt
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.fir.kt
index cb1263a3d90..9910f306a43 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.fir.kt
@@ -6,4 +6,4 @@ fun foo() {
     if (a == null) { //no senseless comparison
 
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt
index 507dcafdfd7..aa75c6f6be8 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt
@@ -3,7 +3,7 @@ package a
 
 fun foo() {
     val a = <!UNRESOLVED_REFERENCE!>getErrorType<!>()
-    if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> null) { //no senseless comparison
+    if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>==<!> null) { //no senseless comparison
 
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.fir.kt
index fbbf473506b..da8923cfadc 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.fir.kt
@@ -13,4 +13,4 @@ fun test(nothing: Nothing?) {
 fun sum(a : IntArray) : Int {
 <!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for (n
 <!SYNTAX!>return<!><!SYNTAX!><!> "?"<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt
index 4f13ef0db58..30fb9691a7b 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt
@@ -7,10 +7,10 @@ interface A<T>
 fun <T> infer(<!UNUSED_PARAMETER!>a<!>: A<T>) : T {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
 fun test(nothing: Nothing?) {
-    val <!UNUSED_VARIABLE!>i<!> = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_INCORPORATION_ERROR!>infer<!>(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>nothing<!>)
+    val <!UNUSED_VARIABLE!>i<!> = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>infer<!>(<!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>nothing<!>)
 }
 
 fun sum(<!UNUSED_PARAMETER!>a<!> : IntArray) : Int {
 for (n
 <!SYNTAX!>return<!><!SYNTAX!><!> "?"
-<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.fir.kt
index 45a84fffb57..08b91385fad 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.fir.kt
@@ -23,4 +23,4 @@ fun test2(l: <!UNRESOLVED_REFERENCE!>List<AA><!>) {
     l.<!UNRESOLVED_REFERENCE!>map<!> {
         <!UNRESOLVED_REFERENCE!>it<!>!!
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt
index d0a850944a2..8e85b832182 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt
@@ -3,18 +3,18 @@
 fun test1() {
     if (<!UNRESOLVED_REFERENCE!>rr<!>) {
         if (<!UNRESOLVED_REFERENCE!>l<!>) {
-            <!UNRESOLVED_REFERENCE!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>q<!>()
+            <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>q<!>()
         }
         else {
-            <!UNRESOLVED_REFERENCE!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>w<!>()
+            <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>w<!>()
         }
     }
     else {
         if (<!UNRESOLVED_REFERENCE!>n<!>) {
-            <!UNRESOLVED_REFERENCE!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>t<!>()
+            <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>t<!>()
         }
         else {
-            <!UNRESOLVED_REFERENCE!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>u<!>()
+            <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>u<!>()
         }
     }
 }
@@ -23,4 +23,4 @@ fun test2(l: List<<!UNRESOLVED_REFERENCE!>AA<!>>) {
     <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>l<!>.<!UNRESOLVED_REFERENCE!>map<!> {
         <!UNRESOLVED_REFERENCE!>it<!>!!
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.fir.kt
index d25e0ca5648..72d6ba7470d 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.fir.kt
@@ -5,4 +5,4 @@ fun main() {
     class Some
 
     Some[<!SYNTAX!><!>] <!UNRESOLVED_REFERENCE!>names<!> <!UNRESOLVED_REFERENCE!><!SYNTAX!>=<!> ["ads"]<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
index 1f872430702..c08815a2914 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
@@ -4,5 +4,5 @@ package bar
 fun main() {
     class Some
 
-    <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NO_COMPANION_OBJECT!>Some<!>[<!SYNTAX!><!>]<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>names<!> <!DEBUG_INFO_MISSING_UNRESOLVED!><!SYNTAX!>=<!> ["ads"]<!>
-}
\ No newline at end of file
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!><!NO_COMPANION_OBJECT!>Some<!>[<!SYNTAX!><!>]<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>names<!> <!DEBUG_INFO_MISSING_UNRESOLVED!><!SYNTAX!>=<!> ["ads"]<!>
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt
index 16e9526a5dc..1ee4851ed31 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt
@@ -6,6 +6,6 @@ fun <T, R> foo(<!UNUSED_PARAMETER!>map<!>: Map<T, R>) : R = throw Exception()
 fun <F, G> getMap() : Map<F, G> = throw Exception()
 
 fun bar123() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>(<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>getMap<!>(
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>getMap<!>(
 <!SYNTAX!><!>}
 
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt
index 5fc835b5310..8d6e152a049 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt
@@ -1,3 +1,3 @@
 package typeReferenceError
 
-<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class Pair<!><<!SYNTAX!><!>:(<!UNSUPPORTED!>val<!> <!UNSUPPORTED!>c<!>: <!SYNTAX!><!SYNTAX!><!>fun<!><!SYNTAX!><!> <!UNRESOLVED_REFERENCE!>main<!>()
\ No newline at end of file
+<!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>class Pair<!><<!SYNTAX!><!>:(<!UNSUPPORTED!>val<!> <!UNSUPPORTED!>c<!>: <!SYNTAX!><!SYNTAX!><!>fun<!><!SYNTAX!><!> <!UNRESOLVED_REFERENCE!>main<!>()
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.fir.kt
index bd83db1679b..5cc0f92201f 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.fir.kt
@@ -1,3 +1,3 @@
 package a
 
-fun foo(a: Any) = a ==<!SYNTAX!><!>
\ No newline at end of file
+fun foo(a: Any) = a ==<!SYNTAX!><!>
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.kt b/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.kt
index 0c8f84176ae..e3da41d2750 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.kt
@@ -1,3 +1,3 @@
 package a
 
-fun foo(a: Any) = a <!DEBUG_INFO_MISSING_UNRESOLVED!>==<!SYNTAX!><!><!>
\ No newline at end of file
+fun foo(a: Any) = a <!DEBUG_INFO_MISSING_UNRESOLVED!>==<!><!SYNTAX!><!>
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt b/compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt
index 63cec9e0adc..3e54c78d122 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt
@@ -17,4 +17,4 @@ fun x(f : Foo) {
     <!FUNCTION_EXPECTED!>R<!>()
 }
 
-object R {}
\ No newline at end of file
+object R {}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.fir.kt
index b79f12bebde..18062c5cbda 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.fir.kt
@@ -5,4 +5,4 @@ fun foo() {
         {
          break
     }
-}<!SYNTAX!><!><!>
\ No newline at end of file
+}<!><!SYNTAX!><!>
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.kt b/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.kt
index 94fb4030208..93bb360e871 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.kt
@@ -5,4 +5,4 @@ fun foo() {
         <!UNUSED_LAMBDA_EXPRESSION!>{
          <!BREAK_OR_CONTINUE_JUMPS_ACROSS_FUNCTION_BOUNDARY!>break<!>
     }<!>
-}<!SYNTAX!><!>
\ No newline at end of file
+}<!SYNTAX!><!>
diff --git a/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt b/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt
index 601fe8f3cb6..37e7f6ca7d1 100644
--- a/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt
+++ b/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt
@@ -4,7 +4,7 @@ fun <T: Any> fooT22() : T? {
 }
 
 fun foo1() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>fooT22<!>()
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>fooT22<!>()
 }
 
 val n : Nothing = null.sure()
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt
index 1f1748f38e1..52279435645 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt
@@ -5,5 +5,5 @@ fun <T> g(<!UNUSED_PARAMETER!>i<!>: Int, <!UNUSED_PARAMETER!>a<!>: Any): List<T>
 fun <T> g(<!UNUSED_PARAMETER!>a<!>: Any, <!UNUSED_PARAMETER!>i<!>: Int): Collection<T> {throw Exception()}
 
 fun <T> test() {
-    val <!UNUSED_VARIABLE!>c<!>: List<T> = <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>g<!>(1, 1)
+    val <!UNUSED_VARIABLE!>c<!>: List<T> = <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>g<!>(1, 1)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt
index 965935937bd..aacfd90bf3c 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt
@@ -4,4 +4,4 @@ package f
 fun <R> h(<!UNUSED_PARAMETER!>i<!>: Int, <!UNUSED_PARAMETER!>a<!>: Any, <!UNUSED_PARAMETER!>r<!>: R, <!UNUSED_PARAMETER!>f<!>: (Boolean) -> Int) = 1
 fun <R> h(<!UNUSED_PARAMETER!>a<!>: Any, <!UNUSED_PARAMETER!>i<!>: Int, <!UNUSED_PARAMETER!>r<!>: R, <!UNUSED_PARAMETER!>f<!>: (Boolean) -> Int) = 1
 
-fun test() = <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>h<!>(1, 1, 1, { <!OI;CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER!>b<!> -> 42 })
+fun test() = <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>h<!>(1, 1, 1, { <!CANNOT_INFER_PARAMETER_TYPE{OI}, UNUSED_ANONYMOUS_PARAMETER!>b<!> -> 42 })
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt
index c931bfe6635..ab48eba9767 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt
@@ -5,7 +5,7 @@ fun <T> f(<!UNUSED_PARAMETER!>i<!>: Int, <!UNUSED_PARAMETER!>c<!>: Collection<T>
 fun <T> f(<!UNUSED_PARAMETER!>a<!>: Any, <!UNUSED_PARAMETER!>l<!>: List<T>): Collection<T> {throw Exception()}
 
 fun <T> test(<!UNUSED_PARAMETER!>l<!>: List<T>) {
-    <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>f<!>(1, <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>())
+    <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>f<!>(1, <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyList<!>())
 }
 
 fun <T> emptyList(): List<T> {throw Exception()}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt
index d7f43c72444..db059c80eb6 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt
@@ -5,7 +5,7 @@ package f
 fun <R> h(<!UNUSED_PARAMETER!>f<!>: (Boolean) -> R) = 1
 fun <R> h(<!UNUSED_PARAMETER!>f<!>: (String) -> R) = 2
 
-fun test() = <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>h<!>{ <!OI;CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER!>i<!> -> getAnswer() }
+fun test() = <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>h<!>{ <!CANNOT_INFER_PARAMETER_TYPE{OI}, UNUSED_ANONYMOUS_PARAMETER!>i<!> -> getAnswer() }
 
 fun getAnswer() = 42
 
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/avoidCreatingUselessCapturedTypes.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/avoidCreatingUselessCapturedTypes.kt
index b7758a20fdb..7c473c054b8 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/avoidCreatingUselessCapturedTypes.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/avoidCreatingUselessCapturedTypes.kt
@@ -1192,7 +1192,7 @@ object Entities {
 //        "&nharr;" to 8622,
 //        "&nhArr;" to 8654,
 //        "&nhpar;" to 10994,
-//        "&ni;" to 8715,
+//        "&" to 8715{NI},
 //        "&nis;" to 8956,
 //        "&nisd;" to 8954,
 //        "&niv;" to 8715,
@@ -1260,7 +1260,7 @@ object Entities {
 //        "&NotLessTilde;" to 8820,
 //        "&NotNestedGreaterGreater;" to 10914,
 //        "&NotNestedLessLess;" to 10913,
-//        "&notni;" to 8716,
+//        "&not" to 8716{NI},
 //        "&notniva;" to 8716,
 //        "&notnivb;" to 8958,
 //        "&notnivc;" to 8957,
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.fir.kt
index a62783a1480..f340ddb3f7e 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.fir.kt
@@ -14,4 +14,4 @@ fun <T: Any> foo(l: Array<T>): Array<Array<T?>> = null!!
 fun test2(a: Array<in Int>) {
     val r: Array<out Array<in Int?>> = <!INAPPLICABLE_CANDIDATE!>foo<!>(a)
     <!INAPPLICABLE_CANDIDATE!>foo<!>(a)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.kt
index c5b21167335..50b478363d3 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.kt
@@ -5,13 +5,13 @@
 fun <T: Any> bar(a: Array<T>): Array<T?> =  null!!
 
 fun test1(a: Array<in Int>) {
-    val r: Array<in Int?> = <!OI;TYPE_INFERENCE_CANNOT_CAPTURE_TYPES!>bar<!>(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>a<!>)
-    <!OI;TYPE_INFERENCE_CANNOT_CAPTURE_TYPES!>bar<!>(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>a<!>)
+    val r: Array<in Int?> = <!TYPE_INFERENCE_CANNOT_CAPTURE_TYPES{OI}!>bar<!>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>a<!>)
+    <!TYPE_INFERENCE_CANNOT_CAPTURE_TYPES{OI}!>bar<!>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>a<!>)
 }
 
 fun <T: Any> foo(l: Array<T>): Array<Array<T?>> = null!!
 
 fun test2(a: Array<in Int>) {
-    val r: Array<out Array<in Int?>> = <!OI;TYPE_INFERENCE_CANNOT_CAPTURE_TYPES!>foo<!>(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>a<!>)
-    <!OI;TYPE_INFERENCE_CANNOT_CAPTURE_TYPES!>foo<!>(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>a<!>)
-}
\ No newline at end of file
+    val r: Array<out Array<in Int?>> = <!TYPE_INFERENCE_CANNOT_CAPTURE_TYPES{OI}!>foo<!>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>a<!>)
+    <!TYPE_INFERENCE_CANNOT_CAPTURE_TYPES{OI}!>foo<!>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>a<!>)
+}
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.kt
index 9d789bbac19..775986e5020 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.kt
@@ -5,15 +5,15 @@
 fun <T: Any> bar(a: Array<T>): Array<T?> =  null!!
 
 fun test1(a: Array<out Int>) {
-    val r: Array<out Int?> = <!NI;TYPE_MISMATCH!><!NI;UNSUPPORTED!>bar<!>(a)<!>
-    val t = <!NI;UNSUPPORTED!>bar<!>(a)
-    <!NI;UNSUPPORTED!>t<!> checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Array<out Int?>>() }
+    val r: Array<out Int?> = <!TYPE_MISMATCH{NI}!><!UNSUPPORTED{NI}!>bar<!>(a)<!>
+    val t = <!UNSUPPORTED{NI}!>bar<!>(a)
+    <!UNSUPPORTED{NI}!>t<!> checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Array<out Int?>>() }
 }
 
 fun <T: Any> foo(l: Array<T>): Array<Array<T?>> = null!!
 
 fun test2(a: Array<out Int>) {
-    val r: Array<out Array<out Int?>> = <!NI;TYPE_MISMATCH!><!NI;UNSUPPORTED!>foo<!>(a)<!>
-    val t = <!NI;UNSUPPORTED!>foo<!>(a)
-    <!NI;UNSUPPORTED!>t<!> checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Array<out Array<out Int?>>>() }
-}
\ No newline at end of file
+    val r: Array<out Array<out Int?>> = <!TYPE_MISMATCH{NI}!><!UNSUPPORTED{NI}!>foo<!>(a)<!>
+    val t = <!UNSUPPORTED{NI}!>foo<!>(a)
+    <!UNSUPPORTED{NI}!>t<!> checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Array<out Array<out Int?>>>() }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.kt
index 798a873c6ce..1ea84475a5f 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.kt
@@ -4,11 +4,11 @@
 fun <T : Any> Array<T?>.filterNotNull(): List<T> = throw Exception()
 
 fun test1(a: Array<out Int?>) {
-    val list = a.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>filterNotNull<!>()
-    <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>list<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED!>checkType<!> { <!NI;UNRESOLVED_REFERENCE!>_<!><List<Int>>() }
+    val list = a.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>filterNotNull<!>()
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}!>list<!> <!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>checkType<!> { <!UNRESOLVED_REFERENCE{NI}!>_<!><List<Int>>() }
 }
 
 fun test2(vararg a: Int?) {
-    val list = a.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>filterNotNull<!>()
-    <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>list<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED!>checkType<!> { <!NI;UNRESOLVED_REFERENCE!>_<!><List<Int>>() }
-}
\ No newline at end of file
+    val list = a.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>filterNotNull<!>()
+    <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}!>list<!> <!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>checkType<!> { <!UNRESOLVED_REFERENCE{NI}!>_<!><List<Int>>() }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromTypeParameterUpperBound.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromTypeParameterUpperBound.kt
index 603295865f2..d7ddb904184 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromTypeParameterUpperBound.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromTypeParameterUpperBound.kt
@@ -8,4 +8,4 @@ fun <Y: X, X : Inv<out String>> foo(x: X, y: Y) {
     rY.length
 }
 
-fun <Y> bar(<!UNUSED_PARAMETER!>l<!>: Inv<Y>): Y = TODO()
\ No newline at end of file
+fun <Y> bar(<!UNUSED_PARAMETER!>l<!>: Inv<Y>): Y = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.kt
index 1330874b71a..6876c77decb 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.kt
@@ -4,7 +4,7 @@
 fun <T> foo(array: Array<Array<T>>): Array<Array<T>> = array
 
 fun test(array: Array<Array<out Int>>) {
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>foo<!>(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>array<!>)
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>foo<!>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>array<!>)
 
-    val f: Array<out Array<out Int>> = <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>foo<!>(<!NI;TYPE_MISMATCH, TYPE_MISMATCH!>array<!>)
+    val f: Array<out Array<out Int>> = <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>foo<!>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>array<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturingFromArgumentOfFlexibleType.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/capturingFromArgumentOfFlexibleType.fir.kt
index da9fcf8d4e8..9170ce1d4fc 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/capturingFromArgumentOfFlexibleType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/capturingFromArgumentOfFlexibleType.fir.kt
@@ -14,5 +14,5 @@ fun <T> id(x: T) = null as T
 
 fun test() {
     Test.getFoo()
-    <!DEBUG_INFO_EXPRESSION_TYPE("Foo<out kotlin.Number..kotlin.Number?!>")!>id(Test.getFoo())<!>
+    id(Test.getFoo())
 }
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt
index a7bc59387b6..c014b688f9f 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt
@@ -5,6 +5,6 @@ fun <T> foo(a1: Array<T>, a2: Array<out T>): T = null!!
 
 fun test(a1: Array<in Int>, a2: Array<Int>) {
 
-    val c: Int = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>foo(a1, a2)<!>
+    val c: Int = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>foo(a1, a2)<!>
 
 }
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.kt
index c76464333f8..562c08ffc59 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.kt
@@ -3,5 +3,5 @@ fun <T> Array<T>.foo() {}
 
 fun test(array: Array<out Int>) {
     array.foo()
-    <!OI;TYPE_MISMATCH!>array<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>foo<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>out<!> Int>()
-}
\ No newline at end of file
+    <!TYPE_MISMATCH{OI}!>array<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>foo<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>out<!> Int>()
+}
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.kt
index 5e81dc3ae06..b0762e26070 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.kt
@@ -11,7 +11,7 @@ fun bar(b: B<in A<out Number>>, bOut: B<out A<out Number>>, bOut2: B<out A<Numbe
     foo(b)
     foo<Number>(b)
 
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>baz<!>(<!NI;TYPE_MISMATCH!>bOut<!>)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>baz<!>(<!TYPE_MISMATCH{NI}!>bOut<!>)
     baz<Number>(<!TYPE_MISMATCH!>bOut<!>)
 
     baz(bOut2)
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitWithNothingType.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitWithNothingType.kt
index c12790a34b9..80f7da81a83 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitWithNothingType.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionToUnitWithNothingType.kt
@@ -50,4 +50,4 @@ fun test(i: Inv<Nothing>, iUnit: Inv<Unit>) {
             run(A.flexible(iUnit)) { <!UNUSED_EXPRESSION!>42<!> }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.fir.kt
index fd1e8bfd4cf..e8c9562b975 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.fir.kt
@@ -10,4 +10,4 @@ fun b(): Unit = run {
     run {
         materializeNumber()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.kt
index 313b0300703..1092e4d8ec9 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.kt
@@ -3,11 +3,11 @@
 fun <T : Number> materializeNumber(): T = TODO()
 
 fun a(): Unit = run {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>materializeNumber<!>()
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>materializeNumber<!>()
 }
 
 fun b(): Unit = run {
     run {
-        <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>materializeNumber<!>()
+        <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>materializeNumber<!>()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.fir.kt
index ff5fd940d7f..400b2680b95 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.fir.kt
@@ -16,4 +16,4 @@ fun implicitCoercion() {
         // Error: block doesn't have an expected type, so call can't be inferred!
         return@l materialize()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.kt
index 9cfb3f61ced..0dc0c387722 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.kt
@@ -14,6 +14,6 @@ fun implicitCoercion() {
 
     val <!UNUSED_VARIABLE!>c<!> = l@{
         // Error: block doesn't have an expected type, so call can't be inferred!
-        return@l <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>materialize<!>()
+        return@l <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>materialize<!>()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.kt
index 7b021ff6e25..cbf72205d7a 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.kt
@@ -54,7 +54,7 @@ fun testParameter() {
     takeFnToParameter { Unit }
     takeFnToParameter { <!UNRESOLVED_REFERENCE!>unresolved<!>() }
     takeFnToParameter { if (true) <!UNRESOLVED_REFERENCE!>unresolved<!>() }
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>takeFnToParameter<!> {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>takeFnToParameter<!> {
         if (true) <!UNRESOLVED_REFERENCE!>unresolved<!>() else <!UNRESOLVED_REFERENCE!>unresolved<!>()
     }
     takeFnToParameter(fun() = Unit)
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.fir.kt
index 692bf78d0c0..db9d05d735c 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.fir.kt
@@ -33,4 +33,4 @@ fun e(): Unit = run outer@{
     run inner@{
         return@outer materialize()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.kt
index 18767e081e6..eb00be09446 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.kt
@@ -5,7 +5,7 @@ fun <T> materialize(): T = TODO()
 fun a(): Unit = run {
     run {
         // Ok, block is coerced, because it has (indirectly) Unit-expected type
-        <!NI;UNUSED_EXPRESSION!>"hello"<!>
+        <!UNUSED_EXPRESSION{NI}!>"hello"<!>
     }
 }
 
@@ -19,13 +19,13 @@ fun c(): Unit = run {
         // Attention!
         // In OI expected type 'Unit' isn't applied here because of implementation quirks (note that OI still applies Unit in case 'e')
         // In NI, it is applied and call is correctly inferred, which is consistent with the previous case
-        <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>materialize<!>()
+        <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>materialize<!>()
     }
 }
 
 fun d(): Unit = run outer@{
     run inner@{
-        return@inner <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>materialize<!>()
+        return@inner <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>materialize<!>()
     }
 }
 
@@ -33,4 +33,4 @@ fun e(): Unit = run outer@{
     run inner@{
         return@outer materialize()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.fir.kt
index 0ad0a0b5f99..d93c8e8e792 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.fir.kt
@@ -61,4 +61,4 @@ fun test_6(b: Boolean) {
         }
         if (b) {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.kt
index 88859a3e087..1b03a5bc33e 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.kt
@@ -48,7 +48,7 @@ fun bar(block: () -> String) {}
 
 fun test_5(b: Boolean) {
     bar {
-        <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>if (b) {
+        <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>if (b) {
             println("meh")
         }<!>
     }
@@ -61,4 +61,4 @@ fun test_6(b: Boolean) {
         }
         if (b) {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt
index 80392808388..87354f76355 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt
@@ -5,4 +5,4 @@ fun <T : Any> nullable(): T? = null
 
 fun test() {
     val value = nullable<Int>() ?: nullable()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt
index ab85e52ed9a..eff7f8de893 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt
@@ -4,5 +4,5 @@
 fun <T : Any> nullable(): T? = null
 
 fun test() {
-    val value = nullable<Int>() ?: <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>nullable()<!>
-}
\ No newline at end of file
+    val value = nullable<Int>() ?: <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>nullable()<!>
+}
diff --git a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt
index dacf903b75b..de77530c91f 100644
--- a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt
+++ b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt
@@ -14,6 +14,6 @@ fun <T: Any> joinT(<!UNUSED_PARAMETER!>x<!>: Comparable<*>, <!UNUSED_PARAMETER!>
 }
 
 fun test() {
-    val x2 = <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>joinT<!>(<!TYPE_MISMATCH!>Unit<!>, "2")
+    val x2 = <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>joinT<!>(<!TYPE_MISMATCH!>Unit<!>, "2")
     checkSubtype<String?>(x2)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt
index aa8a7108ab6..319d3edec7b 100644
--- a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt
+++ b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt
@@ -8,9 +8,9 @@ fun <R> elemAndList(r: R, <!UNUSED_PARAMETER!>t<!>: MutableList<R>): R = r
 fun <R> R.elemAndListWithReceiver(r: R, <!UNUSED_PARAMETER!>t<!>: MutableList<R>): R = r
 
 fun test() {
-    val <!UNUSED_VARIABLE!>s<!> = <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>elemAndList<!>(11, list("72"))
+    val <!UNUSED_VARIABLE!>s<!> = <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>elemAndList<!>(11, list("72"))
 
-    val <!UNUSED_VARIABLE!>u<!> = 11.<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>elemAndListWithReceiver<!>(4, list("7"))
+    val <!UNUSED_VARIABLE!>u<!> = 11.<!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>elemAndListWithReceiver<!>(4, list("7"))
 }
 
 fun <T> list(value: T) : ArrayList<T> {
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.fir.kt
index 17b3ea6aa8c..f8f2a5ee9e9 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.fir.kt
@@ -13,4 +13,4 @@ fun f(o: Out<Out<*>>, i: In<In<*>>, inv: Inv<Inv<*>>) {
     choose1(o)
     choose2(i)
     <!INAPPLICABLE_CANDIDATE!>choose3<!>(inv)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.kt b/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.kt
index c643d8c7f05..74bc67a8203 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.kt
@@ -11,6 +11,6 @@ fun <R> choose3(c: Inv<Inv<R>>) {}
 
 fun f(o: Out<Out<*>>, i: In<In<*>>, inv: Inv<Inv<*>>) {
     choose1(o)
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>choose2<!>(i)
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>choose3<!>(<!NI;TYPE_MISMATCH!>inv<!>)
-}
\ No newline at end of file
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>choose2<!>(i)
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>choose3<!>(<!TYPE_MISMATCH{NI}!>inv<!>)
+}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt
index 664b27f623f..564011e52c2 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt
@@ -3,7 +3,7 @@ package c
 
 import java.util.ArrayList
 
-fun Array<Int>.toIntArray(): IntArray = this.<!NI;TYPE_MISMATCH!><!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>mapTo<!>(<!NI;TYPE_MISMATCH!>IntArray(size)<!>, {it})<!>
+fun Array<Int>.toIntArray(): IntArray = this.<!TYPE_MISMATCH{NI}!><!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>mapTo<!>(<!TYPE_MISMATCH{NI}!>IntArray(size)<!>, {it})<!>
 
 fun Array<Int>.toArrayList(): ArrayList<Int> = this.mapTo(ArrayList<Int>(size), {it})
 
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.kt b/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.kt
index 088cc29d558..024ec3106f1 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/definitelyNotNullTypeInReturnPosition.kt
@@ -262,8 +262,8 @@ class Main<L>(x: L?, y: L) {
     val x471 = <!DEBUG_INFO_EXPRESSION_TYPE("OutBar<OutBar<OutBar<L!!>>>")!>foo47(y)<!>
 
     fun <R> takeLambda(block: () -> R): R = materialize()
-    val x480 = <!DEBUG_INFO_EXPRESSION_TYPE("Bar<L>")!><!DEBUG_INFO_LEAKING_THIS!>takeLambda<!> { foo48 { <!TYPE_MISMATCH("Any", "L"), TYPE_MISMATCH("Any", "L")!>x<!> } }<!>
-    val x481 = <!DEBUG_INFO_EXPRESSION_TYPE("Bar<L>")!><!DEBUG_INFO_LEAKING_THIS!>takeLambda<!> { foo48 { <!TYPE_MISMATCH("Any", "L"), TYPE_MISMATCH("Any", "L")!>y<!> } }<!>
+    val x480 = <!DEBUG_INFO_EXPRESSION_TYPE("Bar<L>")!><!DEBUG_INFO_LEAKING_THIS!>takeLambda<!> { foo48 { <!TYPE_MISMATCH("Any; L"), TYPE_MISMATCH("Any; L")!>x<!> } }<!>
+    val x481 = <!DEBUG_INFO_EXPRESSION_TYPE("Bar<L>")!><!DEBUG_INFO_LEAKING_THIS!>takeLambda<!> { foo48 { <!TYPE_MISMATCH("Any; L"), TYPE_MISMATCH("Any; L")!>y<!> } }<!>
     val x482 = <!DEBUG_INFO_EXPRESSION_TYPE("Bar<kotlin.Nothing>")!><!DEBUG_INFO_LEAKING_THIS!>takeLambda<!> { foo48 { null } }<!>
 }
 
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/kt6320.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/kt6320.fir.kt
index 14a5aea2e24..4c494a58fa8 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/kt6320.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/kt6320.fir.kt
@@ -18,4 +18,4 @@ class D<X, Z, Y : X>(foo: C<X, Z, Y>) {
     fun test(a: C<Y, Y, Y>) {
         val d: D<X, Y, Y> = D(a)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/kt6320.kt b/compiler/testData/diagnostics/tests/inference/constraints/kt6320.kt
index 7e5d332a515..4d638bb2270 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/kt6320.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/kt6320.kt
@@ -16,6 +16,6 @@ class C<X, Z, Y : X>
 
 class D<X, Z, Y : X>(<!UNUSED_PARAMETER!>foo<!>: C<X, Z, Y>) {
     fun test(a: C<Y, Y, Y>) {
-        val d: D<X, Y, Y> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>D(a)<!>
+        val d: D<X, Y, Y> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>D(a)<!>
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/kt8879.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/kt8879.fir.kt
index 3aa989f59b7..32a391b14a8 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/kt8879.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/kt8879.fir.kt
@@ -10,4 +10,4 @@ fun <X> bar(): Inv<X> = null!!
 
 fun test() {
     foo(bar())
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/kt8879.kt b/compiler/testData/diagnostics/tests/inference/constraints/kt8879.kt
index 12ffb646fa1..e357d1dc8f5 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/kt8879.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/kt8879.kt
@@ -9,5 +9,5 @@ fun <T: Inv2<T>> foo(klass: Inv<T>): String? = null
 fun <X> bar(): Inv<X> = null!!
 
 fun test() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>(<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!>())
-}
\ No newline at end of file
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>bar<!>())
+}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.fir.kt
index 85124e82e7f..66206f17c5c 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.fir.kt
@@ -29,4 +29,4 @@ fun test() {
     val a = MySettings.getSettings()
     a.getLinkedProjectsSettings()
     a.linkedProjectsSettings
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.kt b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.kt
index 72fc32469ec..d19f12d2a13 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToFlexibleRawTypes.kt
@@ -28,5 +28,5 @@ abstract class MySettingsListener<S extends MyComparableSettings> {}
 fun test() {
     val a = MySettings.getSettings()
     a.getLinkedProjectsSettings()
-    a.<!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>linkedProjectsSettings<!>
-}
\ No newline at end of file
+    a.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>linkedProjectsSettings<!>
+}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.fir.kt
index 499b2716ebd..a64feb0db8c 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.fir.kt
@@ -29,4 +29,4 @@ fun test() {
     val a = MySettings.getSettings()
     a.getLinkedProjectsSettings()
     a.linkedProjectsSettings
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.kt b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.kt
index 0e0bb5b1f3e..c3217126fad 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.kt
@@ -28,5 +28,5 @@ abstract class MySettingsListener<S extends MyComparableSettings> {}
 fun test() {
     val a = MySettings.getSettings()
     a.getLinkedProjectsSettings()
-    a.<!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>linkedProjectsSettings<!>
-}
\ No newline at end of file
+    a.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>linkedProjectsSettings<!>
+}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt
index c8fab579ed8..7cb0539a24c 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt
@@ -18,8 +18,8 @@ fun test(out: Out<Int>, i: In<Int>, inv: A<Int>) {
     r checkType { _<Int>() }
 
     // T? <: Int => error
-    <!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>doIn<!>(<!TYPE_MISMATCH!>i<!>)
+    <!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>doIn<!>(<!TYPE_MISMATCH!>i<!>)
 
     // T? >: Int => error
-    <!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>doA<!>(<!TYPE_MISMATCH!>inv<!>)
+    <!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>doA<!>(<!TYPE_MISMATCH!>inv<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.fir.kt b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.fir.kt
index 14f7068d274..754a8b78dc7 100644
--- a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.fir.kt
@@ -66,4 +66,4 @@ fun test1(int: Int, any: Any) {
     use(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13)
 }
 
-fun use(vararg a: Any) = a
\ No newline at end of file
+fun use(vararg a: Any) = a
diff --git a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt
index 328611b1157..b621e8df1d8 100644
--- a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt
+++ b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt
@@ -14,7 +14,7 @@ fun <T> readFromMyList(<!UNUSED_PARAMETER!>l<!>: MyList<out T>, <!UNUSED_PARAMET
 fun test1(int: Int, any: Any) {
     val a0 : MyList<Any> = getMyList(int)
 
-    val a1 : MyList<Int> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>getMyList(any)<!>
+    val a1 : MyList<Int> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>getMyList(any)<!>
 
     val a2 : MyList<out Any> = getMyList(int)
 
@@ -25,27 +25,27 @@ fun test1(int: Int, any: Any) {
     val a5 : MyList<in Int> = getMyListToWriteTo(any)
 
 
-    val a6 : MyList<in Any> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>getMyList<Int>(int)<!>
+    val a6 : MyList<in Any> = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>getMyList<Int>(int)<!>
     val a7 : MyList<in Any> = getMyList(int)
 
-    val a8 : MyList<in Any> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>getMyListToReadFrom<Int>(int)<!>
-    val a9 : MyList<in Any> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>getMyListToReadFrom(int)<!>
+    val a8 : MyList<in Any> = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>getMyListToReadFrom<Int>(int)<!>
+    val a9 : MyList<in Any> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>getMyListToReadFrom(int)<!>
 
-    val a10 : MyList<out Int> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>getMyList<Any>(any)<!>
-    val a11 : MyList<out Int> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>getMyList(any)<!>
+    val a10 : MyList<out Int> = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>getMyList<Any>(any)<!>
+    val a11 : MyList<out Int> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>getMyList(any)<!>
 
-    val a12 : MyList<out Int> = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>getMyListToWriteTo<Any>(any)<!>
-    val a13 : MyList<out Int> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>getMyListToWriteTo(any)<!>
+    val a12 : MyList<out Int> = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>getMyListToWriteTo<Any>(any)<!>
+    val a13 : MyList<out Int> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>getMyListToWriteTo(any)<!>
 
     useMyList(getMyList(int), int)
     useMyList(getMyList(any), int)
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>useMyList<!>(getMyList(int), any)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>useMyList<!>(getMyList(int), any)
 
     readFromMyList(getMyList(int), any)
     readFromMyList(getMyList(any), int)
-    readFromMyList<Int>(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>getMyList(any)<!>, int)
+    readFromMyList<Int>(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>getMyList(any)<!>, int)
 
-    readFromMyList<Int>(<!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>getMyListToReadFrom(any)<!>, int)
+    readFromMyList<Int>(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>getMyListToReadFrom(any)<!>, int)
     readFromMyList(getMyListToReadFrom(any), int)
 
     readFromMyList(getMyListToReadFrom(int), any)
@@ -54,16 +54,16 @@ fun test1(int: Int, any: Any) {
     writeToMyList(getMyList(any), int)
     writeToMyList<Any>(getMyList(int), any)
     writeToMyList(getMyList<Any>(int), any)
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>writeToMyList<!>(getMyList(int), any)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>writeToMyList<!>(getMyList(int), any)
 
     writeToMyList(getMyListToWriteTo(any), int)
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>writeToMyList<!>(getMyListToWriteTo(int), any)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>writeToMyList<!>(getMyListToWriteTo(int), any)
 
     readFromMyList(getMyListToWriteTo(any), any)
 
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>writeToMyList<!>(getMyListToReadFrom(any), <!NI;TYPE_MISMATCH!>any<!>)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>writeToMyList<!>(getMyListToReadFrom(any), <!TYPE_MISMATCH{NI}!>any<!>)
 
     use(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13)
 }
 
-fun use(vararg a: Any) = a
\ No newline at end of file
+fun use(vararg a: Any) = a
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.fir.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.fir.kt
index 1dac5d3aeb0..d7e5f529abb 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.fir.kt
@@ -10,4 +10,4 @@ fun <T> foo2(): T = TODO()
 val test = foo2().plus("") as String
 
 fun <T> T.bar() = this
-val barTest = "".bar() as Number
\ No newline at end of file
+val barTest = "".bar() as Number
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.kt
index d74ac39652f..7debdb39f03 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.kt
@@ -7,7 +7,7 @@ fun <T> foo() = foo() <!UNCHECKED_CAST!>as T<!>
 
 fun <T> foo2(): T = TODO()
 
-val test = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo2<!>().<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>plus<!>("") as String
+val test = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo2<!>().<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>plus<!>("") as String
 
 fun <T> T.bar() = this
-val barTest = "".bar() <!CAST_NEVER_SUCCEEDS!>as<!> Number
\ No newline at end of file
+val barTest = "".bar() <!CAST_NEVER_SUCCEEDS!>as<!> Number
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.kt
index 1745e3d04a5..d77ed65040f 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.kt
@@ -9,10 +9,10 @@ class A {
 
 fun <V> id(value: V) = value
 
-val asA = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>().<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>fooA<!>() as A
+val asA = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>().<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>fooA<!>() as A
 
-val receiverParenthesized = (<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>()).<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>fooA<!>() as A
-val no2A = A().<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>fooA<!>().<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>fooA<!>() as A
+val receiverParenthesized = (<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>()).<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>fooA<!>() as A
+val no2A = A().<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>fooA<!>().<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>fooA<!>() as A
 
 val correct1 = A().fooA() as A
 val correct2 = foo<A>().fooA() as A
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.kt
index 16c79581202..88e0d3f9ed5 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.kt
@@ -7,7 +7,7 @@ fun <V> id(value: V) = value
 
 val asString = foo() as String
 
-val viaId = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>id<!>(<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>()) as String
+val viaId = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>id<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>()) as String
 
 val insideId = id(foo() as String)
 
@@ -17,5 +17,5 @@ val asStarList = foo() as List<*>
 
 val safeAs = foo() as? String
 
-val fromIs = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>() is String
-val fromNoIs = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>() !is String
+val fromIs = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>() is String
+val fromNoIs = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>() !is String
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.fir.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.fir.kt
index c1054a13671..0f25ac22342 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.fir.kt
@@ -15,4 +15,4 @@ fun <S, D: S> g() {
     val y = foo() as Int
 
     val y2 = foo() as D
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.kt
index 523db01ca2d..bf83286aed6 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.kt
@@ -12,7 +12,7 @@ fun test(x: X<Number>) {
 fun <S, D: S> g() {
     fun <T : S> foo(): T = TODO()
 
-    val <!UNUSED_VARIABLE!>y<!> = <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>foo<!>() as Int
+    val <!UNUSED_VARIABLE!>y<!> = <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo<!>() as Int
 
     val <!UNUSED_VARIABLE!>y2<!> = foo() as D
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.fir.kt b/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.fir.kt
index 705e7193760..4b14922b7a1 100644
--- a/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.fir.kt
@@ -4,4 +4,4 @@ fun <X, Y, Z> foo(f: (Y) -> Z, g: (X) -> Y, x: X): Z = f(g(x))
 
 // TODO: Actually, this is a bug and will work when new inference is enabled
 // see ([NI] Select variable with proper non-trivial constraint first) for more details
-fun test() = foo({ it + 1 }, { it.length }, "")
\ No newline at end of file
+fun test() = foo({ it + 1 }, { it.length }, "")
diff --git a/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.kt b/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.kt
index 8de287264d8..1cf0161c059 100644
--- a/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.kt
+++ b/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.kt
@@ -4,4 +4,4 @@ fun <X, Y, Z> foo(f: (Y) -> Z, g: (X) -> Y, x: X): Z = f(g(x))
 
 // TODO: Actually, this is a bug and will work when new inference is enabled
 // see ([NI] Select variable with proper non-trivial constraint first) for more details
-fun test() = <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>({ it + 1 }, { it.length }, "")
\ No newline at end of file
+fun test() = <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>({ it + 1 }, { it.length }, "")
diff --git a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt
index 9f543b11387..593c530fff0 100644
--- a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt
+++ b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt
@@ -13,5 +13,5 @@ fun test() {
     val q = foo(fun Int.() {}, emptyList()) //type inference no information for parameter error
     checkSubtype<Int>(q)
 
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>({}, <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>())
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>({}, <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyList<!>())
 }
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt
index 8d7337641a6..4f080355f6b 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt
@@ -26,4 +26,4 @@ fun test(s: SelectorFor<State>): Double {
     e checkType { _<AbstractSelector<State, Nothing>>() }
 
     return null!!
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.kt
index 2b134d0d5d5..afbb3233dc7 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.kt
@@ -25,5 +25,5 @@ fun test(s: SelectorFor<State>): Double {
     val e = s { return p1 }
     e checkType { _<AbstractSelector<State, Nothing>>() }
 
-    <!OI;UNREACHABLE_CODE!>return<!> null!!
-}
\ No newline at end of file
+    <!UNREACHABLE_CODE{OI}!>return<!> null!!
+}
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.kt
index 97ce5d18665..5a490697679 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.kt
@@ -14,4 +14,4 @@ fun test(s: String): String {
 
     <!UNREACHABLE_CODE!>val b =<!> TestClass { return s }
     <!UNREACHABLE_CODE!>b checkType { _<Nothing>() }<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/kt28598.fir.kt b/compiler/testData/diagnostics/tests/inference/kt28598.fir.kt
index ca11b71ef73..79603513ffe 100644
--- a/compiler/testData/diagnostics/tests/inference/kt28598.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt28598.fir.kt
@@ -82,4 +82,4 @@ fun case_3(a: MutableList<MutableList<MutableList<MutableList<MutableList<Mutabl
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/kt28598.kt b/compiler/testData/diagnostics/tests/inference/kt28598.kt
index ebf15016ee6..4e6ed61c7b9 100644
--- a/compiler/testData/diagnostics/tests/inference/kt28598.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt28598.kt
@@ -3,7 +3,7 @@
 
 fun case_1(a: MutableList<out MutableList<MutableList<MutableList<MutableList<MutableList<MutableList<Int?>?>?>?>?>?>?>?) {
     if (a != null) {
-        val b = <!OI;DEBUG_INFO_SMARTCAST!>a<!>[0] // no SMARTCAST diagnostic
+        val b = <!DEBUG_INFO_SMARTCAST{OI}!>a<!>[0] // no SMARTCAST diagnostic
         if (b != null) {
             val c = <!DEBUG_INFO_SMARTCAST!>b<!>[0]
             if (c != null) {
@@ -31,19 +31,19 @@ fun case_1(a: MutableList<out MutableList<MutableList<MutableList<MutableList<Mu
 
 fun case_2(a: MutableList<out MutableList<MutableList<MutableList<out MutableList<MutableList<MutableList<out Int?>?>?>?>?>?>?>?) {
     if (a != null) {
-        val b = <!OI;DEBUG_INFO_SMARTCAST!>a<!>[0] // no SMARTCAST diagnostic
+        val b = <!DEBUG_INFO_SMARTCAST{OI}!>a<!>[0] // no SMARTCAST diagnostic
         if (b != null) {
             val c = <!DEBUG_INFO_SMARTCAST!>b<!>[0]
             if (c != null) {
                 val d = <!DEBUG_INFO_SMARTCAST!>c<!>[0]
                 if (d != null) {
-                    val e = <!OI;DEBUG_INFO_SMARTCAST!>d<!>[0] // no SMARTCAST diagnostic
+                    val e = <!DEBUG_INFO_SMARTCAST{OI}!>d<!>[0] // no SMARTCAST diagnostic
                     if (e != null) {
                         val f = <!DEBUG_INFO_SMARTCAST!>e<!>[0]
                         if (f != null) {
                             val g = <!DEBUG_INFO_SMARTCAST!>f<!>[0]
                             if (g != null) {
-                                val h = <!OI;DEBUG_INFO_SMARTCAST!>g<!>[0] // no SMARTCAST diagnostic
+                                val h = <!DEBUG_INFO_SMARTCAST{OI}!>g<!>[0] // no SMARTCAST diagnostic
                                 if (h != null) {
                                     <!DEBUG_INFO_SMARTCAST!>h<!>.inc()
                                 }
@@ -82,4 +82,4 @@ fun case_3(a: MutableList<MutableList<MutableList<MutableList<MutableList<Mutabl
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/kt28654.fir.kt b/compiler/testData/diagnostics/tests/inference/kt28654.fir.kt
index d9bf315a610..0aaeeb85abf 100644
--- a/compiler/testData/diagnostics/tests/inference/kt28654.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt28654.fir.kt
@@ -7,4 +7,4 @@ fun <K> select(): K = run { }
 fun test() {
     val x: Int = select()
     val t = select()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/kt28654.kt b/compiler/testData/diagnostics/tests/inference/kt28654.kt
index fd601d32661..87aa044e490 100644
--- a/compiler/testData/diagnostics/tests/inference/kt28654.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt28654.kt
@@ -2,9 +2,9 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // Related issue: KT-28654
 
-fun <K> select(): K = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>run <!NI;TYPE_MISMATCH!>{ <!OI;TYPE_MISMATCH!><!>}<!><!>
+fun <K> select(): K = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>run <!TYPE_MISMATCH{NI}!>{ <!TYPE_MISMATCH{OI}!><!>}<!><!>
 
 fun test() {
     val x: Int = select()
-    val t = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>select<!>()
-}
\ No newline at end of file
+    val t = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>select<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/inference/kt6175.fir.kt b/compiler/testData/diagnostics/tests/inference/kt6175.fir.kt
index ec110cd53a7..75ccd5a614d 100644
--- a/compiler/testData/diagnostics/tests/inference/kt6175.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt6175.fir.kt
@@ -46,4 +46,4 @@ fun test4() {
     }
 }
 
-fun fail(): Nothing = throw Exception()
\ No newline at end of file
+fun fail(): Nothing = throw Exception()
diff --git a/compiler/testData/diagnostics/tests/inference/kt6175.kt b/compiler/testData/diagnostics/tests/inference/kt6175.kt
index d06a41f36f1..18728dd16ab 100644
--- a/compiler/testData/diagnostics/tests/inference/kt6175.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt6175.kt
@@ -4,10 +4,10 @@
 fun <T, R : Any> foo(body: (R?) -> T): T = fail()
 
 fun test1() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!> {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!> {
         true
     }
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!> { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> ->
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!> { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> ->
         true
     }
 }
@@ -16,10 +16,10 @@ fun test1() {
 fun <T, R> bar(body: (R) -> T): T = fail()
 
 fun test2() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!> {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>bar<!> {
         true
     }
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!> { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> ->
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>bar<!> { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> ->
         true
     }
 }
@@ -27,10 +27,10 @@ fun test2() {
 fun <T, R> baz(body: (List<R>) -> T): T = fail()
 
 fun test3() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>baz<!> {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>baz<!> {
         true
     }
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>baz<!> { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> ->
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>baz<!> { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> ->
         true
     }
 }
@@ -38,12 +38,12 @@ fun test3() {
 fun <T, R : Any> brr(body: (List<R?>) -> T): T = fail()
 
 fun test4() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>brr<!> {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>brr<!> {
         true
     }
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>brr<!> { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> ->
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>brr<!> { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> ->
         true
     }
 }
 
-fun fail(): Nothing = throw Exception()
\ No newline at end of file
+fun fail(): Nothing = throw Exception()
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.fir.kt b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.fir.kt
index 8abe5806286..3f42aaa8e0b 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.fir.kt
@@ -69,4 +69,4 @@ fun test5() {
 }
 
 //use
-fun use(vararg a: Any?) = a
\ No newline at end of file
+fun use(vararg a: Any?) = a
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt
index 6ae1bb2865e..0cc066b7744 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt
@@ -14,7 +14,7 @@ fun <T> id(t: T): T = t
 infix fun <T> Z.foo(a: A<T>): A<T> = a
 
 fun test(z: Z) {
-    z <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!> <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>newA<!>()
+    z <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>newA<!>()
     val a: A<Int> = id(z foo newA())
     val b: A<Int> = id(z.foo(newA()))
     use(a, b)
@@ -24,7 +24,7 @@ fun test(z: Z) {
 operator fun <T> Z.plus(a: A<T>): A<T> = a
 
 fun test1(z: Z) {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>id<!>(z <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>+<!> <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>newA<!>())
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>id<!>(z <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>+<!> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>newA<!>())
     val a: A<Z> = z + newA()
     val b: A<Z> = z.plus(newA())
     val c: A<Z> = id(z + newA())
@@ -36,7 +36,7 @@ fun test1(z: Z) {
 operator fun <T> Z.compareTo(a: A<T>): Int { use(a); return 1 }
 
 fun test2(z: Z) {
-    val a: Boolean = id(z <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!><<!> <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>newA<!>())
+    val a: Boolean = id(z <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!><<!> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>newA<!>())
     val b: Boolean = id(z < newA<Z>())
     use(a, b)
 }
@@ -45,18 +45,18 @@ fun test2(z: Z) {
 fun Z.<!EXTENSION_SHADOWED_BY_MEMBER!>equals<!>(any: Any): Int { use(any); return 1 }
 
 fun test3(z: Z) {
-    z <!NI;EQUALS_MISSING!>==<!> <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>newA<!>()
+    z <!EQUALS_MISSING{NI}!>==<!> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>newA<!>()
     z == newA<Z>()
-    id(z <!NI;EQUALS_MISSING!>==<!> <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>newA<!>())
+    id(z <!EQUALS_MISSING{NI}!>==<!> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>newA<!>())
     id(z == newA<Z>())
 
-    id(z === <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>newA<!>())
+    id(z === <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>newA<!>())
     id(z === newA<Z>())
 }
 
 //'in' operation
 fun test4(collection: Collection<A<*>>) {
-    id(<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>newA<!>() in collection)
+    id(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>newA<!>() in collection)
     id(newA<Int>() in collection)
 }
 
@@ -64,9 +64,9 @@ fun test4(collection: Collection<A<*>>) {
 fun <T> toBeOrNot(): Boolean = throw Exception()
 
 fun test5() {
-    if (<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>toBeOrNot<!>() && <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>toBeOrNot<!>()) {}
+    if (<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>toBeOrNot<!>() && <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>toBeOrNot<!>()) {}
     if (toBeOrNot<Int>() && toBeOrNot<Int>()) {}
 }
 
 //use
-fun use(vararg a: Any?) = a
\ No newline at end of file
+fun use(vararg a: Any?) = a
diff --git a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.fir.kt b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.fir.kt
index 1c9eed8c115..293293ec857 100644
--- a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.fir.kt
@@ -12,4 +12,4 @@ fun test() {
 
 fun <S> newList() : ArrayList<S> {
     return ArrayList<S>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt
index b08fc1b568f..b2f2d163bf9 100644
--- a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt
+++ b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt
@@ -5,11 +5,11 @@ package noInformationForParameter
 import java.util.*
 
 fun test() {
-    val <!UNUSED_VARIABLE!>n<!> = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>newList<!>()
+    val <!UNUSED_VARIABLE!>n<!> = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>newList<!>()
 
     val <!UNUSED_VARIABLE!>n1<!> : List<String> = newList()
 }
 
 fun <S> newList() : ArrayList<S> {
     return ArrayList<S>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.kt b/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.kt
index 1aefa65531d..bea54d8c504 100644
--- a/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.kt
+++ b/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.kt
@@ -15,19 +15,19 @@ fun testAny() {
 
 fun testAnyCall() {
     callAny {
-        <!CANNOT_INFER_PARAMETER_TYPE, NI;UNUSED_ANONYMOUS_PARAMETER!>error<!> -> <!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NI;DEBUG_INFO_MISSING_UNRESOLVED!>error<!>()<!>
+        <!CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER{NI}!>error<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}!><!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>error<!>()<!>
     }
 }
 
 fun testParam() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>callParam<!> {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>callParam<!> {
         <!CANNOT_INFER_PARAMETER_TYPE!>param<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>param<!>
     }
 }
 
 fun testParamCall() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>callParam<!> {
-        <!CANNOT_INFER_PARAMETER_TYPE, NI;UNUSED_ANONYMOUS_PARAMETER!>param<!> -> <!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NI;DEBUG_INFO_MISSING_UNRESOLVED!>param<!>()<!>
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>callParam<!> {
+        <!CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER{NI}!>param<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}!><!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>param<!>()<!>
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.kt b/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.kt
index 282d2b8ac78..d4cd160d60e 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.kt
@@ -11,9 +11,9 @@ fun foo(action: (Int) -> Unit) {
 }
 
 fun test1() {
-    call({ <!NI;CANNOT_INFER_PARAMETER_TYPE!>x<!> -> println(<!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!>::class) }) // x inside the lambda is inferred to `Nothing`, the lambda is `(Nothing) -> Unit`.
+    call({ <!CANNOT_INFER_PARAMETER_TYPE{NI}!>x<!> -> println(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}!>x<!>::class) }) // x inside the lambda is inferred to `Nothing`, the lambda is `(Nothing) -> Unit`.
 }
 
 fun test2() {
-    ::foo.<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>call<!>({ <!NI;CANNOT_INFER_PARAMETER_TYPE!>x<!> -> println(<!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!>::class) })
+    ::foo.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>call<!>({ <!CANNOT_INFER_PARAMETER_TYPE{NI}!>x<!> -> println(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}!>x<!>::class) })
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.kt b/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.kt
index a119e762694..8e07c6a6294 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.kt
@@ -5,8 +5,8 @@ fun <K> select2(x: K, y: K): K = TODO()
 fun <K> select3(x: K, y: K, z: K): K = TODO()
 
 fun test2(f: ((String) -> Int)?) {
-    val a0: ((Int) -> Int)? = select2(<!OI;TYPE_MISMATCH!>{ <!OI;CANNOT_INFER_PARAMETER_TYPE!>it<!> -> <!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> }<!>, null)
-    val b0: ((Nothing) -> Unit)? = select2(<!OI;TYPE_MISMATCH!>{ <!OI;CANNOT_INFER_PARAMETER_TYPE!>it<!> -> <!NI;UNUSED_EXPRESSION, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> }<!>, null)
+    val a0: ((Int) -> Int)? = select2(<!TYPE_MISMATCH{OI}!>{ <!CANNOT_INFER_PARAMETER_TYPE{OI}!>it<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}!>it<!> }<!>, null)
+    val b0: ((Nothing) -> Unit)? = select2(<!TYPE_MISMATCH{OI}!>{ <!CANNOT_INFER_PARAMETER_TYPE{OI}!>it<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, UNUSED_EXPRESSION{NI}!>it<!> }<!>, null)
 
     select3({ it.length }, f, null)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.kt b/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.kt
index d3623a6b6a3..161b292d409 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.kt
@@ -6,11 +6,11 @@ fun <I> id(arg: I): I = arg
 fun <S> select(vararg args: S): S = TODO()
 
 fun test() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>id<!>(
-        <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>make<!>()
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>id<!>(
+        <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>make<!>()
     )
 
     select(make(), null)
 
-    <!OI;TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT!>if<!> (true) <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>make()<!> else TODO()
+    <!TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT{OI}!>if<!> (true) <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>make()<!> else TODO()
 }
diff --git a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.fir.kt b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.fir.kt
index 9a3c0019831..f8302f0d9b8 100644
--- a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.fir.kt
@@ -11,4 +11,4 @@ fun test() {
 
     val y = g<Int> { Collections.emptyList() }
     val z : List<Int> = g { Collections.emptyList() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt
index b02a17c8f3c..6110eee09a3 100644
--- a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt
+++ b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt
@@ -7,8 +7,8 @@ fun <T> g (<!UNUSED_PARAMETER!>f<!>: () -> List<T>) : T {<!NO_RETURN_IN_FUNCTION
 
 fun test() {
     //here possibly can be a cycle on constraints
-    val <!UNUSED_VARIABLE!>x<!> = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>g<!> { Collections.<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>() }
+    val <!UNUSED_VARIABLE!>x<!> = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>g<!> { Collections.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyList<!>() }
 
     val <!UNUSED_VARIABLE!>y<!> = g<Int> { Collections.emptyList() }
-    val <!UNUSED_VARIABLE!>z<!> : List<Int> = g { Collections.<!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>() }
-}
\ No newline at end of file
+    val <!UNUSED_VARIABLE!>z<!> : List<Int> = g { Collections.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyList<!>() }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.kt
index 89184ee31a2..9c65de5ded1 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.kt
@@ -29,6 +29,6 @@ fun chained2(arg: First) = run {
 }
 
 fun test(arg: First) {
-    chained1(arg).<!NI;UNRESOLVED_REFERENCE!>first<!>()
-    chained2(arg).<!NI;UNRESOLVED_REFERENCE!>first<!>()
+    chained1(arg).<!UNRESOLVED_REFERENCE{NI}!>first<!>()
+    chained2(arg).<!UNRESOLVED_REFERENCE{NI}!>first<!>()
 }
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.kt
index c8c08df2c07..bd23b67db6e 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.kt
@@ -17,11 +17,11 @@ fun <S> intersect(vararg elements: S): S = TODO()
 fun intersectAfterSmartCast(arg: Base, arg2: Base) = intersect(
     run {
         if (arg !is One) throw Exception()
-        <!NI;DEBUG_INFO_SMARTCAST!>arg<!>
+        <!DEBUG_INFO_SMARTCAST{NI}!>arg<!>
     },
     run {
         if (arg2 !is Two) throw Exception()
-        <!NI;DEBUG_INFO_SMARTCAST!>arg2<!>
+        <!DEBUG_INFO_SMARTCAST{NI}!>arg2<!>
     }
 )
 
@@ -33,6 +33,6 @@ fun intersectArgWithSmartCastFromLambda(arg: One, arg2: Base) = argOrFn(arg) {
 }
 
 fun test() {
-    intersectAfterSmartCast(O1, O2).<!NI;UNRESOLVED_REFERENCE!>base<!>()
-    intersectArgWithSmartCastFromLambda(O1, O2).<!NI;UNRESOLVED_REFERENCE!>base<!>()
+    intersectAfterSmartCast(O1, O2).<!UNRESOLVED_REFERENCE{NI}!>base<!>()
+    intersectArgWithSmartCastFromLambda(O1, O2).<!UNRESOLVED_REFERENCE{NI}!>base<!>()
 }
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.kt
index 42665f9e35b..21b2d66a2b5 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.kt
@@ -18,5 +18,5 @@ fun smartCastAfterIntersection(a: One, b: Two) = run {
 }
 
 fun test(one: One, two: Two) {
-    smartCastAfterIntersection(one, two)<!NI;UNNECESSARY_SAFE_CALL!>?.<!><!NI;UNRESOLVED_REFERENCE!>base<!>()
+    smartCastAfterIntersection(one, two)<!UNNECESSARY_SAFE_CALL{NI}!>?.<!><!UNRESOLVED_REFERENCE{NI}!>base<!>()
 }
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.kt
index c9260062a90..fb48437117c 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.kt
@@ -21,5 +21,5 @@ fun <S> intersectNoBound(vararg elements: S): S = TODO()
 fun some(a: One, b: Two, c: Three) = intersectNoBound(intersect(a, b), c)
 
 fun test(arg: Base, arg2: Base) {
-    some(O1, O2, O3).<!NI;UNRESOLVED_REFERENCE!>base<!>()
+    some(O1, O2, O3).<!UNRESOLVED_REFERENCE{NI}!>base<!>()
 }
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.kt b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.kt
index 65b80fa267d..b46cb2378ed 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.kt
@@ -3,7 +3,7 @@
 fun foo() {
     fun fact(n: Int) = {
         if (n > 0) {
-            <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED!>fact<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>n<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>-<!> 1)<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>*<!> n
+            <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED!>fact<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>n<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>-<!> 1)<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>*<!> n
         }
         else {
             1
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt
index 695d1762643..45213345f01 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt
@@ -2,8 +2,8 @@
 fun foo() {
     fun bar1() = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED!>bar1<!>()<!>
 
-    fun bar2() = 1 + <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!NI;DEBUG_INFO_MISSING_UNRESOLVED!>bar2<!>()<!>
-    fun bar3() = id(<!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!NI;DEBUG_INFO_MISSING_UNRESOLVED!>bar3<!>()<!>)
+    fun bar2() = 1 + <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>bar2<!>()<!>
+    fun bar3() = id(<!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>bar3<!>()<!>)
 }
 
 fun <T> id(x: T) = x
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.fir.kt
index bef26ff67bc..bfd456688bc 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.fir.kt
@@ -7,4 +7,4 @@ fun <T> asList(t: T) : List<T>? {}
 
 fun main() {
     val list : List<String> = asList("")
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
index 7718028a1cf..fd661b51400 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
@@ -6,5 +6,5 @@ package d
 fun <T> asList(<!UNUSED_PARAMETER!>t<!>: T) : List<T>? {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
 fun main() {
-    val <!UNUSED_VARIABLE!>list<!> : List<String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>asList("")<!>
-}
\ No newline at end of file
+    val <!UNUSED_VARIABLE!>list<!> : List<String> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>asList("")<!>
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
index 531db47b897..bd5f419506a 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
@@ -6,7 +6,7 @@ package n
 import checkSubtype
 
 fun main() {
-    val <!UNUSED_VARIABLE!>a<!> = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>array<!>(<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>array<!>())
+    val <!UNUSED_VARIABLE!>a<!> = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>array<!>(<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>array<!>())
     val <!UNUSED_VARIABLE!>a0<!> : Array<Array<Int>> = array(array())
     val a1 = array(array<Int>())
     checkSubtype<Array<Array<Int>>>(a1)
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt
index 7ead3c4ae8b..d3c758841bd 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt
@@ -10,5 +10,5 @@ fun <A, B> Foo<A>.map(<!UNUSED_PARAMETER!>f<!>: (A) -> B): Foo<B> = object : Foo
 
 fun foo() {
     val l: Foo<String> = object : Foo<String> {}
-    val <!UNUSED_VARIABLE!>m<!>: Foo<String> = l.<!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>map { <!UNUSED_ANONYMOUS_PARAMETER!>ppp<!> -> <!NI;CONSTANT_EXPECTED_TYPE_MISMATCH, NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!> }<!>
+    val <!UNUSED_VARIABLE!>m<!>: Foo<String> = l.<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>map { <!UNUSED_ANONYMOUS_PARAMETER!>ppp<!> -> <!CONSTANT_EXPECTED_TYPE_MISMATCH{NI}, CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>1<!> }<!>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.fir.kt
index dc8b9a5cb70..9750fce3ffa 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.fir.kt
@@ -25,4 +25,4 @@ abstract class Buggy {
 }
 
 //from library
-fun <T: Any> Iterable<T>.find(predicate: (T) -> Boolean) : T? {}
\ No newline at end of file
+fun <T: Any> Iterable<T>.find(predicate: (T) -> Boolean) : T? {}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt
index b3f2414cddd..7131f595301 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt
@@ -12,17 +12,17 @@ abstract class Buggy {
     }
 
     val anotherThree : Int
-        get() = <!NI;TYPE_MISMATCH!>coll.<!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>find{ it > 3 }<!><!> // does not work here
+        get() = <!TYPE_MISMATCH{NI}!>coll.<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>find{ it > 3 }<!><!> // does not work here
 
     val yetAnotherThree : Int
-        get() = <!NI;TYPE_MISMATCH!>coll.<!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>find({ v:Int -> v > 3 })<!><!> // neither here
+        get() = <!TYPE_MISMATCH{NI}!>coll.<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>find({ v:Int -> v > 3 })<!><!> // neither here
 
     val extendedGetter : Int
         get() {
-            return <!NI;TYPE_MISMATCH!>coll.<!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>find{ it > 3 }<!><!>  // not even here!
+            return <!TYPE_MISMATCH{NI}!>coll.<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>find{ it > 3 }<!><!>  // not even here!
         }
 
 }
 
 //from library
-fun <T: Any> Iterable<T>.find(<!UNUSED_PARAMETER!>predicate<!>: (T) -> Boolean) : T? {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+fun <T: Any> Iterable<T>.find(<!UNUSED_PARAMETER!>predicate<!>: (T) -> Boolean) : T? {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.fir.kt
index 2cef6dc4105..96938cad1ec 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.fir.kt
@@ -9,4 +9,4 @@ fun main() {
     }
 }
 
-fun <R> test(callback: (R) -> Unit):Unit = callback(null!!)
\ No newline at end of file
+fun <R> test(callback: (R) -> Unit):Unit = callback(null!!)
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt
index a9d9f2a8bd1..45cbc5ce470 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt
@@ -4,9 +4,9 @@
 package a
 
 fun main() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test<!> {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>test<!> {
 
     }
 }
 
-fun <R> test(callback: (R) -> Unit):Unit = callback(null!!)
\ No newline at end of file
+fun <R> test(callback: (R) -> Unit):Unit = callback(null!!)
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt
index dc6a3ce7806..8717cf23160 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt
@@ -9,5 +9,5 @@ fun <T> _arrayList(vararg <!UNUSED_PARAMETER!>values<!>: T) : List<T> = throw Ex
 class _Pair<A>(val a: A)
 
 fun test() {
-    _arrayList(_Pair(1))._sortBy <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>{ <!UNUSED_ANONYMOUS_PARAMETER!>it<!> -> <!UNRESOLVED_REFERENCE!>xxx<!> }<!>
+    _arrayList(_Pair(1))._sortBy <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>{ <!UNUSED_ANONYMOUS_PARAMETER!>it<!> -> <!UNRESOLVED_REFERENCE!>xxx<!> }<!>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.fir.kt
index 45478c1fbf0..eb292dfecd2 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.fir.kt
@@ -16,4 +16,4 @@ fun test1(a: Int) {
 
 fun test2(a: Int) {
     bar(a, throw Exception())
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt
index 871c61e5f5c..30528f3fab6 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt
@@ -8,7 +8,7 @@ fun <T> bar(a: T, b: Map<T, String>) = b.get(a)
 
 fun test(a: Int) {
     foo(a, null)
-    <!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>bar<!>(a, <!NULL_FOR_NONNULL_TYPE!>null<!>)
+    <!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>bar<!>(a, <!NULL_FOR_NONNULL_TYPE!>null<!>)
 }
 fun test1(a: Int) {
     foo(a, throw Exception())
@@ -16,4 +16,4 @@ fun test1(a: Int) {
 
 fun test2(a: Int) {
     bar(a, throw Exception())
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.fir.kt
index 6e9756905d9..82db36f9aa0 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.fir.kt
@@ -30,4 +30,4 @@ fun testWithoutInference(col: MutableCollection<Int>) {
     doAction { col.add(2) }
     
     val u: Unit = col.add(2)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt
index 31cb85319f3..4cd5c6a2764 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt
@@ -22,7 +22,7 @@ fun test() {
     
     doAction { bar(12) }
 
-    val <!UNUSED_VARIABLE!>u<!>: Unit =  <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>bar(11)<!>
+    val <!UNUSED_VARIABLE!>u<!>: Unit =  <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>bar(11)<!>
 }
 
 fun testWithoutInference(col: MutableCollection<Int>) {
@@ -30,4 +30,4 @@ fun testWithoutInference(col: MutableCollection<Int>) {
     doAction { col.add(2) }
     
     val <!UNUSED_VARIABLE!>u<!>: Unit = <!TYPE_MISMATCH!>col.add(2)<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.kt
index 3e94df7f850..35470d64a5c 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.kt
@@ -12,5 +12,5 @@ fun <V, T : V?> G<T>.foo(vararg values: V2<V?>) = build()
 fun forReference(ref: Any?) {}
 
 fun test() {
-    forReference(G<Int?>::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>foo<!>)
+    forReference(G<Int?>::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, CANNOT_COMPLETE_RESOLVE{OI}!>foo<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.kt
index 30aa30da9b5..2e4ae2b6767 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.kt
@@ -7,5 +7,5 @@ fun foo(i: Long) {}
 fun bar(f: (Boolean) -> Unit) {}
 
 fun test() {
-    bar(::<!NI;CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY, OI;NONE_APPLICABLE!>foo<!>)
+    bar(::<!CALLABLE_REFERENCE_RESOLUTION_AMBIGUITY{NI}, NONE_APPLICABLE{OI}!>foo<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt33629.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt33629.kt
index 065b0801b11..44f0512eb4f 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt33629.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt33629.kt
@@ -17,5 +17,5 @@ fun acquireIntervals(): List<Interval> = TODO()
 
 fun main() {
     buildTree(acquireIntervals())
-        ?: <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!><!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>()<!>
+        ?: <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>emptyList<!>()<!>
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt
index a47c7211b08..c5ac3622711 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt
@@ -6,7 +6,7 @@ fun <K> id(arg: K): K = arg
 
 fun test() {
     id(<!UNRESOLVED_REFERENCE!>unresolved<!>)<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
-    <!UNRESOLVED_REFERENCE!>unresolved<!>!!<!NI;UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
+    <!UNRESOLVED_REFERENCE!>unresolved<!>!!<!UNNECESSARY_NOT_NULL_ASSERTION{NI}!>!!<!>
     try {
         id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
     } catch (e: Exception) {
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt
index d2625902a26..46346cda080 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt
@@ -4,11 +4,11 @@ fun <K> id(arg: K): K = arg
 fun <M> materialize(): M = TODO()
 
 fun test(b: Boolean) {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>id<!>(if (b) {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>id<!>(if (b) {
         id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
     } else {
-        <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>id<!>(
-            <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>materialize<!>()
+        <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>id<!>(
+            <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>materialize<!>()
         )
     })
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt41394.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt41394.fir.kt
deleted file mode 100644
index 50cc43d36a4..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt41394.fir.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER
-// !LANGUAGE: +InferenceCompatibility
-
-fun <T, VR : T> foo(x: T, fn: (VR?, T) -> Unit) {}
-
-fun takeInt(x: Int) {}
-
-fun main(x: Int) {
-    foo(x) { prev: Int?, new -> <!INAPPLICABLE_CANDIDATE!>takeInt<!>(new) } // `new` is `Int` in OI, `Int?` in NI
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt41394.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt41394.kt
index ba68e417ef0..6f7c27a0989 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt41394.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt41394.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER
 // !LANGUAGE: +InferenceCompatibility
 
@@ -7,4 +8,4 @@ fun takeInt(x: Int) {}
 
 fun main(x: Int) {
     foo(x) { prev: Int?, new -> takeInt(new) } // `new` is `Int` in OI, `Int?` in NI
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt702.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt702.kt
index 71f5142a0f6..189b7d2ebdb 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt702.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt702.kt
@@ -17,4 +17,4 @@ public class Throwables() {
             propagateIfInstanceOf(throwable, getJavaClass<RuntimeException?>()) // Type inference failed: Mismatch while expanding constraints
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
index e8a55a78751..c4e1d0d98e5 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
@@ -16,6 +16,6 @@ fun <T, G> A<T>.foo(x: (T)-> G): G {
 
 fun main() {
     val a = A(1)
-    val t: String = <!NI;TYPE_MISMATCH!>a.<!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>foo({p -> <!TYPE_MISMATCH!>p<!>})<!><!>
+    val t: String = <!TYPE_MISMATCH{NI}!>a.<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>foo({p -> <!TYPE_MISMATCH!>p<!>})<!><!>
     checkSubtype<String>(t)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
index aff7a34c740..f1d0df486da 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
@@ -10,4 +10,4 @@ fun <T, Q> List<T>.map1(f: (T)-> Q): List<T>? = tail!!.map1(f)
 
 fun <T, Q> List<T>.map2(f: (T)-> Q): List<T>? = tail.sure().map2(f)
 
-fun <T, Q> List<T>.map3(f: (T)-> Q): List<T>? = <!OI;TYPE_MISMATCH!>tail<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>sure<!><<!OI;UPPER_BOUND_VIOLATED!>T<!>>().<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>map3<!>(f)
\ No newline at end of file
+fun <T, Q> List<T>.map3(f: (T)-> Q): List<T>? = <!TYPE_MISMATCH{OI}!>tail<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>sure<!><<!UPPER_BOUND_VIOLATED{OI}!>T<!>>().<!DEBUG_INFO_MISSING_UNRESOLVED{NI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{OI}!>map3<!>(f)
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt832.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt832.fir.kt
index d7f6d23d92a..892754ed03c 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt832.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt832.fir.kt
@@ -8,4 +8,4 @@ fun <T> fooT2() : (t : T) -> T {
 
 fun test() {
     fooT2()(1) // here 1 should not be marked with an error
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt832.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt832.kt
index 5f0417bd072..4e7c917d2fb 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt832.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt832.kt
@@ -7,5 +7,5 @@ fun <T> fooT2() : (t : T) -> T {
 }
 
 fun test() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>fooT2<!>()(1) // here 1 should not be marked with an error
-}
\ No newline at end of file
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>fooT2<!>()(1) // here 1 should not be marked with an error
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
index 4459f60c7a4..421fb2445e1 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
@@ -13,7 +13,7 @@ fun <T> emptyList() : List<T>? = ArrayList<T>()
 fun foo() {
     // type arguments shouldn't be required
     val <!UNUSED_VARIABLE!>l<!> : List<Int> = emptyList()!!
-    val <!UNUSED_VARIABLE!>l1<!> = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>()!!
+    val <!UNUSED_VARIABLE!>l1<!> = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyList<!>()!!
 
     checkSubtype<List<Int>>(emptyList()!!)
     checkSubtype<List<Int>?>(emptyList())
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.fir.kt
index b2ae4f1fe28..06cc3058d82 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.fir.kt
@@ -14,4 +14,4 @@ fun test() {
     bar { it <!UNRESOLVED_REFERENCE!>+<!> 1 }
     bar { x -> x <!UNRESOLVED_REFERENCE!>+<!> 1}
     bar { x: Int -> x + 1}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt
index 1bc71031708..666c2bf038b 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt
@@ -7,11 +7,11 @@ fun <T, R> foo(a: A<T, R>) = a
 fun <T, R> bar(f: (T) -> R) = f
 
 fun test() {
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>foo<!> <!TYPE_MISMATCH!>{ <!UNRESOLVED_REFERENCE!>it<!> }<!>
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>foo<!> <!TYPE_MISMATCH!>{ <!CANNOT_INFER_PARAMETER_TYPE!>x<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!>}<!>
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>foo<!> <!TYPE_MISMATCH!>{ x: Int -> x}<!>
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>foo<!> <!TYPE_MISMATCH!>{ <!UNRESOLVED_REFERENCE!>it<!> }<!>
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>foo<!> <!TYPE_MISMATCH!>{ <!CANNOT_INFER_PARAMETER_TYPE!>x<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!>}<!>
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>foo<!> <!TYPE_MISMATCH!>{ x: Int -> x}<!>
 
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!> { <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1 }
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!> { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1}
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>bar<!> { <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> 1 }
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>bar<!> { <!CANNOT_INFER_PARAMETER_TYPE!>x<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> 1}
     bar { x: Int -> x + 1}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt
index e97fdd3c825..c68608f66a6 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt
@@ -4,7 +4,7 @@ package aa
 fun <T, R> foo(block: (T)-> R) = block
 
 fun test1() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!> {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!> {
         <!CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER!>x<!> ->  // here we have 'cannot infer parameter type' error
         43
     }
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.fir.kt
index 14ef9857089..7874eeadf0e 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.fir.kt
@@ -10,4 +10,4 @@ fun test() {
 
     ret("foo")
     <!INAPPLICABLE_CANDIDATE!>ret<!>(42)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.kt
index 6bde24e0526..95f2d3a8dc8 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.kt
@@ -8,6 +8,6 @@ fun test() {
     id2(<!UNRESOLVED_REFERENCE!>unresolved<!>, "foo")
     id2(<!UNRESOLVED_REFERENCE!>unresolved<!>, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!>)
 
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>ret<!>("foo")
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>ret<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!>)
-}
\ No newline at end of file
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>ret<!>("foo")
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>ret<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!>)
+}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/reportUnresolvedReferenceWrongReceiverForManyCandidates.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/reportUnresolvedReferenceWrongReceiverForManyCandidates.kt
index 1bbfca02be7..a39d4876be5 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/reportUnresolvedReferenceWrongReceiverForManyCandidates.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/reportUnresolvedReferenceWrongReceiverForManyCandidates.kt
@@ -5,4 +5,4 @@ fun test() {
 operator fun A.unaryMinus() {}
 operator fun B.unaryMinus() {}
 class A
-class B
\ No newline at end of file
+class B
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.fir.kt
index 984f1fee42b..36b993c41cd 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.fir.kt
@@ -10,4 +10,4 @@ fun test() {
 }
 
 // from standard library
-fun <T> arrayListOf(vararg values: T) : MutableList<T> {}
\ No newline at end of file
+fun <T> arrayListOf(vararg values: T) : MutableList<T> {}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt
index 567a463e450..9c6e5bccc09 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt
@@ -5,9 +5,9 @@ fun <R> foo (f: ()->R, r: MutableList<R>) = r.add(f())
 fun <R> bar (r: MutableList<R>, f: ()->R) = r.add(f())
 
 fun test() {
-    val <!UNUSED_VARIABLE!>a<!> = <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>foo<!>({1}, arrayListOf("")) //no type inference error on 'arrayListOf'
-    val <!UNUSED_VARIABLE!>b<!> = <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>bar<!>(arrayListOf(""), {1})
+    val <!UNUSED_VARIABLE!>a<!> = <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>foo<!>({1}, arrayListOf("")) //no type inference error on 'arrayListOf'
+    val <!UNUSED_VARIABLE!>b<!> = <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>bar<!>(arrayListOf(""), {1})
 }
 
 // from standard library
-fun <T> arrayListOf(vararg <!UNUSED_PARAMETER!>values<!>: T) : MutableList<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+fun <T> arrayListOf(vararg <!UNUSED_PARAMETER!>values<!>: T) : MutableList<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.fir.kt
index 2a4bbf399ba..a3deb300a16 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.fir.kt
@@ -7,4 +7,4 @@ operator fun <T> X.component1(): T = TODO()
 
 fun test() {
     val (y) = X()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.kt
index 7bae629094a..44d9ec08cd5 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.kt
@@ -6,5 +6,5 @@ class X
 operator fun <T> X.component1(): T = TODO()
 
 fun test() {
-    val (y) = <!NI;COMPONENT_FUNCTION_MISSING, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>X()<!>
-}
\ No newline at end of file
+    val (y) = <!COMPONENT_FUNCTION_MISSING{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>X()<!>
+}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.fir.kt
index 065818b1da8..1ae94dc5341 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.fir.kt
@@ -6,4 +6,4 @@ operator fun <T> X.iterator(): Iterable<T> = TODO()
 fun test() {
     <!UNRESOLVED_REFERENCE, UNRESOLVED_REFERENCE!>for (i in X()) {
     }<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.kt
index bf07e2b5f72..1e6454a861b 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.kt
@@ -4,6 +4,6 @@ class X
 operator fun <T> X.iterator(): Iterable<T> = TODO()
 
 fun test() {
-    for (i in <!NI;ITERATOR_MISSING, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>X()<!>) {
+    for (i in <!ITERATOR_MISSING{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>X()<!>) {
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt
index 2857bd951f9..6585c269550 100644
--- a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt
+++ b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt
@@ -5,9 +5,9 @@ package typeConstructorMismatch
 import java.util.*
 
 fun test(set: Set<String>) {
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>elemAndList<!>("2", <!TYPE_MISMATCH!>set<!>)
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>elemAndList<!>("2", <!TYPE_MISMATCH!>set<!>)
 
-    "".<!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>elemAndListWithReceiver<!>("", <!TYPE_MISMATCH!>set<!>)
+    "".<!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>elemAndListWithReceiver<!>("", <!TYPE_MISMATCH!>set<!>)
 }
 
 fun <R> elemAndList(r: R, <!UNUSED_PARAMETER!>t<!>: List<R>): R = r
diff --git a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.fir.kt b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.fir.kt
index e620f3720a9..65adab20a79 100644
--- a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.fir.kt
@@ -39,4 +39,4 @@ fun test2(outA: Out<A>, inC: In<C>) {
     use(b)
 }
 
-fun use(vararg a: Any?) = a
\ No newline at end of file
+fun use(vararg a: Any?) = a
diff --git a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt
index 999c6a6a498..4a9573ce1aa 100644
--- a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt
+++ b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt
@@ -4,7 +4,7 @@ package typeInferenceExpectedTypeMismatch
 import java.util.*
 
 fun test() {
-    val s : Set<Int> = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>newList()<!>
+    val s : Set<Int> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>newList()<!>
     use(s)
 }
 
@@ -26,17 +26,17 @@ fun <T, R> foo(o: Out<T>, i: In<R>): Two<T, R> = throw Exception("$o $i")
 fun test1(outA: Out<A>, inB: In<B>) {
     foo(outA, inB)
 
-    val b: Two<A, C> = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>foo(outA, inB)<!>
+    val b: Two<A, C> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>foo(outA, inB)<!>
     use(b)
 }
 
 fun <T> bar(o: Out<T>, i: In<T>): Two<T, T> = throw Exception("$o $i")
 
 fun test2(outA: Out<A>, inC: In<C>) {
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>bar<!>(outA, <!NI;TYPE_MISMATCH!>inC<!>)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>bar<!>(outA, <!TYPE_MISMATCH{NI}!>inC<!>)
 
-    val b: Two<A, B> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!><!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>bar<!>(outA, <!NI;TYPE_MISMATCH!>inC<!>)<!>
+    val b: Two<A, B> = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!><!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>bar<!>(outA, <!TYPE_MISMATCH{NI}!>inC<!>)<!>
     use(b)
 }
 
-fun use(vararg a: Any?) = a
\ No newline at end of file
+fun use(vararg a: Any?) = a
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt
index e10a80675fc..b0de8d3f355 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt
@@ -6,7 +6,7 @@ interface A
 fun <T> emptyList(): List<T> = throw Exception()
 
 fun test1() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>()
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyList<!>()
 }
 
 //--------------
@@ -14,7 +14,7 @@ fun test1() {
 fun <T: A> emptyListOfA(): List<T> = throw Exception()
 
 fun test2() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyListOfA<!>()
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyListOfA<!>()
 }
 
 //--------------
@@ -22,7 +22,7 @@ fun test2() {
 fun <T: A, R: T> emptyStrangeMap(): Map<T, R> = throw Exception()
 
 fun test3() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyStrangeMap<!>()
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyStrangeMap<!>()
 }
 
 //--------------
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt
index 9c7631f212b..1eb55cc189a 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt
@@ -15,7 +15,7 @@ fun <T> foo(in1: In<T>, in2: In<T>): T = throw Exception("$in1 $in2")
 
 fun test(inA: In<A>, inB: In<B>, inC: In<C>) {
 
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>foo<!>(inA, inB)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>foo<!>(inA, inB)
 
     val r = foo(inA, inC)
     checkSubtype<C>(r)
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/typeParameterAsUpperBound.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/typeParameterAsUpperBound.kt
index 4c57d990a7b..ac059f090e5 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/typeParameterAsUpperBound.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/typeParameterAsUpperBound.kt
@@ -13,4 +13,4 @@ fun usage(c: List<String>) {
 
     val cs = c.ifEmpty { listOf("x") }
     cs checkType { _<List<String>>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.fir.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.fir.kt
index 17a39c6633e..5980f137ce2 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.fir.kt
@@ -20,4 +20,4 @@ fun test(a: Any, s: MutableSet<String>) {
 }
 
 //from standard library
-fun <T> arrayListOf(vararg t: T): MutableList<T> {}
\ No newline at end of file
+fun <T> arrayListOf(vararg t: T): MutableList<T> {}
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt
index 0ad0211a464..eb4d5600c16 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt
@@ -16,8 +16,8 @@ fun <T> checkItIsExactlyAny(<!UNUSED_PARAMETER!>t<!>: T, <!UNUSED_PARAMETER!>l<!
 fun <V : U, U> baz(<!UNUSED_PARAMETER!>v<!>: V, u: MutableSet<U>) = u
 
 fun test(a: Any, s: MutableSet<String>) {
-    <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>baz<!>(a, <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>s<!>)
+    <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>baz<!>(a, <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>s<!>)
 }
 
 //from standard library
-fun <T> arrayListOf(vararg <!UNUSED_PARAMETER!>t<!>: T): MutableList<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+fun <T> arrayListOf(vararg <!UNUSED_PARAMETER!>t<!>: T): MutableList<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/infos/SmartCasts.kt b/compiler/testData/diagnostics/tests/infos/SmartCasts.kt
index fd99a7e520e..d95e16160d6 100644
--- a/compiler/testData/diagnostics/tests/infos/SmartCasts.kt
+++ b/compiler/testData/diagnostics/tests/infos/SmartCasts.kt
@@ -89,17 +89,17 @@ fun f13(a : A?) {
   }
   else {
     a?.foo()
-    <!UNRESOLVED_REFERENCE!>c<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>bar<!>()
+    <!UNRESOLVED_REFERENCE!>c<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>bar<!>()
   }
 
   a?.foo()
   if (!(a is B)) {
     a?.foo()
-    <!UNRESOLVED_REFERENCE!>c<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>bar<!>()
+    <!UNRESOLVED_REFERENCE!>c<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>bar<!>()
   }
   else {
     <!DEBUG_INFO_SMARTCAST!>a<!>.foo()
-    <!UNRESOLVED_REFERENCE!>c<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>bar<!>()
+    <!UNRESOLVED_REFERENCE!>c<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>bar<!>()
   }
 
   a?.foo()
@@ -109,7 +109,7 @@ fun f13(a : A?) {
   }
   else {
     a?.foo()
-    <!UNRESOLVED_REFERENCE!>c<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>bar<!>()
+    <!UNRESOLVED_REFERENCE!>c<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>bar<!>()
   }
 
   if (!(a is B) || !(a is C)) {
@@ -202,7 +202,7 @@ fun mergeSmartCasts(a: Any?) {
     val <!UNUSED_VARIABLE!>i<!>: Int = <!DEBUG_INFO_SMARTCAST!>a<!>.compareTo("")
   }
   if (a is String && <!DEBUG_INFO_SMARTCAST!>a<!>.compareTo("") == 0) {}
-  if (a is String || a.<!UNRESOLVED_REFERENCE!>compareTo<!>("") <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> 0) {}
+  if (a is String || a.<!UNRESOLVED_REFERENCE!>compareTo<!>("") <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>==<!> 0) {}
 }
 
 //mutability
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.fir.kt b/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.fir.kt
index 16901d9e259..d641299f7b2 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.fir.kt
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.fir.kt
@@ -15,15 +15,15 @@ inline operator fun <T, U, V> @ExtensionFunctionType Function2<T, U, V>.plus(p:
     this - p
 }
 
-<!CONFLICTING_OVERLOADS!>inline fun <T, U, V> inlineFunWithInvoke(s: (p: T) -> U, ext: T.(p: U) -> V) {
+inline fun <T, U, V> inlineFunWithInvoke(s: (p: T) -> U, ext: T.(p: U) -> V) {
     s + s
     ext + ext
-}<!>
+}
 
-<!CONFLICTING_OVERLOADS!>inline fun <T, U, V> inlineFunWithInvoke(s: (p: T) -> U, ext: T.(p: U) -> V) {
+inline fun <T, U, V> inlineFunWithInvoke(s: (p: T) -> U, ext: T.(p: U) -> V) {
     s + s
     ext + ext
-}<!>
+}
 
 inline fun <T, U> Function1<T, U>.submit() {
     this + this
diff --git a/compiler/testData/diagnostics/tests/inline/kt15410.fir.kt b/compiler/testData/diagnostics/tests/inline/kt15410.fir.kt
index 5ab655383bb..3f918cef175 100644
--- a/compiler/testData/diagnostics/tests/inline/kt15410.fir.kt
+++ b/compiler/testData/diagnostics/tests/inline/kt15410.fir.kt
@@ -7,4 +7,4 @@ inline fun foo(f: () -> Unit) = object: Foo() {}
 
 class A : Foo() {
     inline fun foo(f: () -> Unit) = Foo()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inline/kt15410.kt b/compiler/testData/diagnostics/tests/inline/kt15410.kt
index f2421a1319f..4946119d85a 100644
--- a/compiler/testData/diagnostics/tests/inline/kt15410.kt
+++ b/compiler/testData/diagnostics/tests/inline/kt15410.kt
@@ -6,5 +6,5 @@ open class Foo protected constructor()
 inline fun foo(f: () -> Unit) = object: Foo() {}
 
 class A : Foo() {
-    inline fun foo(f: () -> Unit) = <!NI;PROTECTED_CONSTRUCTOR_CALL_FROM_PUBLIC_INLINE, PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>Foo<!>()
-}
\ No newline at end of file
+    inline fun foo(f: () -> Unit) = <!PROTECTED_CONSTRUCTOR_CALL_FROM_PUBLIC_INLINE{NI}, PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>Foo<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.fir.kt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.fir.kt
index acb2535e663..c41c4bee41e 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.fir.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.fir.kt
@@ -10,4 +10,4 @@ fun box() : String {
 
 inline fun <T> test(p: T) {
     p.toString()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.kt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.kt
index 5354f13093f..80dd51c42ad 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.kt
@@ -1,7 +1,7 @@
 // !WITH_NEW_INFERENCE
 
 fun box() : String {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test<!> {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>test<!> {
         <!RETURN_NOT_ALLOWED!>return@box<!> "123"
     }
 
@@ -10,4 +10,4 @@ fun box() : String {
 
 <!NOTHING_TO_INLINE!>inline<!> fun <T> test(p: T) {
     p.toString()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/publishedApi.fir.kt b/compiler/testData/diagnostics/tests/inline/nonPublicMember/publishedApi.fir.kt
index 256104c9f47..9c03541d22a 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/publishedApi.fir.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/publishedApi.fir.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -EXPOSED_PARAMETER_TYPE -NOTHING_TO_INLINE
 
 
-inline fun call(<!EXPOSED_PARAMETER_TYPE!>a: A<!>) {
+inline fun call(a: A) {
     a.test()
 
     privateFun()
@@ -45,4 +45,4 @@ private fun privateFun() {
 
 internal fun internalFun() {
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/publishedApi.kt b/compiler/testData/diagnostics/tests/inline/nonPublicMember/publishedApi.kt
index a6136f84109..238a1580f88 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/publishedApi.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/publishedApi.kt
@@ -45,4 +45,4 @@ private fun privateFun() {
 
 internal fun internalFun() {
 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inline/privateClass.fir.kt b/compiler/testData/diagnostics/tests/inline/privateClass.fir.kt
index 6c1705a771c..eacf2e30adb 100644
--- a/compiler/testData/diagnostics/tests/inline/privateClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/inline/privateClass.fir.kt
@@ -6,7 +6,7 @@ private class S public constructor() {
     }
 }
 
-internal inline fun x(<!EXPOSED_PARAMETER_TYPE!>s: S<!>, z: () -> Unit) {
+internal inline fun x(s: S, z: () -> Unit) {
     z()
     S()
     s.a()
@@ -22,4 +22,4 @@ private inline fun x2(s: S, z: () -> Unit) {
 
 private fun test(): S {
     return S()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inline/privateClass.kt b/compiler/testData/diagnostics/tests/inline/privateClass.kt
index 15e1cfd7dba..c68bd5d2a77 100644
--- a/compiler/testData/diagnostics/tests/inline/privateClass.kt
+++ b/compiler/testData/diagnostics/tests/inline/privateClass.kt
@@ -22,4 +22,4 @@ private inline fun x2(s: S, z: () -> Unit) {
 
 private fun test(): S {
     return S()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.fir.kt b/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.fir.kt
index d857444247e..39a890ae51d 100644
--- a/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.fir.kt
+++ b/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.fir.kt
@@ -1,4 +1,5 @@
 // WITH_REFLECT
+// WITH_RUNTIME
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.kt b/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.kt
index 65af2083da2..dd07b222fc8 100644
--- a/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.kt
+++ b/compiler/testData/diagnostics/tests/inline/property/propertyWithBackingField.kt
@@ -1,4 +1,5 @@
 // WITH_REFLECT
+// WITH_RUNTIME
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/inline/publishedApi.fir.kt b/compiler/testData/diagnostics/tests/inline/publishedApi.fir.kt
index 710e5f7d9ee..02f7b85ffd2 100644
--- a/compiler/testData/diagnostics/tests/inline/publishedApi.fir.kt
+++ b/compiler/testData/diagnostics/tests/inline/publishedApi.fir.kt
@@ -1,5 +1,5 @@
 // !DIAGNOSTICS: -EXPOSED_PARAMETER_TYPE -NOTHING_TO_INLINE
-inline fun call(<!EXPOSED_PARAMETER_TYPE!>a: A<!>) {
+inline fun call(a: A) {
     a.test()
     publishedTopLevel()
     
@@ -172,4 +172,4 @@ var publicVarTopLevel = 1
 
 internal var internalVarTopLevel = 1
 
-private var privateVarTopLevel = 1
\ No newline at end of file
+private var privateVarTopLevel = 1
diff --git a/compiler/testData/diagnostics/tests/inline/publishedApi.kt b/compiler/testData/diagnostics/tests/inline/publishedApi.kt
index 99840bbfe1c..bb08464c881 100644
--- a/compiler/testData/diagnostics/tests/inline/publishedApi.kt
+++ b/compiler/testData/diagnostics/tests/inline/publishedApi.kt
@@ -172,4 +172,4 @@ var publicVarTopLevel = 1
 
 internal var internalVarTopLevel = 1
 
-private var privateVarTopLevel = 1
\ No newline at end of file
+private var privateVarTopLevel = 1
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfInitializerBlockInsideInlineClass.kt b/compiler/testData/diagnostics/tests/inlineClasses/presenceOfInitializerBlockInsideInlineClass.kt
index 78df5903e38..7def378d5e2 100644
--- a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfInitializerBlockInsideInlineClass.kt
+++ b/compiler/testData/diagnostics/tests/inlineClasses/presenceOfInitializerBlockInsideInlineClass.kt
@@ -1,6 +1,6 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// FIR_IDENTICAL
 
 inline class Foo(val x: Int) {
     init {}
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfPublicPrimaryConstructorForInlineClass.kt b/compiler/testData/diagnostics/tests/inlineClasses/presenceOfPublicPrimaryConstructorForInlineClass.kt
index a0863381f7e..0224c26082e 100644
--- a/compiler/testData/diagnostics/tests/inlineClasses/presenceOfPublicPrimaryConstructorForInlineClass.kt
+++ b/compiler/testData/diagnostics/tests/inlineClasses/presenceOfPublicPrimaryConstructorForInlineClass.kt
@@ -1,5 +1,5 @@
-// !LANGUAGE: +InlineClasses
 // FIR_IDENTICAL
+// !LANGUAGE: +InlineClasses
 
 inline class ConstructorWithDefaultVisibility(val x: Int)
 inline class PublicConstructor public constructor(val x: Int)
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/varPropertyWithInlineClassReceiver.kt b/compiler/testData/diagnostics/tests/inlineClasses/varPropertyWithInlineClassReceiver.kt
index e005b0cbf2a..b47aed89b60 100644
--- a/compiler/testData/diagnostics/tests/inlineClasses/varPropertyWithInlineClassReceiver.kt
+++ b/compiler/testData/diagnostics/tests/inlineClasses/varPropertyWithInlineClassReceiver.kt
@@ -9,4 +9,4 @@ inline class IC(val a: Any) {
 
 <!RESERVED_VAR_PROPERTY_OF_VALUE_CLASS!>var<!> IC.extension: Any
     get() = a
-    set(value) {}
\ No newline at end of file
+    set(value) {}
diff --git a/compiler/testData/diagnostics/tests/inner/innerThisSuper.kt b/compiler/testData/diagnostics/tests/inner/innerThisSuper.kt
index 4d38f0523c5..19c0259177f 100644
--- a/compiler/testData/diagnostics/tests/inner/innerThisSuper.kt
+++ b/compiler/testData/diagnostics/tests/inner/innerThisSuper.kt
@@ -19,4 +19,4 @@ class Outer : Trait {
         val t = this@Outer.bar()
         val s = super@Outer.bar()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt
index 8a773d7b240..64be57590f5 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt
@@ -50,4 +50,4 @@ fun test(with: WithClassObject, without: WithoutClassObject, obj: Obj) {
     obj.<!NESTED_CLASS_ACCESSED_VIA_INSTANCE_REFERENCE!>NestedObj<!>
     obj.<!RESOLUTION_TO_CLASSIFIER!>NestedObj<!>()
     obj.<!NESTED_CLASS_ACCESSED_VIA_INSTANCE_REFERENCE!>NestedObj<!>.foo()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt
index da716cf468c..884c9fb8584 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt
@@ -5,6 +5,6 @@ class Outer {
 }
 
 fun nested() = Outer.Nested<Int>()
-fun noArguments() = Outer.<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>Nested<!>()
+fun noArguments() = Outer.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>Nested<!>()
 fun noArgumentsExpectedType(): Outer.Nested<String> = Outer.Nested()
 fun manyArguments() = Outer.Nested<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><String, Int><!>()
diff --git a/compiler/testData/diagnostics/tests/j+k/differentFilename.fir.kt b/compiler/testData/diagnostics/tests/j+k/differentFilename.fir.kt
index b0ae18cce3c..59ed771217c 100644
--- a/compiler/testData/diagnostics/tests/j+k/differentFilename.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/differentFilename.fir.kt
@@ -1,4 +1,4 @@
-// JAVAC_SKIP
+// SKIP_JAVAC
 // FILE: A.java
 public class A {
     public B b() {}
diff --git a/compiler/testData/diagnostics/tests/j+k/differentFilename.kt b/compiler/testData/diagnostics/tests/j+k/differentFilename.kt
index 9b712e67acd..545704650fc 100644
--- a/compiler/testData/diagnostics/tests/j+k/differentFilename.kt
+++ b/compiler/testData/diagnostics/tests/j+k/differentFilename.kt
@@ -1,4 +1,4 @@
-// JAVAC_SKIP
+// SKIP_JAVAC
 // FILE: A.java
 public class A {
     public B b() {}
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.kt
index aaacea638de..448249692cd 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.kt
@@ -9,9 +9,9 @@ public class A<E> {
 // FILE: main.kt
 
 fun test(x: List<Int>, y: List<String>) {
-    A("", x) checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><A<Any?>>() }
+    A("", x) checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><A<Any?>>() }
     A("", y) checkType { _<A<String?>>() }
 
-    A<CharSequence, String>("", <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>)
+    A<CharSequence, String>("", <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>x<!>)
     A<CharSequence, String>("", y)
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.kt
index 9b45fba814c..fd9bb366698 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.kt
@@ -13,6 +13,6 @@ fun test(x: List<Int>, y: List<String>) {
     Outer<Int>().Inner("", y, 1) checkType { _<Outer<Int>.Inner<String>>() }
     Outer<Int>().Inner<CharSequence, String, Int>("", y, 1) checkType { _<Outer<Int>.Inner<CharSequence>>() }
 
-    Outer<Int>().Inner("", x, 1) checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Outer<Int>.Inner<Any>>() }
-    Outer<Int>().Inner<CharSequence, String, Int>("", <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>, 1)
+    Outer<Int>().Inner("", x, 1) checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Outer<Int>.Inner<Any>>() }
+    Outer<Int>().Inner<CharSequence, String, Int>("", <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>x<!>, 1)
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.kt
index f06758b278c..fb1b0079501 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.kt
@@ -10,12 +10,12 @@ public class A {
 class Inv<T>
 
 fun test(x: Inv<Int>, y: Inv<String>) {
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>A<!>("", <!NI;TYPE_MISMATCH!>x<!>)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>A<!>("", <!TYPE_MISMATCH{NI}!>x<!>)
     A("", y)
 
-    A<String>("", <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>)
+    A<String>("", <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>x<!>)
 
-    A<Any>("", <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>)
+    A<Any>("", <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>x<!>)
     A<String>("", y)
     A<CharSequence>("", <!TYPE_MISMATCH!>y<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt
index 1be2d3fb5a1..cee6eaeff2b 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt
@@ -9,4 +9,4 @@ public class C {
 
 // FILE: main.kt
 
-fun foo() = <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>C<!>(<!NO_VALUE_FOR_PARAMETER!>)<!>
+fun foo() = <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>C<!>(<!NO_VALUE_FOR_PARAMETER!>)<!>
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.kt
index fac99ec5df8..852545278fe 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.kt
@@ -10,9 +10,9 @@ public class A<E> {
 // FILE: main.kt
 
 class B1(x: List<String>) : A<CharSequence>("", x)
-class B2(x: List<Int>) : <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>A<CharSequence>("", x)<!>
+class B2(x: List<Int>) : <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>A<CharSequence>("", x)<!>
 
 class C : A<CharSequence> {
     constructor(x: List<String>) : super("", x)
-    constructor(x: List<Int>, y: Int) : <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>super<!>("", x)
+    constructor(x: List<Int>, y: Int) : <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>super<!>("", x)
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.kt
index a1501124a88..c9235bef874 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.kt
@@ -12,10 +12,10 @@ public class A<E> {
 // TODO: It's effectively impossible to perform super call to such constructor
 // if there is not enough information to infer corresponding arguments
 // May be we could add some special syntax for such arguments
-class B1(x: List<String>) : <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!><!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>A<!><CharSequence><!>("", x)
-class B2(x: List<Int>) : <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>A<CharSequence>("", x)<!>
+class B1(x: List<String>) : <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!><!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>A<!><CharSequence><!>("", x)
+class B2(x: List<Int>) : <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>A<CharSequence>("", x)<!>
 
 class C : A<CharSequence> {
-    constructor(x: List<String>) : <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>super<!>("", x)
-    constructor(x: List<Int>, y: Int) : <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>super<!>("", x)
+    constructor(x: List<String>) : <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>super<!>("", x)
+    constructor(x: List<Int>, y: Int) : <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>super<!>("", x)
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.kt
index 7a807f41e85..ec44ac464fe 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.kt
@@ -11,8 +11,8 @@ public class J {
 
 import java.io.Serializable
 
-fun cloneable(c: Cloneable) = <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>J<!>(<!NI;TYPE_MISMATCH!>c<!>)
+fun cloneable(c: Cloneable) = <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>J<!>(<!TYPE_MISMATCH{NI}!>c<!>)
 
-fun serializable(s: Serializable) = <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>J<!>(<!NI;TYPE_MISMATCH!>s<!>)
+fun serializable(s: Serializable) = <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>J<!>(<!TYPE_MISMATCH{NI}!>s<!>)
 
 fun <T> both(t: T) where T : Cloneable, T : Serializable = J(t)
diff --git a/compiler/testData/diagnostics/tests/j+k/kt36856.fir.kt b/compiler/testData/diagnostics/tests/j+k/kt36856.fir.kt
deleted file mode 100644
index 3be6d64511f..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/kt36856.fir.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-// !CHECK_TYPE
-// FILE: Test.java
-public class Test {
-    public <T> T with(Foo<T> matcher) {
-        return null;
-    }
-    public boolean with(Foo<Boolean> matcher) {
-        return false;
-    }
-}
-
-// FILE: main.kt
-class Foo<T>
-fun main(foo1: Foo<Boolean>, foo2: Foo<String>) {
-    val x = object : Test() {} // FE exception is thrown here
-
-    x.with(foo1) checkType { _<Boolean>() }
-    x.with(foo2) checkType { _<String>() }
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt36856.kt b/compiler/testData/diagnostics/tests/j+k/kt36856.kt
index 45a424773a3..c3fe76b4d18 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt36856.kt
+++ b/compiler/testData/diagnostics/tests/j+k/kt36856.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !CHECK_TYPE
 // FILE: Test.java
 public class Test {
diff --git a/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt b/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt
index 0dd93379278..5e2fcf02cc7 100644
--- a/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt
+++ b/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt
@@ -41,4 +41,4 @@ val <!EXPOSED_PROPERTY_TYPE!>mc1<!> = <!INACCESSIBLE_TYPE!><!INVISIBLE_MEMBER!>M
 
 val x = <!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_MEMBER!>staticMethod<!>()
 val y = <!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_REFERENCE!>NestedClass<!>.<!INVISIBLE_MEMBER!>staticMethodOfNested<!>()
-val <!EXPOSED_PROPERTY_TYPE!>z<!> = <!INACCESSIBLE_TYPE!><!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_MEMBER!>NestedClass<!>()<!>
\ No newline at end of file
+val <!EXPOSED_PROPERTY_TYPE!>z<!> = <!INACCESSIBLE_TYPE!><!INVISIBLE_REFERENCE!>MyJavaClass<!>.<!INVISIBLE_MEMBER!>NestedClass<!>()<!>
diff --git a/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.kt b/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.kt
index 472abc6bf48..668a31570fa 100644
--- a/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.kt
+++ b/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.kt
@@ -16,13 +16,13 @@ public interface J2 extends J {
 
 // FILE: main.kt
 fun main() {
-    J <!NI;TYPE_MISMATCH!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>s: String<!> -> s}<!> // should be prohibited, because SAM value parameter has nullable type
+    J <!TYPE_MISMATCH{NI}!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>s: String<!> -> s}<!> // should be prohibited, because SAM value parameter has nullable type
     J { "" + it<!UNSAFE_CALL!>.<!>length }
-    J { <!NI;NULL_FOR_NONNULL_TYPE, NULL_FOR_NONNULL_TYPE!>null<!> }
-    J { <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>it?.length?.toString()<!> }
+    J { <!NULL_FOR_NONNULL_TYPE{NI}, NULL_FOR_NONNULL_TYPE!>null<!> }
+    J { <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>it?.length?.toString()<!> }
 
-    J2 <!NI;TYPE_MISMATCH!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>s: String<!> -> s}<!>
+    J2 <!TYPE_MISMATCH{NI}!>{ <!EXPECTED_PARAMETER_TYPE_MISMATCH!>s: String<!> -> s}<!>
     J2 { "" + it<!UNSAFE_CALL!>.<!>length }
-    J2 { <!NI;NULL_FOR_NONNULL_TYPE, NULL_FOR_NONNULL_TYPE!>null<!> }
-    J2 { <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>it?.length?.toString()<!> }
+    J2 { <!NULL_FOR_NONNULL_TYPE{NI}, NULL_FOR_NONNULL_TYPE!>null<!> }
+    J2 { <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>it?.length?.toString()<!> }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/sam/privateCandidatesWithWrongArguments.kt b/compiler/testData/diagnostics/tests/j+k/sam/privateCandidatesWithWrongArguments.kt
index 26d15658ffa..8e03cd3828f 100644
--- a/compiler/testData/diagnostics/tests/j+k/sam/privateCandidatesWithWrongArguments.kt
+++ b/compiler/testData/diagnostics/tests/j+k/sam/privateCandidatesWithWrongArguments.kt
@@ -18,4 +18,4 @@ package bar
 
 fun main() {
     foo.A.<!INVISIBLE_MEMBER!>f<!> {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/sam/referenceToSamFunctionAgainstExpectedType.kt b/compiler/testData/diagnostics/tests/j+k/sam/referenceToSamFunctionAgainstExpectedType.kt
index 3b93f3042c6..9250bf81ac7 100644
--- a/compiler/testData/diagnostics/tests/j+k/sam/referenceToSamFunctionAgainstExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/j+k/sam/referenceToSamFunctionAgainstExpectedType.kt
@@ -21,4 +21,4 @@ fun test(inv: Inv<String>) {
     take(inv::map)
 }
 
-fun take(f: ((String) -> String) -> Inv<String>) {}
\ No newline at end of file
+fun take(f: ((String) -> String) -> Inv<String>) {}
diff --git a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.kt b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.kt
index d5cbb3e3f9b..c4c1b925342 100644
--- a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.kt
+++ b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.kt
@@ -34,7 +34,7 @@ fun main() {
     }
 
     A.baz {
-        x -> <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, TYPE_MISMATCH!>x.hashCode()<!>
+        x -> <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>x.hashCode()<!>
     }
 
     val block: (String) -> Any? = {
diff --git a/compiler/testData/diagnostics/tests/j+k/serializable.kt b/compiler/testData/diagnostics/tests/j+k/serializable.kt
index 1f4a6f031e5..38be344f048 100644
--- a/compiler/testData/diagnostics/tests/j+k/serializable.kt
+++ b/compiler/testData/diagnostics/tests/j+k/serializable.kt
@@ -57,4 +57,4 @@ package aa;
 public class A {
     public static void use(java.io.Serializable s) { }
     public static void useList(java.util.List<? extends java.io.Serializable> s) { }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.kt b/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.kt
index f1bfaa68674..c4bdfdd1563 100644
--- a/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.kt
+++ b/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.kt
@@ -20,5 +20,5 @@ class In<in F> {
 
 fun test() {
     A.foo().x() checkType { _<Any?>() }
-    A.bar().<!OI;MEMBER_PROJECTED_OUT!>y<!>(<!NI;NULL_FOR_NONNULL_TYPE!>null<!>)
+    A.bar().<!MEMBER_PROJECTED_OUT{OI}!>y<!>(<!NULL_FOR_NONNULL_TYPE{NI}!>null<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/library/Collections.kt b/compiler/testData/diagnostics/tests/library/Collections.kt
index 0cd0c7e695e..fe7dd330ad2 100644
--- a/compiler/testData/diagnostics/tests/library/Collections.kt
+++ b/compiler/testData/diagnostics/tests/library/Collections.kt
@@ -108,4 +108,4 @@ fun <K, V> testMutableMap(m: MutableMap<K, V>) {
     val <!UNUSED_VARIABLE!>mutableSet1<!>: MutableSet<MutableMap.MutableEntry<K, V>> = m.entries
 }
 
-fun <T> array(vararg <!UNUSED_PARAMETER!>t<!>: T): Array<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+fun <T> array(vararg <!UNUSED_PARAMETER!>t<!>: T): Array<T> {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/applicability.fir.kt b/compiler/testData/diagnostics/tests/modifiers/const/applicability.fir.kt
index f500a17d974..b6d572f84d9 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/applicability.fir.kt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/applicability.fir.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS:-UNUSED_VARIABLE,-CAST_NEVER_SUCCEEDS,-DIVISION_BY_ZERO
+// !DIAGNOSTICS: -UNUSED_VARIABLE -CAST_NEVER_SUCCEEDS -DIVISION_BY_ZERO
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/applicability.kt b/compiler/testData/diagnostics/tests/modifiers/const/applicability.kt
index ffa79e0fe1e..6b53b8d7874 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/applicability.kt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/applicability.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS:-UNUSED_VARIABLE,-CAST_NEVER_SUCCEEDS,-DIVISION_BY_ZERO
+// !DIAGNOSTICS: -UNUSED_VARIABLE -CAST_NEVER_SUCCEEDS -DIVISION_BY_ZERO
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.fir.kt b/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.fir.kt
index 1eb5fb247ea..b0b57c817da 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.fir.kt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.fir.kt
@@ -1,3 +1,3 @@
 // !WITH_NEW_INFERENCE
 annotation class A(val a: IntArray = arrayOf(1))
-annotation class B(val a: IntArray = intArrayOf(1))
\ No newline at end of file
+annotation class B(val a: IntArray = intArrayOf(1))
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt b/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt
index 234ee876117..855b8c22283 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt
@@ -1,3 +1,3 @@
 // !WITH_NEW_INFERENCE
-annotation class A(val a: IntArray = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf(1)<!>)
-annotation class B(val a: IntArray = intArrayOf(1))
\ No newline at end of file
+annotation class A(val a: IntArray = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>arrayOf(1)<!>)
+annotation class B(val a: IntArray = intArrayOf(1))
diff --git a/compiler/testData/diagnostics/tests/modifiers/operatorInfix/MemberFunctions.kt b/compiler/testData/diagnostics/tests/modifiers/operatorInfix/MemberFunctions.kt
index 118c18e1137..08ef0773ee0 100644
--- a/compiler/testData/diagnostics/tests/modifiers/operatorInfix/MemberFunctions.kt
+++ b/compiler/testData/diagnostics/tests/modifiers/operatorInfix/MemberFunctions.kt
@@ -42,4 +42,4 @@ fun a() {
 }
 
 fun consumeInt(i: Int) {}
-fun consumeString(s: String) {}
\ No newline at end of file
+fun consumeString(s: String) {}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.txt
index 298558bf59a..fa343d01245 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.txt
@@ -19,7 +19,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -34,8 +33,8 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.txt
index 862a633d9be..8dd7ca063d8 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.txt
@@ -19,7 +19,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -34,8 +33,8 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.txt
index 4a47222838a..e167260ac89 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.txt
@@ -19,7 +19,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -35,8 +34,8 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt
index 042ee7a5fe4..412c4778ecc 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.txt
@@ -74,7 +74,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -144,8 +143,8 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(/*0*/ m1: p.M1): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt
index 02213b764aa..1cb91d74907 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.txt
@@ -25,7 +25,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -39,8 +38,8 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt
index 09ee56f2780..e709e60a9ae 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.txt
@@ -19,7 +19,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -34,8 +33,8 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt
index 6e65e2a3acf..3c59aac4748 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.txt
@@ -37,7 +37,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -65,8 +64,8 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.txt
index 6c3bb54b64a..7ec079da1b6 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.txt
@@ -19,7 +19,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -34,3 +33,4 @@ package p {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.txt
index 6c3bb54b64a..7ec079da1b6 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.txt
@@ -19,7 +19,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -34,3 +33,4 @@ package p {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.txt
index c85023fa316..0092b424d8f 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.txt
@@ -20,7 +20,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -43,8 +42,8 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(/*0*/ a: p.A): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.txt
index 9586c2cdd58..181dcfe58af 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.txt
@@ -19,7 +19,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -31,3 +30,4 @@ public final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.txt
index 245adac56cc..3094057b42c 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.txt
@@ -19,7 +19,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -34,8 +33,8 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt
index 2e5ededd6ec..2934bafb5da 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,8 +37,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt
index 17e221a128b..d3eba28f884 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -45,8 +43,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B<p.Tr>?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt
index 06abb324294..3b809132bf8 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,8 +37,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun </*0*/ Y, /*1*/ Z> test(/*0*/ b: p.B<Y, Z>?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt
index 763f5b64969..59dc9154700 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,8 +37,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun </*0*/ Y> test(/*0*/ b: p.B<Y>?, /*1*/ y: Y): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt
index 0919fdebad3..d70ac9ee160 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,8 +37,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B<kotlin.String>?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.fir.kt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.fir.kt
index a17bb8153f9..1761ad42693 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.fir.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.fir.kt
@@ -34,4 +34,4 @@ fun test(b: B?, c: C) {
     if (b is C) {
         b?.<!AMBIGUITY!>foo<!>(1, 1)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt
index 4015a6f7b91..c0be64d357b 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt
@@ -32,6 +32,6 @@ fun test(b: B?, c: C) {
     b?.foo(1, 1)
     c.foo(1, 1)
     if (b is C) {
-        b<!UNNECESSARY_SAFE_CALL!>?.<!><!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>foo<!>(1, 1)
+        b<!UNNECESSARY_SAFE_CALL!>?.<!><!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!>(1, 1)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt
index dc6bf1616d1..94de30d91f8 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,8 +37,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?, /*1*/ c: p.C): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt
index 360c440f5b2..1bacba7366a 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,8 +37,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt
index db602f386ea..c576ff914a2 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,8 +37,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt
index dd9bfd77d51..8e1e32797d7 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.txt
@@ -16,7 +16,6 @@ package p {
     }
 }
 
-
 // -- Module: <m1> --
 package
 
@@ -30,7 +29,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -44,7 +42,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -58,8 +55,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt
index ead8e55e270..c2277135aa7 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,8 +37,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt
index 419094cbcc2..30903712481 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,8 +37,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt
index 682114ec31c..e301b994198 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -26,7 +25,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -40,8 +38,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun p.B.test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt
index 98822761a81..15602c2ba52 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,9 +37,9 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt
index cf904dd9696..4e23df891c5 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -45,8 +43,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt
index 21978d7665c..bb6d3bd9a0e 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,7 +37,6 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
@@ -47,3 +44,4 @@ public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
 public fun test2(/*0*/ b: p.B?): kotlin.Unit
 public fun test3(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt
index 98822761a81..15602c2ba52 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,9 +37,9 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt
index 71c83edfaa9..a39c1d782f1 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.txt
@@ -17,7 +17,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -31,7 +30,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -51,9 +49,9 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt
index 68237b2a1d8..77f677d7929 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,9 +37,9 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
 public fun test1(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.txt
index c6f0cc3a9d8..df47de053a5 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/incompleteCodeNoNoneApplicable.txt
@@ -5,7 +5,6 @@ package p {
     public fun f(/*0*/ s: kotlin.String, /*1*/ t: kotlin.String): kotlin.String
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -13,8 +12,8 @@ package p {
     public fun f(/*0*/ s: kotlin.String, /*1*/ t: kotlin.String): kotlin.String
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt
index f0995ad9284..14a3808169a 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,8 +37,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt
index 0c05d9cfc00..8ed7add7a4f 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -26,7 +25,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -40,8 +38,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt
index f3623d9097d..11cbc42e710 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.txt
@@ -16,7 +16,6 @@ package p {
     }
 }
 
-
 // -- Module: <m1> --
 package
 
@@ -30,7 +29,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -44,7 +42,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -58,8 +55,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?, /*1*/ a: p.G1<kotlin.Int>, /*2*/ b1: p.G2<p.B, kotlin.String>): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt
index c40fd69c19f..41316fd54fc 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -46,8 +44,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sinceKotlin.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sinceKotlin.txt
index f74920a9504..37b52f516a1 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sinceKotlin.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sinceKotlin.txt
@@ -5,7 +5,6 @@ package p1 {
     @kotlin.SinceKotlin(version = "1.1") public fun foo(/*0*/ s: kotlin.Int): kotlin.String
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -13,9 +12,9 @@ package p2 {
     public fun foo(/*0*/ s: kotlin.Int): kotlin.Int
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test1(): kotlin.Int
 public fun test2(): kotlin.Int
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt
index 6840cd203cd..6dd3eb4cf3a 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.txt
@@ -11,7 +11,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -25,7 +24,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -39,8 +37,8 @@ package p {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ b: p.B?): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.txt
index 44854ad1ecd..9f907fc2b8a 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.txt
@@ -25,7 +25,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -46,7 +45,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -57,3 +55,4 @@ public final class Foo : p.C, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt
index c2ecd847cf0..b27f94166ce 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.txt
@@ -18,7 +18,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -39,7 +38,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -50,3 +48,4 @@ public final class Foo : p.A, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt
index 7c4bf31fcb5..8d3df4e9e1c 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.txt
@@ -18,7 +18,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -39,7 +38,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -51,3 +49,4 @@ public final class Foo : p.A, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt
index b58fdd3fcfb..cf0dd0da29c 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.txt
@@ -18,7 +18,6 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -39,7 +38,6 @@ package p {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -50,3 +48,4 @@ public final class Foo : p.A<kotlin.String>, p.B {
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenImportPriority.txt b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenImportPriority.txt
index baa2f7f20e3..f5f5c456f75 100644
--- a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenImportPriority.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenImportPriority.txt
@@ -12,7 +12,6 @@ package p1 {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -27,9 +26,9 @@ package p2 {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(/*0*/ a: p1.A): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt
index 6f2ee1bbda5..4a92e816676 100644
--- a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/deprecatedHiddenMultipleClasses.txt
@@ -12,7 +12,6 @@ package p1 {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -27,7 +26,6 @@ package p2 {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -42,9 +40,9 @@ package p3 {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ a: [ERROR : A]): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinImportPriority.txt b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinImportPriority.txt
index 361a4dbcc69..7a9bce19f16 100644
--- a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinImportPriority.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinImportPriority.txt
@@ -12,7 +12,6 @@ package p1 {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -27,9 +26,9 @@ package p2 {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(/*0*/ a: p1.A): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt
index f35f3cc8219..25c51bd6b37 100644
--- a/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/hiddenClass/sinceKotlinMultipleClasses.txt
@@ -12,7 +12,6 @@ package p1 {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -27,7 +26,6 @@ package p2 {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -42,9 +40,9 @@ package p3 {
     }
 }
 
-
 // -- Module: <m4> --
 package
 
 public fun test(/*0*/ a: [ERROR : A]): kotlin.Unit
 public fun test(/*0*/ a: p2.A): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/internal.kt b/compiler/testData/diagnostics/tests/multimodule/internal.kt
index fa43b40637f..ad42ba38cc4 100644
--- a/compiler/testData/diagnostics/tests/multimodule/internal.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/internal.kt
@@ -32,4 +32,4 @@ fun test() {
     val iv = inst.<!INVISIBLE_MEMBER!>v<!>
     inst.<!INVISIBLE_MEMBER!>a<!>()
     inst.<!INVISIBLE_MEMBER!>B<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/internal.txt b/compiler/testData/diagnostics/tests/multimodule/internal.txt
index 456073a4ff5..9bdc85d5e45 100644
--- a/compiler/testData/diagnostics/tests/multimodule/internal.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/internal.txt
@@ -31,8 +31,8 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
 public fun test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/kt14249.txt b/compiler/testData/diagnostics/tests/multimodule/kt14249.txt
index 4e08cfeb482..25c56c67964 100644
--- a/compiler/testData/diagnostics/tests/multimodule/kt14249.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/kt14249.txt
@@ -15,21 +15,10 @@ package test {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
 package test {
     public fun test(): kotlin.Unit
-
-    public/*package*/ open class Foo {
-        public/*package*/ constructor Foo()
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public/*package*/ open fun takeFoo(/*0*/ f: test.Foo!): kotlin.Unit
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        // Static members
-        public/*package*/ open fun create(): test.Foo!
-    }
 }
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.kt b/compiler/testData/diagnostics/tests/multimodule/packagePrivate.kt
index ab08f0b9387..99d3f3bd003 100644
--- a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/packagePrivate.kt
@@ -9,11 +9,11 @@ private val a = 1
 
 package p
 
-val b = <!INVISIBLE_MEMBER("a", "private", "file")!>a<!> // same package, same module
+val b = <!INVISIBLE_MEMBER("a; private; file")!>a<!> // same package, same module
 
 // MODULE: m2(m1)
 // FILE: c.kt
 
 package p
 
-val c = <!INVISIBLE_MEMBER("a", "private", "file")!>a<!> // same package, another module
+val c = <!INVISIBLE_MEMBER("a; private; file")!>a<!> // same package, another module
diff --git a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.txt b/compiler/testData/diagnostics/tests/multimodule/packagePrivate.txt
index 25ec2a8304f..0af5fe0c566 100644
--- a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/packagePrivate.txt
@@ -6,10 +6,10 @@ package p {
     public val b: kotlin.Int = 1
 }
 
-
 // -- Module: <m2> --
 package
 
 package p {
     public val c: kotlin.Int = 1
 }
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.kt b/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.kt
index 4d0e81ec47f..492edda6b28 100644
--- a/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.kt
@@ -53,4 +53,4 @@ inline fun testInline() {
     val iv = inst.<!INVISIBLE_MEMBER!>v<!>
     inst.<!INVISIBLE_MEMBER!>a<!>()
     inst.<!INVISIBLE_MEMBER!>B<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.txt b/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.txt
index 175747564ce..28b0d53fbe0 100644
--- a/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/publishedApiInternal.txt
@@ -31,9 +31,9 @@ package p {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
 public fun test(): kotlin.Unit
 public inline fun testInline(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt b/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt
index c19631cbcf7..f15679a2cab 100644
--- a/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/redundantElseInWhen.txt
@@ -37,7 +37,6 @@ package test {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -47,3 +46,4 @@ package other {
     public fun baz(/*0*/ b: kotlin.Boolean?): kotlin.Int
     public fun foo(/*0*/ e: test.E): kotlin.Int
 }
+
diff --git a/compiler/testData/diagnostics/tests/multimodule/varargConflict.txt b/compiler/testData/diagnostics/tests/multimodule/varargConflict.txt
index aaced474e55..aa71c1466ce 100644
--- a/compiler/testData/diagnostics/tests/multimodule/varargConflict.txt
+++ b/compiler/testData/diagnostics/tests/multimodule/varargConflict.txt
@@ -6,7 +6,6 @@ package p {
     public fun foo(/*0*/ vararg values: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -15,10 +14,10 @@ package p {
     public fun foo(/*0*/ vararg values: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
 }
 
-
 // -- Module: <m3> --
 package
 
 package m {
     public fun main(): kotlin.Unit
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.txt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.txt
index 0b451c851ae..88b6e4f3bbe 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.txt
@@ -79,7 +79,6 @@ public final expect annotation class Primitives : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -162,3 +161,4 @@ public final actual annotation class Primitives : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.txt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.txt
index ba3815a354f..5ddd0a1c950 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotations.txt
@@ -48,7 +48,6 @@ public final expect annotation class A5 : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -98,3 +97,4 @@ public final actual annotation class A5 : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.txt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.txt
index 2ed72355c17..cf1d5e36157 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias.txt
@@ -48,7 +48,6 @@ public final expect annotation class A5 : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -103,3 +102,4 @@ public actual typealias A2 = J2
 public actual typealias A3 = J3
 public actual typealias A4 = J4
 public actual typealias A5 = J5
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.txt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.txt
index 1084752c636..f3a0392d5a0 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationsViaActualTypeAlias2.txt
@@ -63,7 +63,6 @@ public final enum class E : kotlin.Enum<E> {
     public final /*synthesized*/ fun values(): kotlin.Array<E>
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -131,3 +130,4 @@ public final annotation class Jnno : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias Anno = Jnno
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.txt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.txt
index 38f39d5c190..b9321ea3f84 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/constructor.txt
@@ -24,7 +24,6 @@ public final expect class Ok {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -50,3 +49,4 @@ public final actual class Ok {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.txt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.txt
index f690612136f..181d8dda6a5 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedDeclaresDefaultArguments.txt
@@ -15,7 +15,6 @@ public open expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -33,3 +32,4 @@ public open actual class Foo {
     public final actual fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.txt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.txt
index ff2fdefea14..8f61ba8fbff 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedInheritsDefaultArguments.txt
@@ -21,7 +21,6 @@ public interface Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -45,3 +44,4 @@ public interface Foo {
     public abstract fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.txt b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.txt
index 8b641a4f8ae..763dd569a03 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/defaultArguments/expectedVsNonExpectedWithDefaults.txt
@@ -3,10 +3,10 @@ package
 
 public expect fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Long = ...): kotlin.Unit
 public actual fun ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit
 public fun test(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.fir.kt
index 04c968e8d9e..cd90da17db2 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.fir.kt
@@ -27,4 +27,4 @@ impl object O
 
 impl enum class E {
     FIRST
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.kt b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.kt
index 98560e4c320..ea0af3b9ba3 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.kt
@@ -2,15 +2,15 @@
 // MODULE: m1-common
 // FILE: common.kt
 
-<!DEPRECATED_MODIFIER, JVM:DEPRECATED_MODIFIER!>header<!> class My
+<!DEPRECATED_MODIFIER, DEPRECATED_MODIFIER{JVM}!>header<!> class My
 
-<!DEPRECATED_MODIFIER, JVM:DEPRECATED_MODIFIER!>header<!> fun foo(): Int
+<!DEPRECATED_MODIFIER, DEPRECATED_MODIFIER{JVM}!>header<!> fun foo(): Int
 
-<!DEPRECATED_MODIFIER, JVM:DEPRECATED_MODIFIER!>header<!> val x: String
+<!DEPRECATED_MODIFIER, DEPRECATED_MODIFIER{JVM}!>header<!> val x: String
 
-<!DEPRECATED_MODIFIER, JVM:DEPRECATED_MODIFIER!>header<!> object O
+<!DEPRECATED_MODIFIER, DEPRECATED_MODIFIER{JVM}!>header<!> object O
 
-<!DEPRECATED_MODIFIER, JVM:DEPRECATED_MODIFIER!>header<!> enum class E {
+<!DEPRECATED_MODIFIER, DEPRECATED_MODIFIER{JVM}!>header<!> enum class E {
     FIRST
 }
 
@@ -27,4 +27,4 @@
 
 <!DEPRECATED_MODIFIER!>impl<!> enum class E {
     FIRST
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.txt b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.txt
index 6e9fad39a03..b8c9271a874 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/deprecated/header.txt
@@ -32,7 +32,6 @@ public expect object O {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -71,3 +70,4 @@ public actual object O {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.txt b/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.txt
index 4cd9ac28660..c0a2400ae4d 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/additionalEntriesInImpl.txt
@@ -39,7 +39,6 @@ public final expect enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -96,3 +95,4 @@ public final actual enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.txt b/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.txt
index ed359015ee1..9f7acc0944a 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/differentEntryOrder.txt
@@ -39,7 +39,6 @@ public final expect enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -86,3 +85,4 @@ public final actual enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.txt b/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.txt
index a2cb80a759b..ee7517b5845 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/javaEnum.txt
@@ -31,7 +31,6 @@ public final expect enum class _TimeUnit : kotlin.Enum<_TimeUnit> {
     public final /*synthesized*/ fun values(): kotlin.Array<_TimeUnit>
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -57,3 +56,4 @@ public final enum class FooImpl : kotlin.Enum<FooImpl!> {
 }
 public actual typealias Foo = FooImpl
 public actual typealias _TimeUnit = java.util.concurrent.TimeUnit
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.txt b/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.txt
index 22a4adc0f28..16f35f3b95a 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/enum/simpleEnum.txt
@@ -21,7 +21,6 @@ public final expect enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -48,3 +47,4 @@ public final actual enum class Foo : kotlin.Enum<Foo> {
     public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
     public final /*synthesized*/ fun values(): kotlin.Array<Foo>
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.txt b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.txt
index 9b270da5a3b..ef99ebfb4f2 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/expectInterfaceApplicability.txt
@@ -13,7 +13,6 @@ public expect interface My {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -28,3 +27,4 @@ public actual interface My {
     public open actual fun openFunPositive(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/generic/functionTypeParameterBounds.txt b/compiler/testData/diagnostics/tests/multiplatform/generic/functionTypeParameterBounds.txt
index 3188e209d3e..cd198e2fba5 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/generic/functionTypeParameterBounds.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/generic/functionTypeParameterBounds.txt
@@ -3,9 +3,9 @@ package
 
 public expect fun </*0*/ T : kotlin.Comparable<T>> kotlin.Array<out T>.sort(): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public fun </*0*/ T> kotlin.Array<out T>.sort(): kotlin.Unit
 public actual fun </*0*/ T : kotlin.Comparable<T>> kotlin.Array<out T>.sort(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/generic/genericMemberBounds.txt b/compiler/testData/diagnostics/tests/multiplatform/generic/genericMemberBounds.txt
index fc175f38e22..cbf2daba488 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/generic/genericMemberBounds.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/generic/genericMemberBounds.txt
@@ -9,7 +9,6 @@ public final expect class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -22,3 +21,4 @@ public open class JavaA {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias A = JavaA
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/generic/membersInGenericClass.txt b/compiler/testData/diagnostics/tests/multiplatform/generic/membersInGenericClass.txt
index 35252a9b711..9878bafbf0b 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/generic/membersInGenericClass.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/generic/membersInGenericClass.txt
@@ -10,7 +10,6 @@ public expect interface A</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -22,3 +21,4 @@ public actual interface A</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.kt b/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.kt
index 8b34494e63b..6b3da1979c5 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.kt
@@ -5,7 +5,7 @@
 interface A
 interface B
 
-expect fun <!JVM:NO_ACTUAL_FOR_EXPECT!><T><!> List<T>.foo() where T : A, T : B
+expect fun <!NO_ACTUAL_FOR_EXPECT{JVM}!><T><!> List<T>.foo() where T : A, T : B
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt
diff --git a/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.txt b/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.txt
index fe69e8e0bb0..b2e57731553 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/generic/typeParameterBoundsDifferentOrderActualMissing.txt
@@ -15,7 +15,6 @@ public interface B {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -32,3 +31,4 @@ public interface B {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.txt
index 7514fa24a35..a94819b54fe 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDefaultValuesInAnnotationViaTypealias.txt
@@ -49,7 +49,6 @@ public final expect annotation class Foo7 : kotlin.Annotation {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -107,3 +106,4 @@ public final actual annotation class Foo6 : kotlin.Annotation {
 public actual typealias Foo1 = Bar1
 public actual typealias Foo4 = Bar2
 public actual typealias Foo7 = Bar2
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.txt
index 6bb6cfa6f0e..ae7e0f17014 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualClassWithDifferentConstructors.txt
@@ -68,7 +68,6 @@ public final expect class Foo3 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -151,3 +150,4 @@ public open class JavaFoo {
 }
 public actual typealias Bar3 = JavaBar
 public actual typealias Foo3 = JavaFoo
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.txt
index fad757f907b..7460eec3cf5 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/actualMissing.txt
@@ -8,7 +8,6 @@ public final expect class A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -19,3 +18,4 @@ public final class A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.fir.kt
index f461354aa08..1fc42183281 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.fir.kt
@@ -10,4 +10,4 @@ open class C : A
 // FILE: jvm.kt
 
 actual open class A
-actual class B : A()
\ No newline at end of file
+actual class B : A()
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.kt
index 7951a02092f..7eaea54b9d2 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.kt
@@ -4,10 +4,10 @@
 
 expect open class A
 expect class B : A
-open class C : <!JVM:SUPERTYPE_NOT_INITIALIZED, SUPERTYPE_NOT_INITIALIZED!>A<!>
+open class C : <!SUPERTYPE_NOT_INITIALIZED, SUPERTYPE_NOT_INITIALIZED{JVM}!>A<!>
 
 // MODULE: m1-jvm(m1-common)
 // FILE: jvm.kt
 
 actual open class A
-actual class B : A()
\ No newline at end of file
+actual class B : A()
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.txt
index df558874920..746eb52b110 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/baseExpectClassWithoutConstructor.txt
@@ -20,7 +20,6 @@ public open class C : A {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -44,3 +43,4 @@ public open class C : A {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.txt
index 7901920cacb..1a1d6a49297 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/classKinds.txt
@@ -43,7 +43,6 @@ public expect object Object {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -93,3 +92,4 @@ public actual object Object {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/dontOverrideMethodsFromInterfaceInCommonCode.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/dontOverrideMethodsFromInterfaceInCommonCode.txt
index 21dbb52f53b..2d1d0dd4ec5 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/dontOverrideMethodsFromInterfaceInCommonCode.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/dontOverrideMethodsFromInterfaceInCommonCode.txt
@@ -29,7 +29,6 @@ public final expect class ImplicitFooCheck : Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -63,3 +62,4 @@ public final actual class ImplicitFooCheck : Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.txt
index c47a99b50a8..e835bbc64b5 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectClassWithoutConstructor.txt
@@ -30,7 +30,6 @@ public final expect class FooBar {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -63,3 +62,4 @@ public final actual class FooBar {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.kt
index 524dbf95704..2aa48bfe258 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.kt
@@ -4,12 +4,12 @@
 // FILE: common.kt
 
 expect fun foo1(x: Int)
-expect fun foo2<!JVM:NO_ACTUAL_FOR_EXPECT!>(x: Int)<!>
+expect fun foo2<!NO_ACTUAL_FOR_EXPECT{JVM}!>(x: Int)<!>
 
 expect class NoArgConstructor()
 
-expect fun foo3(): <!JVM:NO_ACTUAL_FOR_EXPECT!>Int<!>
-expect fun foo4<!JVM:NO_ACTUAL_FOR_EXPECT!>()<!>: Int
+expect fun foo3(): <!NO_ACTUAL_FOR_EXPECT{JVM}!>Int<!>
+expect fun foo4<!NO_ACTUAL_FOR_EXPECT{JVM}!>()<!>: Int
 
 // MODULE: m2-jvm(m1-common)
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.txt
index c950dd608b7..98b38a236cb 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithStrongIncompatibilities.txt
@@ -13,7 +13,6 @@ public final expect class NoArgConstructor {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -33,3 +32,4 @@ public final actual class NoArgConstructor {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.kt
index 4c99af54746..d7fb8c12dfc 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.kt
@@ -10,7 +10,7 @@ expect fun foo2(): Int
 
 expect val s: String
 
-expect open class <!JVM:AMBIGUOUS_ACTUALS, JVM:PACKAGE_OR_CLASSIFIER_REDECLARATION!>Foo3<!>
+expect open class <!AMBIGUOUS_ACTUALS{JVM}, PACKAGE_OR_CLASSIFIER_REDECLARATION{JVM}!>Foo3<!>
 
 // MODULE: m2-jvm(m1-common)
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.txt
index 6f49e7480a5..484d614da1a 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectDeclarationWithWeakIncompatibilities.txt
@@ -22,7 +22,6 @@ public open expect class Foo3 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -54,3 +53,4 @@ public final class Foo3 {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.txt
index 2477f74033f..16106c29889 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/expectFinalActualOpen.txt
@@ -16,7 +16,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -37,3 +36,4 @@ public open class JavaBar {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias Bar = JavaBar
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.txt
index 988948c5281..3ad1179cdc6 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extendExpectedClassWithoutExplicitOverrideOfMethod.txt
@@ -29,7 +29,6 @@ public final expect class DerivedImplicit : Base {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -64,3 +63,4 @@ public final actual class DerivedImplicit : Base {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.kt
index e2802eb26a2..d1844503c12 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.kt
@@ -3,7 +3,7 @@
 // FILE: common.kt
 
 expect class H {
-    <!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> fun foo()
+    <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> fun foo()
 }
 
 // MODULE: m1-jvm(m1-common)
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.txt
index eec55cf2bab..6793409e215 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/extraHeaderOnMembers.txt
@@ -8,7 +8,6 @@ public final expect class H {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -19,3 +18,4 @@ public final actual class H {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/functionAndPropertyWithSameName.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/functionAndPropertyWithSameName.txt
index bbb459d5324..334dd590245 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/functionAndPropertyWithSameName.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/functionAndPropertyWithSameName.txt
@@ -8,7 +8,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -20,3 +19,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.txt
index 56e78558a27..ac6af2833be 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/genericClassImplTypeAlias.txt
@@ -61,7 +61,6 @@ public expect interface C9</*0*/ K> {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -76,3 +75,4 @@ public actual typealias C7</*0*/ I> = kotlin.collections.MutableList<out I>
 public actual typealias C8</*0*/ J> = kotlin.collections.MutableList<*>
 public actual typealias C9</*0*/ K> = kotlin.collections.MutableList<in K>
 public typealias Tmp</*0*/ K> = kotlin.collections.MutableList<K>
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassMember.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassMember.txt
index a49a2fa1ebd..3bc0dbf7112 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassMember.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/headerClassMember.txt
@@ -9,7 +9,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -22,7 +21,6 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m3-js> --
 package
 
@@ -34,3 +32,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.txt
index 1adb731d2b7..b4569b5bdff 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/implDataClass.txt
@@ -26,7 +26,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -61,3 +60,4 @@ public final actual data class Foo {
     public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/implOpenClass.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/implOpenClass.txt
index aa39846925c..0e780206ae9 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/implOpenClass.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/implOpenClass.txt
@@ -10,7 +10,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -30,3 +29,4 @@ public open actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.txt
index 1a15d56b7d9..188f8e1814e 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/modalityCheckForExplicitAndImplicitOverride.txt
@@ -22,7 +22,6 @@ public final expect class Foo3 {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -65,3 +64,4 @@ public open class WithFinal {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.txt
index aad2f344e25..564acd5d019 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActual.txt
@@ -16,7 +16,6 @@ public open expect class Container {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -35,3 +34,4 @@ public open actual class Container {
     public final actual fun publicFun(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias.txt
index 37cb28d24fa..01588decb38 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/morePermissiveVisibilityOnActualViaTypeAlias.txt
@@ -8,7 +8,6 @@ public open expect class Container {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -24,3 +23,4 @@ package foo {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.txt
index 6563d7cac2b..773293a58ac 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClasses.txt
@@ -65,7 +65,6 @@ public expect object OuterObject {
     }
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -142,3 +141,4 @@ public actual object OuterObject {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.kt
index fed08086bf3..917ce026f49 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.kt
@@ -4,15 +4,15 @@
 
 expect class B {
     class N {
-        <!EXPECTED_DECLARATION_WITH_BODY, JVM:EXPECTED_DECLARATION_WITH_BODY!>fun body()<!> {}
-        <!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> fun extraHeader()
+        <!EXPECTED_DECLARATION_WITH_BODY, EXPECTED_DECLARATION_WITH_BODY{JVM}!>fun body()<!> {}
+        <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> fun extraHeader()
     }
 }
 
 expect class C {
-    <!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> class N
-    <!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> enum class E
-    <!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> inner class I
+    <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> class N
+    <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> enum class E
+    <!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> inner class I
 }
 
 expect class D {
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.txt
index ea60dabe8ca..79fb4c30b7e 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/nestedClassesWithErrors.txt
@@ -71,7 +71,6 @@ public final expect class E {
     }
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -149,3 +148,4 @@ public final actual class E {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.txt
index dfd485c4a13..2866e0f02ab 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/noImplKeywordOnMember.txt
@@ -8,7 +8,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -19,3 +18,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.kt
index 09f0c54ca89..0f18a6b5c41 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.kt
@@ -3,11 +3,11 @@
 // FILE: common.kt
 
 expect class A {
-    <!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> fun foo()
-    <!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> val bar: String
-    <!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> fun Int.memExt(): Any
+    <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> fun foo()
+    <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> val bar: String
+    <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> fun Int.memExt(): Any
 
-    <!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> class Nested
+    <!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> class Nested
 }
 
 // MODULE: m1-jvm(m1-common)
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.txt
index 997f90ba950..757cf07da64 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/privateMembers.txt
@@ -16,7 +16,6 @@ public final expect class A {
     }
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -36,3 +35,4 @@ public final actual class A {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/simpleHeaderClass.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/simpleHeaderClass.txt
index 19464093d2e..bbc34c41b28 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/simpleHeaderClass.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/simpleHeaderClass.txt
@@ -7,7 +7,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -18,7 +17,6 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m3-js> --
 package
 
@@ -28,3 +26,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.kt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.kt
index 37707af6feb..bfacd7bbd9b 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.kt
@@ -8,7 +8,7 @@ interface J
 
 expect class Foo : I, C, J
 
-expect class Bar : <!JS:SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR, JVM:SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR, SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR!>C<!JS:SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS, JVM:SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS, SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS!>()<!><!>
+expect class Bar : <!SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR, SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR{JVM}, SUPERTYPE_INITIALIZED_WITHOUT_PRIMARY_CONSTRUCTOR{JS}!>C<!SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS, SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS{JVM}, SUPERTYPE_INITIALIZED_IN_EXPECTED_CLASS{JS}!>()<!><!>
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.txt b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.txt
index fe0379fe4f1..ced9e92edcb 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerClass/superClass.txt
@@ -32,7 +32,6 @@ public interface J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -69,7 +68,6 @@ public interface J {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m3-js> --
 package
 
@@ -105,3 +103,4 @@ public interface J {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt b/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt
index e2e30547342..f90553efb51 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.kt
@@ -3,7 +3,7 @@
 // FILE: common.kt
 
 class Foo {
-    <!JVM:NON_ABSTRACT_FUNCTION_WITH_NO_BODY, NON_ABSTRACT_FUNCTION_WITH_NO_BODY!><!JVM:WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET!>expect<!> fun bar(): String<!>
+    <!NON_ABSTRACT_FUNCTION_WITH_NO_BODY, NON_ABSTRACT_FUNCTION_WITH_NO_BODY{JVM}!><!WRONG_MODIFIER_TARGET, WRONG_MODIFIER_TARGET{JVM}!>expect<!> fun bar(): String<!>
 }
 
 // MODULE: m1-jvm(m1-common)
diff --git a/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.txt b/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.txt
index 5367b2d1d7c..4e5812a8a3b 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/headerFunInNonHeaderClass.txt
@@ -9,7 +9,6 @@ public final class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m1-jvm> --
 package
 
@@ -20,3 +19,4 @@ public final class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/implDelegatedMember.txt b/compiler/testData/diagnostics/tests/multiplatform/implDelegatedMember.txt
index 5bd03202138..b2598dbf1bd 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/implDelegatedMember.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/implDelegatedMember.txt
@@ -8,7 +8,6 @@ public open expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -28,3 +27,4 @@ public open actual class Foo : Bar {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/implDynamic.txt b/compiler/testData/diagnostics/tests/multiplatform/implDynamic.txt
index 8ab6fa62475..0dee352b87c 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/implDynamic.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/implDynamic.txt
@@ -11,7 +11,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-js> --
 package
 
@@ -24,3 +23,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.txt b/compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.txt
index 2a9c2ad4988..b2fb4a32842 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/implFakeOverride.txt
@@ -8,7 +8,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -27,3 +26,4 @@ public final actual class Foo : Bar {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.kt b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.kt
index db4c08e5a2b..b472ac50468 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.kt
@@ -8,7 +8,7 @@ expect inline class Foo1(val x: Int) {
 
 expect inline class Foo2(val x: Int)
 
-expect <!ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS, JVM:ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS!>inline<!> class Foo3
+expect <!ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS, ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_INLINE_CLASS{JVM}!>inline<!> class Foo3
 
 expect class NonInlineExpect
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.txt b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.txt
index bdf9167fb9c..41e20224187 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/inlineClasses/expectActualInlineClass.txt
@@ -38,7 +38,6 @@ public final expect class NonInlineExpect {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -81,3 +80,4 @@ public final actual inline class NonInlineExpect {
     public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.txt b/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.txt
index 4781dc02f78..64655e639b6 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/java/flexibleTypes.txt
@@ -11,7 +11,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -25,3 +24,4 @@ public open class FooImpl {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias Foo = FooImpl
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.txt b/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.txt
index 8f4bf9cd27c..571562715a4 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/java/parameterNames.txt
@@ -8,7 +8,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -20,3 +19,4 @@ public open class FooImpl {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias Foo = FooImpl
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.txt b/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.txt
index fb15dfe87ad..4729843e520 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/modifierApplicability.txt
@@ -19,7 +19,6 @@ public final class Outer {
 }
 public typealias Foo = kotlin.String
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -38,3 +37,4 @@ public final class Outer {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt
index 75d1e4b4dae..67f01d593e8 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt
@@ -12,9 +12,9 @@ expect class Foo(zzz: Int) {
 expect fun f2(xxx: Int)
 
 fun testCommon() {
-    Foo(<!OI;NAMED_ARGUMENTS_NOT_ALLOWED!>zzz<!> = 0)
-    val f = Foo(<!OI;NAMED_ARGUMENTS_NOT_ALLOWED!>aaa<!> = true)
-    f.f1(<!OI;NAMED_ARGUMENTS_NOT_ALLOWED!>xxx<!> = "")
+    Foo(<!NAMED_ARGUMENTS_NOT_ALLOWED{OI}!>zzz<!> = 0)
+    val f = Foo(<!NAMED_ARGUMENTS_NOT_ALLOWED{OI}!>aaa<!> = true)
+    f.f1(<!NAMED_ARGUMENTS_NOT_ALLOWED{OI}!>xxx<!> = "")
     f2(xxx = 42)
 }
 
diff --git a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.txt b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.txt
index a092f268878..7a500d25e2e 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.txt
@@ -13,7 +13,6 @@ public final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -30,3 +29,4 @@ public final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.kt b/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.kt
index 4bf271f5c90..ab76e4ec653 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.kt
@@ -2,11 +2,11 @@
 // MODULE: m1-common
 // FILE: common.kt
 
-<!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> expect fun foo()
-<!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> expect val bar: String
-<!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> expect fun Int.memExt(): Any
+<!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> expect fun foo()
+<!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> expect val bar: String
+<!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> expect fun Int.memExt(): Any
 
-<!EXPECTED_PRIVATE_DECLARATION, JVM:EXPECTED_PRIVATE_DECLARATION!>private<!> expect class Foo
+<!EXPECTED_PRIVATE_DECLARATION, EXPECTED_PRIVATE_DECLARATION{JVM}!>private<!> expect class Foo
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt
diff --git a/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.txt b/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.txt
index 9969c86e9f3..317e43b0973 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/privateTopLevelDeclarations.txt
@@ -11,7 +11,6 @@ private final expect class Foo {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -25,3 +24,4 @@ private final actual class Foo {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAlias.txt b/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAlias.txt
index 3b0703e2533..74e8c79ce25 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAlias.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAlias.txt
@@ -19,7 +19,6 @@ public sealed expect class Presence {
     }
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -44,3 +43,4 @@ public sealed class P {
     }
 }
 public actual typealias Presence = P
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAliasTopLevel.txt b/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAliasTopLevel.txt
index e17aee39f72..8a518d78c8c 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAliasTopLevel.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/sealedTypeAliasTopLevel.txt
@@ -19,7 +19,6 @@ public sealed expect class Presence {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -44,3 +43,4 @@ public sealed class P {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 public actual typealias Presence = P
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callHeaderFun.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callHeaderFun.txt
index 3253218cf24..6316aafc26e 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callHeaderFun.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callHeaderFun.txt
@@ -4,7 +4,6 @@ package
 public fun callFromCommonCode(/*0*/ x: kotlin.Int): kotlin.Int
 public expect fun foo(/*0*/ x: kotlin.Int): kotlin.Int
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -12,10 +11,10 @@ public fun callFromCommonCode(/*0*/ x: kotlin.Int): kotlin.Int
 public fun callFromJVM(/*0*/ x: kotlin.Int): kotlin.Int
 public actual fun foo(/*0*/ x: kotlin.Int): kotlin.Int
 
-
 // -- Module: <m3-js> --
 package
 
 public fun callFromCommonCode(/*0*/ x: kotlin.Int): kotlin.Int
 public fun callFromJS(/*0*/ x: kotlin.Int): kotlin.Int
 public actual fun foo(/*0*/ x: kotlin.Int): kotlin.Int
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.kt
index 0c22e4752ef..5c6282fba7f 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.kt
@@ -9,7 +9,7 @@ expect fun foo(): String
 fun g(f: () -> String): String = f()
 
 fun test() {
-    g(::<!JVM:DEPRECATION!>foo<!>)
+    g(::<!DEPRECATION{JVM}!>foo<!>)
 }
 
 // MODULE: m2-jvm(m1-common)
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.txt
index aae2194d48b..a8cff80410d 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/callableReferenceOnExpectFun.txt
@@ -7,7 +7,6 @@ package test {
     public fun test(): kotlin.Unit
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -16,3 +15,4 @@ package test {
     public fun g(/*0*/ f: () -> kotlin.String): kotlin.String
     public fun test(): kotlin.Unit
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.kt
index fa2813932f8..bef94de7134 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.kt
@@ -2,7 +2,7 @@
 // MODULE: m1-common
 // FILE: common.kt
 
-expect fun <!JS:AMBIGUOUS_ACTUALS, JVM:AMBIGUOUS_ACTUALS!>foo<!>()
+expect fun <!AMBIGUOUS_ACTUALS{JVM}, AMBIGUOUS_ACTUALS{JS}!>foo<!>()
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.txt
index 71183a4452e..0359b3c5523 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/conflictingImplDeclarations.txt
@@ -3,16 +3,15 @@ package
 
 public expect fun foo(): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public actual fun foo(): kotlin.Unit
 public actual fun foo(): kotlin.Unit
 
-
 // -- Module: <m3-js> --
 package
 
 public actual fun foo(): kotlin.Unit
 public actual fun foo(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.txt
index e397ad4e8f0..b93a45d806d 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/functionModifiers.txt
@@ -7,7 +7,6 @@ public expect fun tailrec(): kotlin.Unit
 public expect fun kotlin.String.and(/*0*/ other: kotlin.String): kotlin.String
 public expect fun kotlin.String.unaryMinus(): kotlin.String
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -16,3 +15,4 @@ public actual inline fun inline(): kotlin.Unit
 public actual tailrec fun tailrec(): kotlin.Unit
 public actual infix fun kotlin.String.and(/*0*/ other: kotlin.String): kotlin.String
 public actual operator fun kotlin.String.unaryMinus(): kotlin.String
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.kt
index 81a5230deb6..b475da2119c 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.kt
@@ -3,7 +3,7 @@
 // FILE: common.kt
 package common
 
-expect fun <!JS:NO_ACTUAL_FOR_EXPECT, JVM:NO_ACTUAL_FOR_EXPECT!>foo<!>()
+expect fun <!NO_ACTUAL_FOR_EXPECT{JVM}, NO_ACTUAL_FOR_EXPECT{JS}!>foo<!>()
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.txt
index befbce3ce51..c171d427fa8 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/headerAndImplInDIfferentPackages.txt
@@ -5,7 +5,6 @@ package common {
     public expect fun foo(): kotlin.Unit
 }
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -13,10 +12,10 @@ package jvm {
     public actual fun foo(): kotlin.Unit
 }
 
-
 // -- Module: <m3-js> --
 package
 
 package js {
     public actual fun foo(): kotlin.Unit
 }
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.txt
index bfd50ddadbd..e6c754123d9 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/implDeclarationWithoutBody.txt
@@ -3,9 +3,9 @@ package
 
 public expect fun foo(): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public actual fun bar(): kotlin.Unit
 public actual fun foo(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.txt
index 99bdf29fd28..a69333043f5 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/inlineFun.txt
@@ -4,16 +4,15 @@ package
 public expect inline fun inlineFun(): kotlin.Unit
 public expect fun nonInlineFun(): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public actual fun inlineFun(): kotlin.Unit
 public actual fun nonInlineFun(): kotlin.Unit
 
-
 // -- Module: <m3-js> --
 package
 
 public actual inline fun inlineFun(): kotlin.Unit
 public actual inline fun nonInlineFun(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/simpleHeaderFun.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/simpleHeaderFun.txt
index fd7094cdc35..2ddcccf5217 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/simpleHeaderFun.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/simpleHeaderFun.txt
@@ -3,14 +3,13 @@ package
 
 public expect fun foo(): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 public actual fun foo(): kotlin.Unit
 
-
 // -- Module: <m3-js> --
 package
 
 public actual fun foo(): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.kt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.kt
index 42fd68f062d..4193e874d90 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.kt
@@ -11,8 +11,8 @@ expect fun f4(s: () -> String)
 expect inline fun f5(s: () -> String)
 expect inline fun f6(crossinline s: () -> String)
 
-expect fun f7<!JVM:NO_ACTUAL_FOR_EXPECT!>(x: Any)<!>
-expect fun f8<!JVM:NO_ACTUAL_FOR_EXPECT!>(vararg x: Any)<!>
+expect fun f7<!NO_ACTUAL_FOR_EXPECT{JVM}!>(x: Any)<!>
+expect fun f8<!NO_ACTUAL_FOR_EXPECT{JVM}!>(vararg x: Any)<!>
 
 // MODULE: m2-jvm(m1-common)
 // FILE: jvm.kt
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.txt
index 11eb0f299aa..335fc1e09c1 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelFun/valueParameterModifiers.txt
@@ -10,7 +10,6 @@ public expect inline fun f6(/*0*/ crossinline s: () -> kotlin.String): kotlin.Un
 public expect fun f7(/*0*/ x: kotlin.Any): kotlin.Unit
 public expect fun f8(/*0*/ vararg x: kotlin.Any /*kotlin.Array<out kotlin.Any>*/): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
@@ -22,3 +21,4 @@ public actual inline fun f5(/*0*/ crossinline s: () -> kotlin.String): kotlin.Un
 public actual inline fun f6(/*0*/ s: () -> kotlin.String): kotlin.Unit
 public actual fun f7(/*0*/ vararg x: kotlin.Any /*kotlin.Array<out kotlin.Any>*/): kotlin.Unit
 public actual fun f8(/*0*/ x: kotlin.Any): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/simpleHeaderVar.txt b/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/simpleHeaderVar.txt
index ef55dea0593..ef7bf0917d3 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/simpleHeaderVar.txt
+++ b/compiler/testData/diagnostics/tests/multiplatform/topLevelProperty/simpleHeaderVar.txt
@@ -3,14 +3,13 @@ package
 
 public expect var foo: kotlin.String
 
-
 // -- Module: <m2-jvm> --
 package
 
 public actual var foo: kotlin.String
 
-
 // -- Module: <m3-js> --
 package
 
 public actual var foo: kotlin.String
+
diff --git a/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/secondNamed.fir.kt b/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/secondNamed.fir.kt
index c46ef743c54..60037b304c0 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/secondNamed.fir.kt
+++ b/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/secondNamed.fir.kt
@@ -16,3 +16,4 @@ fun main() {
     <!INAPPLICABLE_CANDIDATE!>foo<!>(b = "first", a = "a", "second") // prints "a, second"
     <!INAPPLICABLE_CANDIDATE!>reformat<!>(normalizeCase = "first",str = "","second",false,true, 's' )
 }
+
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.fir.kt
index c86e322fbab..88c1df2e526 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.fir.kt
@@ -36,4 +36,4 @@ fun main() {
 
     val f : String = a!!
     <!INAPPLICABLE_CANDIDATE!>checkSubtype<!><String>(a!!)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt
index 7da916ddce0..211ce6449e1 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt
@@ -35,5 +35,5 @@ fun main() {
     }
 
     val <!UNUSED_VARIABLE!>f<!> : String = <!TYPE_MISMATCH!>a<!><!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
-    checkSubtype<String>(<!NI;TYPE_MISMATCH!><!OI;TYPE_MISMATCH!>a<!><!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!><!>)
-}
\ No newline at end of file
+    checkSubtype<String>(<!TYPE_MISMATCH{NI}!><!TYPE_MISMATCH{OI}!>a<!><!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!><!>)
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.kt
index fd169ae4710..4db26fe8a4f 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.kt
@@ -15,7 +15,7 @@ fun foo() {
 
     val y: Int? = 0
     val z: Int? = 0
-    bar(<!NI;TYPE_MISMATCH!>if (y != null) y else <!OI;TYPE_MISMATCH!>z<!><!>, <!TYPE_MISMATCH!>y<!>)
+    bar(<!TYPE_MISMATCH{NI}!>if (y != null) y else <!TYPE_MISMATCH{OI}!>z<!><!>, <!TYPE_MISMATCH!>y<!>)
     y <!UNSAFE_OPERATOR_CALL!>+<!> 2
     baz(<!TYPE_MISMATCH!>y<!>, <!TYPE_MISMATCH!>y<!>, if (y == null) return else y, y)
     baz(y, z!!, z, y)
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/nullableReceiverWithOverloadedMethod.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/nullableReceiverWithOverloadedMethod.kt
index 98add7026d6..4fd00ebcb62 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/nullableReceiverWithOverloadedMethod.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/nullableReceiverWithOverloadedMethod.kt
@@ -26,4 +26,4 @@ class B {
             6
         })
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unstableSmartcastWithOverloadedExtensions.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unstableSmartcastWithOverloadedExtensions.kt
index 3dd22f00ca3..8a05ee7fba5 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unstableSmartcastWithOverloadedExtensions.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unstableSmartcastWithOverloadedExtensions.kt
@@ -11,4 +11,4 @@ fun smartCastInterference(b: B) {
     if (a != null) {
         <!SMARTCAST_IMPOSSIBLE!>a<!>.foo(b)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.kt b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.kt
index bec2e0777e5..718554dae0d 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.kt
@@ -15,4 +15,4 @@ fun test(j: J, nullStr: String?, nullByte: Byte?, nullDouble: Double?) {
     j.foo(nullStr)
     j.foo(<!TYPE_MISMATCH!>nullDouble<!>)
     j.foo(nullByte)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.kt b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.kt
index 764767b9c16..bf7b67381db 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.kt
@@ -10,4 +10,4 @@ fun bar(nullX: Int?, nullY: String?, notNullY: String) {
     foo(<!TYPE_MISMATCH!>nullX<!>, notNullY)
     foo(<!TYPE_MISMATCH!>nullX<!>, <!TYPE_MISMATCH!>nullY<!>)
     <!NONE_APPLICABLE!>foo<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.fir.kt b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.fir.kt
index 4cedf9fc624..99e341d1bfa 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.fir.kt
@@ -11,4 +11,4 @@ fun <T> T.testThis(): String? {
         return this?.toString()
     }
     return this?.toString()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt
index 0476d26f7da..27b11f14094 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt
@@ -10,5 +10,5 @@ fun <T> T.testThis(): String? {
     if (this != null) {
         return this<!UNNECESSARY_SAFE_CALL!>?.<!>toString()
     }
-    return <!OI;DEBUG_INFO_CONSTANT!>this<!>?.toString()
-}
\ No newline at end of file
+    return <!DEBUG_INFO_CONSTANT{OI}!>this<!>?.toString()
+}
diff --git a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt b/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt
index c91e751e401..0b478abd11b 100644
--- a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt
+++ b/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt
@@ -8,5 +8,5 @@ fun test() {
     foo(<!TYPE_MISMATCH!>c<!>)
 
     val d: Char? = 'd'
-    foo(<!NI;TYPE_MISMATCH!><!OI;TYPE_MISMATCH!>d<!>!!<!>)
+    foo(<!TYPE_MISMATCH{NI}!><!TYPE_MISMATCH{OI}!>d<!>!!<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt
index e17f289ee67..aa00626fded 100644
--- a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt
+++ b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt
@@ -21,5 +21,5 @@ fun test() {
     val d = either(11, 2.3)
     checkSubtype<Any>(d)
 
-    val <!UNUSED_VARIABLE!>e<!>: Float = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>id(1)<!>
+    val <!UNUSED_VARIABLE!>e<!>: Float = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>id(1)<!>
 }
diff --git a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt
index 2bbe756f018..121c51f3363 100644
--- a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt
+++ b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt
@@ -13,5 +13,5 @@ fun main() {
     //not 'An integer literal does not conform to the expected type Int/Long'
     val <!UNUSED_VARIABLE!>l<!>: Long = <!INT_LITERAL_OUT_OF_RANGE!>1111111111111117777777777777777<!>
     foo(<!INT_LITERAL_OUT_OF_RANGE!>11111111111111177777777777777<!>)
-    bar(<!INT_LITERAL_OUT_OF_RANGE, NI;TYPE_MISMATCH!>11111111111111177777777777777<!>)
+    bar(<!INT_LITERAL_OUT_OF_RANGE, TYPE_MISMATCH{NI}!>11111111111111177777777777777<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt
index 4c6fbb91feb..92d54db7d5c 100644
--- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt
+++ b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt
@@ -17,9 +17,9 @@ fun <T> otherGeneric(<!UNUSED_PARAMETER!>l<!>: List<T>) {}
 fun test() {
     val a: Byte = id(1)
 
-    val b: Byte = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>id(300)<!>
+    val b: Byte = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>id(300)<!>
 
-    val c: Int = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>id(9223372036854775807)<!>
+    val c: Int = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>id(9223372036854775807)<!>
 
     val d = id(22)
     checkSubtype<Int>(d)
@@ -29,14 +29,14 @@ fun test() {
 
     val f: Byte = either(1, 2)
 
-    val g: Byte = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>either(1, 300)<!>
+    val g: Byte = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>either(1, 300)<!>
 
     other(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>11<!>)
 
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>otherGeneric<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>otherGeneric<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
 
     val r = either(1, "")
-    r checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Any>() }
+    r checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Any>() }
 
     use(a, b, c, d, e, f, g, r)
 }
@@ -48,7 +48,7 @@ interface Inv<T>
 fun <T> exactBound(t: T, l: Inv<T>): T = throw Exception("$t $l")
 
 fun testExactBound(invS: Inv<String>, invI: Inv<Int>, invB: Inv<Byte>) {
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>exactBound<!>(1, <!NI;TYPE_MISMATCH!>invS<!>)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>exactBound<!>(1, <!TYPE_MISMATCH{NI}!>invS<!>)
     exactBound(1, invI)
 
     val b = exactBound(1, invB)
@@ -61,7 +61,7 @@ fun <T> lowerBound(t: T, l : Cov<T>): T = throw Exception("$t $l")
 
 fun testLowerBound(cov: Cov<String>, covN: Cov<Number>) {
     val r = lowerBound(1, cov)
-    r checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Any>() }
+    r checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Any>() }
 
     val n = lowerBound(1, covN)
     n checkType { _<Number>() }
@@ -72,7 +72,7 @@ interface Contr<in T>
 fun <T> upperBound(t: T, l: Contr<T>): T = throw Exception("$t $l")
 
 fun testUpperBound(contrS: Contr<String>, contrB: Contr<Byte>, contrN: Contr<Number>) {
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>upperBound<!>(1, <!NI;TYPE_MISMATCH!>contrS<!>)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>upperBound<!>(1, <!TYPE_MISMATCH{NI}!>contrS<!>)
 
     val n = upperBound(1, contrN)
     n checkType { _<Int>() }
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/annotationConstructor.kt b/compiler/testData/diagnostics/tests/objects/kt21515/annotationConstructor.kt
index 8129714dda7..87312b7a079 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/annotationConstructor.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/annotationConstructor.kt
@@ -10,4 +10,4 @@ class Derived : Base() {
 
     @<!DEPRECATED_ACCESS_BY_SHORT_NAME!>Foo<!>
     fun foo() = 42
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.kt b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.kt
index d062660d407..5ed8eb07fb9 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesNew.kt
@@ -139,4 +139,4 @@ class C : O.B() {
 
     // DEPRECATED: Classifiers from supertypes of our own companion
     val r = <!UNRESOLVED_REFERENCE!>FromDelta<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>foo<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.kt b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.kt
index 70899a07f0e..6aa265ee69d 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOld.kt
@@ -139,4 +139,4 @@ class C : O.B() {
 
     // DEPRECATED: Classifiers from supertypes of our own companion
     val r = <!DEPRECATED_ACCESS_BY_SHORT_NAME!>FromDelta<!>::foo
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOldComplexCases.kt b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOldComplexCases.kt
index a774f4f746e..bed3061e562 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOldComplexCases.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/callableReferencesOldComplexCases.kt
@@ -66,4 +66,4 @@ object D {
     class Derived : Base() {
         val a = <!DEPRECATED_ACCESS_BY_SHORT_NAME!>FromBaseCompanion<!>::foo
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/inheritedFromDeprecatedOld.kt b/compiler/testData/diagnostics/tests/objects/kt21515/inheritedFromDeprecatedOld.kt
index f7113d0e739..88805b91fd9 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/inheritedFromDeprecatedOld.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/inheritedFromDeprecatedOld.kt
@@ -97,4 +97,4 @@ open class C : O.B() {
 
     // DEPRECATED: Classifiers from supertypes of our own companion
     open class r : <!DEPRECATED_ACCESS_BY_SHORT_NAME!>FromDelta<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaOld.kt b/compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaOld.kt
index 5331d6f75e5..d550d8aa03b 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaOld.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/staticsFromJavaOld.kt
@@ -45,4 +45,4 @@ class Derived : Base() {
     class JavaStaticInSupertypeList : <!DEPRECATED_ACCESS_BY_SHORT_NAME!>Classifier<!>() {
 
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorOld.kt b/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorOld.kt
index 47eace1ee00..68cefbafeab 100644
--- a/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorOld.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt21515/useDeprecatedConstructorOld.kt
@@ -96,4 +96,4 @@ class C : O.B() {
 
     // DEPRECATED: Classifiers from supertypes of our own companion
     val r = <!DEPRECATED_ACCESS_BY_SHORT_NAME!>FromDelta()<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/objects/localObjects.kt b/compiler/testData/diagnostics/tests/objects/localObjects.kt
index 882e3e0aa53..2b214af97a0 100644
--- a/compiler/testData/diagnostics/tests/objects/localObjects.kt
+++ b/compiler/testData/diagnostics/tests/objects/localObjects.kt
@@ -12,4 +12,4 @@ fun foo() {
     val f = {
         <!LOCAL_OBJECT_NOT_ALLOWED!>object e<!> {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/operatorRem/deprecatedModConvention.kt b/compiler/testData/diagnostics/tests/operatorRem/deprecatedModConvention.kt
index d25e4468d83..1a323c3c11c 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/deprecatedModConvention.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/deprecatedModConvention.kt
@@ -35,4 +35,4 @@ fun foo() {
 
     OldMod.mod(1)
     ModExtension.mod(1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/operatorRem/noDeprecatedModConventionWithoutFeature.kt b/compiler/testData/diagnostics/tests/operatorRem/noDeprecatedModConventionWithoutFeature.kt
index c8b3a80504f..6bea766e865 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/noDeprecatedModConventionWithoutFeature.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/noDeprecatedModConventionWithoutFeature.kt
@@ -35,4 +35,4 @@ fun foo() {
 
     OldMod.mod(1)
     ModExtension.mod(1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/operatorRem/numberRemConversions.kt b/compiler/testData/diagnostics/tests/operatorRem/numberRemConversions.kt
index 8a4f61dc926..468608b6a21 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/numberRemConversions.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/numberRemConversions.kt
@@ -12,4 +12,4 @@ fun test() {
     fooShort(1 % 1)
 }
 
-public operator fun Int.<!EXTENSION_SHADOWED_BY_MEMBER!>rem<!>(other: Int): Int = 0
\ No newline at end of file
+public operator fun Int.<!EXTENSION_SHADOWED_BY_MEMBER!>rem<!>(other: Int): Int = 0
diff --git a/compiler/testData/diagnostics/tests/operatorRem/preferRemWithImplicitReceivers.kt b/compiler/testData/diagnostics/tests/operatorRem/preferRemWithImplicitReceivers.kt
index cd1b40ce8df..67caa7fb50f 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/preferRemWithImplicitReceivers.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/preferRemWithImplicitReceivers.kt
@@ -17,4 +17,4 @@ fun test() {
     }
 }
 
-fun takeString(s: String) {}
\ No newline at end of file
+fun takeString(s: String) {}
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.fir.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.fir.kt
index 9542129f87d..b09a1166905 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.fir.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.fir.kt
@@ -10,4 +10,4 @@ fun main() {
     a[1]++
     a[1] += 3
     a[1] = a[1] + 3
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt
index 1c3ba2925e5..fe05453ce05 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt
@@ -7,7 +7,7 @@ class A {
 
 fun main() {
     val a = A()
-    <!OPERATOR_MODIFIER_REQUIRED!>a<!NI;NO_SET_METHOD!>[1]<!><!>++
-    <!OPERATOR_MODIFIER_REQUIRED!>a<!NI;NO_SET_METHOD!>[1]<!><!> += 3
+    <!OPERATOR_MODIFIER_REQUIRED!>a<!NO_SET_METHOD{NI}!>[1]<!><!>++
+    <!OPERATOR_MODIFIER_REQUIRED!>a<!NO_SET_METHOD{NI}!>[1]<!><!> += 3
     <!OPERATOR_MODIFIER_REQUIRED!>a[1]<!> = a[1] + 3
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.fir.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.fir.kt
index 13bc8707003..4b6ff721930 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.fir.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.fir.kt
@@ -1,4 +1,4 @@
 // !WITH_NEW_INFERENCE
 //KT-13330 AssertionError: Illegal resolved call to variable with invoke
 
-fun foo(exec: (String.() -> Unit)?) = "".<!INAPPLICABLE_CANDIDATE!>exec<!><caret>() // <caret> is test data tag here
\ No newline at end of file
+fun foo(exec: (String.() -> Unit)?) = "".<!INAPPLICABLE_CANDIDATE!>exec<!><caret>() // <caret> is test data tag here
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.kt
index 33795f62314..7d17e513ad6 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.kt
@@ -1,4 +1,4 @@
 // !WITH_NEW_INFERENCE
 //KT-13330 AssertionError: Illegal resolved call to variable with invoke
 
-fun foo(exec: (String.() -> Unit)?) = "".<!NI;UNSAFE_IMPLICIT_INVOKE_CALL, NI;WRONG_NUMBER_OF_TYPE_ARGUMENTS, OI;UNSAFE_IMPLICIT_INVOKE_CALL!>exec<!><!OI;WRONG_NUMBER_OF_TYPE_ARGUMENTS!><<!UNRESOLVED_REFERENCE!>caret<!>><!>() // <caret> is test data tag here
\ No newline at end of file
+fun foo(exec: (String.() -> Unit)?) = "".<!UNSAFE_IMPLICIT_INVOKE_CALL, WRONG_NUMBER_OF_TYPE_ARGUMENTS{NI}!>exec<!><!WRONG_NUMBER_OF_TYPE_ARGUMENTS{OI}!><<!UNRESOLVED_REFERENCE!>caret<!>><!>() // <caret> is test data tag here
diff --git a/compiler/testData/diagnostics/tests/overload/kt2493.fir.kt b/compiler/testData/diagnostics/tests/overload/kt2493.fir.kt
index ccde55d8321..39b45d7b9d6 100644
--- a/compiler/testData/diagnostics/tests/overload/kt2493.fir.kt
+++ b/compiler/testData/diagnostics/tests/overload/kt2493.fir.kt
@@ -17,4 +17,4 @@ fun main() {
     AImpl().f()
     BImpl().f()
     C().<!AMBIGUITY!>f<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/overload/kt2493.kt b/compiler/testData/diagnostics/tests/overload/kt2493.kt
index 27edddd87fa..73424902928 100644
--- a/compiler/testData/diagnostics/tests/overload/kt2493.kt
+++ b/compiler/testData/diagnostics/tests/overload/kt2493.kt
@@ -16,5 +16,5 @@ class C: A, B
 fun main() {
     AImpl().f()
     BImpl().f()
-    C().<!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>f<!>()
-}
\ No newline at end of file
+    C().<!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>f<!>()
+}
diff --git a/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.kt b/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.kt
index e92b440e116..f78594497fb 100644
--- a/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.kt
+++ b/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.kt
@@ -11,4 +11,4 @@ open class C {
 
 class Subject : C(), A {
     val c = <!INVISIBLE_MEMBER!>a<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt
index 739c9e166f4..8ca71dcd74b 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt
@@ -1,7 +1,7 @@
 // !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// JAVAC_SKIP
+// SKIP_JAVAC
 // NI_EXPECTED_FILE
 // FILE: p/J.java
 
@@ -24,4 +24,4 @@ fun test(a: Out<Nothing>, b: Out<MutableList<J>>) {
     val v = f(a, b, out(J.j()))
     v checkType { _<MutableList<J>>() }
     v checkType { <!INAPPLICABLE_CANDIDATE!>_<!><MutableList<J?>>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.kt b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.kt
index 8d520ab13ed..eec363d673e 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.kt
@@ -1,7 +1,7 @@
 // !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// JAVAC_SKIP
+// SKIP_JAVAC
 // NI_EXPECTED_FILE
 // FILE: p/J.java
 
@@ -23,5 +23,5 @@ fun <T> out(t: T): Out<MutableList<T>> = null!!
 fun test(a: Out<Nothing>, b: Out<MutableList<J>>) {
     val v = f(a, b, out(J.j()))
     v checkType { _<MutableList<J>>() }
-    v checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><MutableList<J?>>() }
-}
\ No newline at end of file
+    v checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><MutableList<J?>>() }
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.fir.kt
index 395fbdddb07..5cce6cae9c7 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.fir.kt
@@ -7,4 +7,4 @@ fun test() {
     var nullable: Foo? = null
     val foo: Collection<Foo> = java.util.Collections.singleton(nullable)
     val foo1: Collection<Foo> = java.util.Collections.singleton(nullable!!)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt
index 8a6b6df8bcb..4a719283223 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt
@@ -5,6 +5,6 @@ interface Foo
 
 fun test() {
     var nullable: Foo? = null
-    val foo: Collection<Foo> = <!NI;TYPE_MISMATCH!>java.util.Collections.<!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>singleton(nullable)<!><!>
+    val foo: Collection<Foo> = <!TYPE_MISMATCH{NI}!>java.util.Collections.<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>singleton(nullable)<!><!>
     val foo1: Collection<Foo> = java.util.Collections.singleton(nullable!!)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.kt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.kt
index 7629ccbec8c..fd07ab11be7 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.kt
@@ -11,9 +11,9 @@ public class A {
 // FILE: k.kt
 
 fun test() {
-    A.<!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>bar<!>(<!NULL_FOR_NONNULL_TYPE!>null<!>, "")
+    A.<!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>bar<!>(<!NULL_FOR_NONNULL_TYPE!>null<!>, "")
 
     A.bar<String>(<!NULL_FOR_NONNULL_TYPE!>null<!>, "")
     A.bar<String?>(<!NULL_FOR_NONNULL_TYPE!>null<!>, "")
-    A.<!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>bar<!>(<!NULL_FOR_NONNULL_TYPE!>null<!>, A.platformString())
+    A.<!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>bar<!>(<!NULL_FOR_NONNULL_TYPE!>null<!>, A.platformString())
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
index e82ea974494..8f89d89fa9f 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
@@ -52,4 +52,4 @@ fun test() {
     platformNN += 1
     platformN <!UNSAFE_OPERATOR_CALL!>+=<!> 1
     platformJ += 1
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.kt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.kt
index 5b34f9874cf..b4e216c8712 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.kt
@@ -28,15 +28,15 @@ fun main() {
     val raw = Test.rawAField
 
     raw.charSequences = arrayOf<String>()
-    raw.charSequences = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>arrayOf<Double>()<!>
+    raw.charSequences = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>arrayOf<Double>()<!>
 
     raw.maps = arrayOf<Map<Int, Int>>()
     raw.maps = arrayOf<MutableMap<Int, Int>>()
-    raw.maps = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>arrayOf<List<String>>()<!>
+    raw.maps = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>arrayOf<List<String>>()<!>
 
     raw.arraysOfLists = arrayOf<Array<List<*>>>()
-    raw.arraysOfLists = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>arrayOf<List<String>>()<!>
-    raw.arraysOfLists = <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>arrayOf<Array<Array<String>>>()<!>
+    raw.arraysOfLists = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>arrayOf<List<String>>()<!>
+    raw.arraysOfLists = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>arrayOf<Array<Array<String>>>()<!>
 
     raw.arraysOfAny = arrayOf<Array<Array<String>>>()
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonGenericRawMember.kt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonGenericRawMember.kt
index 6fe7cdcf74f..6cb93787071 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonGenericRawMember.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/nonGenericRawMember.kt
@@ -30,5 +30,5 @@ val strList: List<String> = null!!
 fun main() {
     val rawB = Test.rawAField.b;
     // Raw(A).b is not erased because it have no type parameters
-    var rawInner = rawB.bar(<!TYPE_MISMATCH("(Mutable)List<Double!>!", "List<String>")!>strList<!>)
+    var rawInner = rawB.bar(<!TYPE_MISMATCH("(Mutable)List<Double!>!; List<String>")!>strList<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.kt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.kt
index 0f43cdde327..cb4a5be6f32 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.kt
@@ -21,7 +21,7 @@ class B {
 fun main() {
     fun println() {}
     // All parameters in SAM adapter of `foo` have functional types
-    B().foo(<!OI;TYPE_MISMATCH!>{ println() }<!>, B.bar())
+    B().foo(<!TYPE_MISMATCH{OI}!>{ println() }<!>, B.bar())
     // So you should use SAM constructors when you want to use mix lambdas and Java objects
     B().foo(Runnable { println() }, B.bar())
     B().foo({ println() }, { it: Any? -> it == null } )
diff --git a/compiler/testData/diagnostics/tests/privateInFile/visibility.kt b/compiler/testData/diagnostics/tests/privateInFile/visibility.kt
index 5c92a64dbed..f61df940fd2 100644
--- a/compiler/testData/diagnostics/tests/privateInFile/visibility.kt
+++ b/compiler/testData/diagnostics/tests/privateInFile/visibility.kt
@@ -29,21 +29,21 @@ package a
 
 fun test() {
     val y = makeA()
-    y.<!INVISIBLE_MEMBER("A", "private", "file")!>bar<!>()
-    <!INVISIBLE_MEMBER("foo", "private", "file")!>foo<!>()
+    y.<!INVISIBLE_MEMBER("A; private; file")!>bar<!>()
+    <!INVISIBLE_MEMBER("foo; private; file")!>foo<!>()
 
-    val u : <!INVISIBLE_REFERENCE("A", "private", "file")!>A<!> = <!INVISIBLE_MEMBER("A", "private", "file")!>A<!>()
+    val u : <!INVISIBLE_REFERENCE("A; private; file")!>A<!> = <!INVISIBLE_MEMBER("A; private; file")!>A<!>()
 
-    val z = <!INVISIBLE_MEMBER("x", "private", "file")!>x<!>
-    <!INVISIBLE_MEMBER("x", "private", "file")!>x<!> = 30
+    val z = <!INVISIBLE_MEMBER("x; private; file")!>x<!>
+    <!INVISIBLE_MEMBER("x; private; file")!>x<!> = 30
 
-    val po = <!INVISIBLE_MEMBER("PO", "private", "file")!>PO<!>
+    val po = <!INVISIBLE_MEMBER("PO; private; file")!>PO<!>
 
     val v = xx
-    <!INVISIBLE_SETTER("xx", "private", "file")!>xx<!> = 40
+    <!INVISIBLE_SETTER("xx; private; file")!>xx<!> = 40
 }
 
-class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A", "private", "file"), INVISIBLE_REFERENCE("A", "private", "file")!>A<!>()<!> {}
+class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A; private; file"), INVISIBLE_REFERENCE("A; private; file")!>A<!>()<!> {}
 
 class Q {
     class W {
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.kt
index cea319d6347..686ff76a21d 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.kt
@@ -1,7 +1,7 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
-val x get() = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>()
-val y get() = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!>()
+val x get() = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>()
+val y get() = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>bar<!>()
 
 fun <E> foo(): E = null!!
 fun <E> bar(): List<E> = null!!
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.kt
index 7726b324b40..fed89a4295e 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.kt
@@ -7,7 +7,7 @@ object Outer {
                 get() = 0
 
             override fun get(index: Int): Char {
-                checkSubtype<CharSequence>(<!NI;DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!>)
+                checkSubtype<CharSequence>(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!>)
                 return ' '
             }
 
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt
index fdaa7e1e5c0..86f81277cb9 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt
@@ -2,16 +2,16 @@
 // !CHECK_TYPE
 // NI_EXPECTED_FILE
 
-val x get() = <!NI;DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!>
+val x get() = <!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!>
 
 class A {
-    val y get() = <!NI;DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>y<!>
+    val y get() = <!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>y<!>
 
     val a get() = <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>b<!>
-    val b get() = <!NI;DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>a<!>
+    val b get() = <!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>a<!>
 
-    val z1 get() = id(<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>z1<!>)
-    val z2 get() = l(<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>z2<!>)
+    val z1 get() = id(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>z1<!>)
+    val z2 get() = l(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>z2<!>)
 
     val u get() = <!UNRESOLVED_REFERENCE!>field<!>
 }
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt
index ebb83e878de..994e836395f 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt
@@ -8,8 +8,8 @@
 }<!>
 
 // cantBeInferred.kt
-<!UNSUPPORTED_FEATURE!>val x1 get() = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>()<!>
-<!UNSUPPORTED_FEATURE!>val y1 get() = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!>()<!>
+<!UNSUPPORTED_FEATURE!>val x1 get() = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>()<!>
+<!UNSUPPORTED_FEATURE!>val y1 get() = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>bar<!>()<!>
 
 fun <E> foo(): E = null!!
 fun <E> bar(): List<E> = null!!
@@ -43,7 +43,7 @@ fun <E> l(<!UNUSED_PARAMETER!>x<!>: E): List<E> = null!!
     }<!>
 
 // recursive
-<!UNSUPPORTED_FEATURE!>val x4 get() = <!NI;DEBUG_INFO_MISSING_UNRESOLVED, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x4<!><!>
+<!UNSUPPORTED_FEATURE!>val x4 get() = <!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x4<!><!>
 
 // null as nothing
 <!UNSUPPORTED_FEATURE!>val x5 get() = null<!>
@@ -68,4 +68,4 @@ object Outer {
         set(q) {
             x = q
         }<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/GenericClassVsPackage.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/GenericClassVsPackage.txt
index bf0b415c4c8..fa994120836 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/GenericClassVsPackage.txt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/GenericClassVsPackage.txt
@@ -15,7 +15,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -37,14 +36,12 @@ package a {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 public fun test(/*0*/ ab_c: a.b.c): kotlin.Unit
 public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 
-
 // -- Module: <top_m1> --
 package
 
@@ -59,7 +56,6 @@ package a {
     }
 }
 
-
 // -- Module: <top_m2> --
 package
 
@@ -79,9 +75,9 @@ public final class a</*0*/ T> {
     }
 }
 
-
 // -- Module: <top_m3> --
 package
 
 public fun test(/*0*/ a_b: a.b): kotlin.Unit
 public fun test2(/*0*/ _ab: a.b): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass.txt
index 23ce2a51557..d6f69c45ad4 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass.txt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass.txt
@@ -1,3 +1,49 @@
+// -- Module: <m1> --
+package
+
+package a {
+
+    package a.b {
+
+        public final class c {
+            public constructor c()
+            public final fun ab_c(): kotlin.Unit
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+}
+
+// -- Module: <m2> --
+package
+
+package a {
+    public fun a_fun(): kotlin.Unit
+
+    public final class b {
+        public constructor b()
+        public final fun a_b(): kotlin.Unit
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+        public final class c {
+            public constructor c()
+            public final fun a_bc(): kotlin.Unit
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+}
+
+// -- Module: <m3> --
+package
+
+public fun test(/*0*/ a_b: a.b): kotlin.Unit
+public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
+
 // -- Module: <_m1> --
 package
 
@@ -24,7 +70,6 @@ package a {
     }
 }
 
-
 // -- Module: <_m2> --
 package
 
@@ -48,58 +93,9 @@ package a {
     }
 }
 
-
 // -- Module: <_m3> --
 package
 
 public fun test(/*0*/ a_b: a.b): kotlin.Unit
 public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
 
-
-// -- Module: <m1> --
-package
-
-package a {
-
-    package a.b {
-
-        public final class c {
-            public constructor c()
-            public final fun ab_c(): kotlin.Unit
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-    }
-}
-
-
-// -- Module: <m2> --
-package
-
-package a {
-    public fun a_fun(): kotlin.Unit
-
-    public final class b {
-        public constructor b()
-        public final fun a_b(): kotlin.Unit
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-        public final class c {
-            public constructor c()
-            public final fun a_bc(): kotlin.Unit
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-    }
-}
-
-
-// -- Module: <m3> --
-package
-
-public fun test(/*0*/ a_b: a.b): kotlin.Unit
-public fun test2(/*0*/ ab_c: a.b.c): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt
index 3b7f3ac663c..74b2ba4f0d9 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsClass2.txt
@@ -26,7 +26,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -41,10 +40,10 @@ package test {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
 package test {
     public fun foo(/*0*/ i: a.a): kotlin.Unit
 }
+
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsRootClass.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsRootClass.txt
index 87b9a3cdda2..2de0453918f 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsRootClass.txt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/PackageVsRootClass.txt
@@ -12,7 +12,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -31,7 +30,6 @@ public final class a {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -44,3 +42,4 @@ package a {
 package some {
     public fun test(/*0*/ a_b: a.b): kotlin.Unit
 }
+
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.fir.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.fir.kt
index 2d0f2a637ed..ee8c478f187 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.fir.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.fir.kt
@@ -29,4 +29,4 @@ fun test4(a: <!UNRESOLVED_REFERENCE!>A.B.ee<!>): <!UNRESOLVED_REFERENCE!>A.B.ee<
 
 fun test5(a: <!UNRESOLVED_REFERENCE!>A.ee<!>): <!UNRESOLVED_REFERENCE!>A.ee<!> {
     val aa: <!UNRESOLVED_REFERENCE!>A.ee<!> = null!!
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt
index 537aacf1120..e6119f16e33 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt
@@ -17,16 +17,16 @@ fun test1(a: A.B.<!SYNTAX!><!>): A.B.<!SYNTAX!><!> {
 
 fun test2(a: A.<!UNRESOLVED_REFERENCE!>e<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>C<!>): A.<!UNRESOLVED_REFERENCE!>e<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>C<!> {
     val aa: A.<!UNRESOLVED_REFERENCE!>e<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>C<!> = null!!
-<!NI;NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
+<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY{NI}!>}<!>
 
 fun test3(a: <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>A<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>C<!>): <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>A<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>C<!> {
     val aa: <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>A<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>C<!> = null!!
-<!NI;NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
+<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY{NI}!>}<!>
 
 fun test4(a: A.B.<!UNRESOLVED_REFERENCE!>ee<!>): A.B.<!UNRESOLVED_REFERENCE!>ee<!> {
     val aa: A.B.<!UNRESOLVED_REFERENCE!>ee<!> = null!!
-<!NI;NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
+<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY{NI}!>}<!>
 
 fun test5(a: A.<!UNRESOLVED_REFERENCE!>ee<!>): A.<!UNRESOLVED_REFERENCE!>ee<!> {
     val aa: A.<!UNRESOLVED_REFERENCE!>ee<!> = null!!
-<!NI;NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
\ No newline at end of file
+<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY{NI}!>}<!>
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt
index da1ae67a9fc..42784851b6e 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt
@@ -1,2 +1,2 @@
 // !WITH_NEW_INFERENCE
-val unwrapped = <!UNRESOLVED_REFERENCE!>some<!><!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>sdf<!>()()<out <!DEBUG_INFO_MISSING_UNRESOLVED!>Any<!>>::<!DEBUG_INFO_MISSING_UNRESOLVED!>unwrap<!>
\ No newline at end of file
+val unwrapped = <!UNRESOLVED_REFERENCE!>some<!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>sdf<!>()()<out <!DEBUG_INFO_MISSING_UNRESOLVED!>Any<!>>::<!DEBUG_INFO_MISSING_UNRESOLVED!>unwrap<!>
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.fir.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.fir.kt
index 73d33cd86cb..1f624d4c7ca 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.fir.kt
@@ -1,4 +1,4 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
-val unwrapped = some.<!SYNTAX!><<!><!UNRESOLVED_REFERENCE!>cabc<!><!UNRESOLVED_REFERENCE!><!SYNTAX!>$Wrapper<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>out Any<!>>::unwrap<!>
\ No newline at end of file
+val unwrapped = some.<!SYNTAX!><<!><!UNRESOLVED_REFERENCE!>cabc<!><!UNRESOLVED_REFERENCE!><!SYNTAX!>$Wrapper<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>out Any<!>>::unwrap<!>
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.kt
index f7f31abccbc..18db3c8cb6e 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.kt
@@ -1,4 +1,4 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
-val unwrapped = <!UNRESOLVED_REFERENCE!>some<!>.<!SYNTAX!><<!><!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>cabc<!><!SYNTAX!>$Wrapper<!><out <!DEBUG_INFO_MISSING_UNRESOLVED!>Any<!>>::<!DEBUG_INFO_MISSING_UNRESOLVED!>unwrap<!>
\ No newline at end of file
+val unwrapped = <!UNRESOLVED_REFERENCE!>some<!>.<!SYNTAX!><<!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>cabc<!><!SYNTAX!>$Wrapper<!><out <!DEBUG_INFO_MISSING_UNRESOLVED!>Any<!>>::<!DEBUG_INFO_MISSING_UNRESOLVED!>unwrap<!>
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt b/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt
index 608b9142060..5656716e414 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/visibleClassVsQualifiedClass.txt
@@ -12,7 +12,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -34,7 +33,6 @@ package some {
     }
 }
 
-
 // -- Module: <m3> --
 package
 
@@ -71,3 +69,4 @@ package other2 {
 package some {
     public fun test(/*0*/ _ab: some.a.b): kotlin.Unit
 }
+
diff --git a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt
index 864b2e324e2..d2e695571e1 100644
--- a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt
+++ b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt
@@ -8,9 +8,9 @@ fun composite() {
 }
 
 fun html() {
-    <!SYNTAX!><<!><!FUNCTION_CALL_EXPECTED!>html<!><!UNRESOLVED_REFERENCE!>><!><!SYNTAX!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>/<!><!DEBUG_INFO_MISSING_UNRESOLVED!>html<!><!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>><!><!SYNTAX!><!>
+    <!SYNTAX!><<!><!FUNCTION_CALL_EXPECTED!>html<!><!UNRESOLVED_REFERENCE!>><!><!SYNTAX!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>/<!><!DEBUG_INFO_MISSING_UNRESOLVED!>html<!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>><!><!SYNTAX!><!>
 }
 
 fun html1() {
-    <!SYNTAX!><<!><!FUNCTION_CALL_EXPECTED!>html<!><!UNRESOLVED_REFERENCE!>><!><!SYNTAX!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>/<!><!DEBUG_INFO_MISSING_UNRESOLVED!>html<!><!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>><!><!FUNCTION_CALL_EXPECTED!>html<!>
-}
\ No newline at end of file
+    <!SYNTAX!><<!><!FUNCTION_CALL_EXPECTED!>html<!><!UNRESOLVED_REFERENCE!>><!><!SYNTAX!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>/<!><!DEBUG_INFO_MISSING_UNRESOLVED!>html<!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>><!><!FUNCTION_CALL_EXPECTED!>html<!>
+}
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessInJava.fir.kt b/compiler/testData/diagnostics/tests/recovery/namelessInJava.fir.kt
index 78d2e8f4415..7017eaced2e 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessInJava.fir.kt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessInJava.fir.kt
@@ -1,4 +1,4 @@
-// JAVAC_SKIP
+// SKIP_JAVAC
 // FILE: p/Nameless.java
 
 package p;
@@ -15,4 +15,4 @@ import p.*
 class K : Nameless() {
     fun () {}
     val<!SYNTAX!><!> : Int = 1
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt b/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt
index cc3d82a94f2..8028e9059db 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt
@@ -1,4 +1,4 @@
-// JAVAC_SKIP
+// SKIP_JAVAC
 // FILE: p/Nameless.java
 
 package p;
@@ -15,4 +15,4 @@ import p.*
 class K : Nameless() {
     <!FUNCTION_DECLARATION_WITH_NO_NAME!>fun ()<!> {}
     val<!SYNTAX!><!> : Int = 1
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.fir.kt b/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.fir.kt
index 878e410c051..bf06440ab70 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.fir.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.fir.kt
@@ -1,7 +1,7 @@
-// FILE: f.kt
+// FILE: a.kt
 package a
 class b {}
-// FILE: f.kt
+// FILE: b.kt
+package a.b
+// FILE: c.kt
 package a.b
-// FILE: f.kt
-package a.b
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.kt b/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.kt
index b56f906ba85..992ab31ce8a 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.kt
@@ -1,7 +1,7 @@
-// FILE: f.kt
+// FILE: a.kt
 package a
 class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>b<!> {}
-// FILE: f.kt
+// FILE: b.kt
+package a.<!PACKAGE_OR_CLASSIFIER_REDECLARATION!>b<!>
+// FILE: c.kt
 package a.<!PACKAGE_OR_CLASSIFIER_REDECLARATION!>b<!>
-// FILE: f.kt
-package a.<!PACKAGE_OR_CLASSIFIER_REDECLARATION!>b<!>
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/redeclarations/Redeclarations.fir.kt b/compiler/testData/diagnostics/tests/redeclarations/Redeclarations.fir.kt
index 9638c6eaa1c..c4def7ab452 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/Redeclarations.fir.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/Redeclarations.fir.kt
@@ -1,4 +1,4 @@
-// FILE: f.kt
+// FILE: a.kt
 package redeclarations
   <!REDECLARATION!>object A<!> {
     val x : Int = 0
@@ -10,6 +10,6 @@ package redeclarations
 
   <!REDECLARATION!>val A = 1<!>
 
-// FILE: f.kt
+// FILE: b.kt
   package redeclarations.A
     class A {}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/Redeclarations.kt b/compiler/testData/diagnostics/tests/redeclarations/Redeclarations.kt
index 23ea9548c8f..59e4d358c13 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/Redeclarations.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/Redeclarations.kt
@@ -1,4 +1,4 @@
-// FILE: f.kt
+// FILE: a.kt
 package redeclarations
   object <!PACKAGE_OR_CLASSIFIER_REDECLARATION, REDECLARATION!>A<!> {
     val x : Int = 0
@@ -10,6 +10,6 @@ package redeclarations
 
   val <!PACKAGE_OR_CLASSIFIER_REDECLARATION, REDECLARATION!>A<!> = 1
 
-// FILE: f.kt
+// FILE: b.kt
   package redeclarations.<!PACKAGE_OR_CLASSIFIER_REDECLARATION!>A<!>
     class A {}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/infixExtensionVsNonInfixMember.kt b/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/infixExtensionVsNonInfixMember.kt
index 88e3beff360..8833845fbb2 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/infixExtensionVsNonInfixMember.kt
+++ b/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/infixExtensionVsNonInfixMember.kt
@@ -4,4 +4,4 @@ interface IFoo {
 }
 
 infix fun IFoo.foo(i: Int) = i
-infix fun IFoo.<!EXTENSION_SHADOWED_BY_MEMBER!>bar<!>(i: Int) = i
\ No newline at end of file
+infix fun IFoo.<!EXTENSION_SHADOWED_BY_MEMBER!>bar<!>(i: Int) = i
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet81.kt b/compiler/testData/diagnostics/tests/regressions/Jet81.kt
index e3965aeeb8c..d557e34dd63 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet81.kt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet81.kt
@@ -4,7 +4,7 @@
 
 class Test {
   private val y = object {
-    val a = <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;UNINITIALIZED_VARIABLE, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>y<!>;
+    val a = <!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE{OI}!>y<!>;
   }
 
   val z = y.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>;
@@ -18,12 +18,12 @@ object A {
 class Test2 {
   private val a = object {
     init {
-      <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, UNINITIALIZED_VARIABLE!>b<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1
+      <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, UNINITIALIZED_VARIABLE!>b<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> 1
     }
     val x = <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, UNINITIALIZED_VARIABLE!>b<!>
     val y = 1
   }
 
-  val b = <!NI;TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>a<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!><!>
+  val b = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM{NI}!><!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM{OI}!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>x<!><!>
   val c = a.y
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/OutProjections.fir.kt b/compiler/testData/diagnostics/tests/regressions/OutProjections.fir.kt
index d26f8e694c9..8b50c0fe6b8 100644
--- a/compiler/testData/diagnostics/tests/regressions/OutProjections.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/OutProjections.fir.kt
@@ -19,4 +19,4 @@ fun <T> fout(expression : T) : Out<out T> = Out<T>()
 fun fooout() : Out<Point> {
   val p = Point();
   return fout<Point>(p);
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/OutProjections.kt b/compiler/testData/diagnostics/tests/regressions/OutProjections.kt
index c35554e7d8c..58386a757be 100644
--- a/compiler/testData/diagnostics/tests/regressions/OutProjections.kt
+++ b/compiler/testData/diagnostics/tests/regressions/OutProjections.kt
@@ -9,7 +9,7 @@ fun <T> f(<!UNUSED_PARAMETER!>expression<!> : T) : G<out T> = G<T>()
 
 fun foo() : G<Point> {
   val p = Point()
-  return <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>f<Point>(p)<!>
+  return <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>f<Point>(p)<!>
 }
 
 class Out<out T>() {}
@@ -19,4 +19,4 @@ fun <T> fout(<!UNUSED_PARAMETER!>expression<!> : T) : Out<<!REDUNDANT_PROJECTION
 fun fooout() : Out<Point> {
   val p = Point();
   return fout<Point>(p);
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.kt b/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.kt
index 6b103f7e083..acf8d9ad5b4 100644
--- a/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.kt
+++ b/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.kt
@@ -2,7 +2,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun test(a: Int, b: Boolean) {
-    <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>bar<!>(a.<!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>foo<!>(<!NI;TYPE_MISMATCH, TYPE_MISMATCH!>b<!>))
+    <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>bar<!>(a.<!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>foo<!>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>b<!>))
 }
 
 fun <T, R> T.foo(l: (T) -> R): R = TODO()
diff --git a/compiler/testData/diagnostics/tests/regressions/ea72837.kt b/compiler/testData/diagnostics/tests/regressions/ea72837.kt
index d729cf38ef5..173635e8d04 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea72837.kt
+++ b/compiler/testData/diagnostics/tests/regressions/ea72837.kt
@@ -4,7 +4,7 @@ fun <T> g(x: T) = 1
 fun h(x: () -> Unit) = 1
 
 fun foo() {
-    <!UNRESOLVED_REFERENCE!>f<!>(::<!NI;DEBUG_INFO_MISSING_UNRESOLVED, SYNTAX!><!>)
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>g<!>(::<!SYNTAX!><!>)
+    <!UNRESOLVED_REFERENCE!>f<!>(::<!DEBUG_INFO_MISSING_UNRESOLVED{NI}, SYNTAX!><!>)
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>g<!>(::<!SYNTAX!><!>)
     h(::<!SYNTAX!><!>)
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.kt b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.kt
index e4642fcac06..6407878e67b 100644
--- a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.kt
+++ b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.kt
@@ -1,5 +1,5 @@
 // !WITH_NEW_INFERENCE
 fun bar() {
     fun <<!CYCLIC_GENERIC_UPPER_BOUND!>T: T?<!>> foo() {}
-    <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>()
+    <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>()
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10243.kt b/compiler/testData/diagnostics/tests/regressions/kt10243.kt
index 31914ce925a..0845815e599 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10243.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10243.kt
@@ -4,9 +4,9 @@ private fun doUpdateRegularTasks() {
     try {
         while (f) {
             val xmlText = <!UNRESOLVED_REFERENCE!>getText<!>()
-            if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>xmlText<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>==<!> null) {}
+            if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>xmlText<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>==<!> null) {}
             else {
-                <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>xmlText<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, NI;VARIABLE_EXPECTED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>value<!> = 0 // !!!
+                <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>xmlText<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}, VARIABLE_EXPECTED{NI}!>value<!> = 0 // !!!
             }
         }
 
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10843.kt b/compiler/testData/diagnostics/tests/regressions/kt10843.kt
index c8960bd58fb..60be57a47a0 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10843.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10843.kt
@@ -1,8 +1,8 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // See EA-76890 / KT-10843: NPE during analysis
-fun lambda(x : Int?) = x?.<!FUNCTION_CALL_EXPECTED, NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>let<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>l<!> {
-    <!OI;CANNOT_INFER_PARAMETER_TYPE!>y<!> ->
-    if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>y<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>><!> 0) return<!UNRESOLVED_REFERENCE!>@l<!> x
+fun lambda(x : Int?) = x?.<!FUNCTION_CALL_EXPECTED, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, NO_VALUE_FOR_PARAMETER, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>let<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>l<!> {
+    <!CANNOT_INFER_PARAMETER_TYPE{OI}!>y<!> ->
+    if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>y<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>><!> 0) return<!UNRESOLVED_REFERENCE!>@l<!> x
     <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>y<!>
 }<!NOT_NULL_ASSERTION_ON_LAMBDA_EXPRESSION!>!!<!>
diff --git a/compiler/testData/diagnostics/tests/regressions/kt11979.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt11979.fir.kt
index 9402f2990e2..ad796b0d6e2 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt11979.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt11979.fir.kt
@@ -23,4 +23,4 @@ fun test(foo: Foo<*>, g: Bar<*>) {
 fun main() {
     val foo = Foo(BarR())
     test(foo, MyBar(2))
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt11979.kt b/compiler/testData/diagnostics/tests/regressions/kt11979.kt
index cc51a11a15d..2a9334a113f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt11979.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt11979.kt
@@ -17,10 +17,10 @@ class Foo<F : Bar<F>>(val f: F)
 fun <T> id(t1: T, t2: T) = t2
 
 fun test(foo: Foo<*>, g: Bar<*>) {
-    <!OI;TYPE_MISMATCH!><!OI;TYPE_MISMATCH!>id(foo.f, g)<!>.t<!>.<!NI;UNRESOLVED_REFERENCE!>t<!>
+    <!TYPE_MISMATCH{OI}!><!TYPE_MISMATCH{OI}!>id(foo.f, g)<!>.t<!>.<!UNRESOLVED_REFERENCE{NI}!>t<!>
 }
 
 fun main() {
     val foo = Foo(BarR())
     test(foo, MyBar(2))
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt12898.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt12898.fir.kt
index 47770ff2ace..5272cd34b89 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt12898.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt12898.fir.kt
@@ -17,4 +17,4 @@ fun f(b: B<*, Any>) {
 fun main() {
     f(C("hello"))
     f(C(null))
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt12898.kt b/compiler/testData/diagnostics/tests/regressions/kt12898.kt
index e573d011812..c974e06e263 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt12898.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt12898.kt
@@ -8,13 +8,13 @@ interface B<T : S?, S : Any> {
 class C(override val t: Any?) : B<Any?, Any>
 
 fun f(b: B<*, Any>) {
-    val y = <!OI;TYPE_MISMATCH!>b<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>t<!>
-    if (<!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>y<!> is String<!OI;USELESS_NULLABLE_CHECK!>?<!>) {
-        <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, OI;DEBUG_INFO_SMARTCAST!>y<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>length<!>
+    val y = <!TYPE_MISMATCH{OI}!>b<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>t<!>
+    if (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}!>y<!> is String<!USELESS_NULLABLE_CHECK{OI}!>?<!>) {
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}, DEBUG_INFO_SMARTCAST{OI}!>y<!>.<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>length<!>
     }
 }
 
 fun main() {
     f(C("hello"))
     f(C(null))
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt13685.kt b/compiler/testData/diagnostics/tests/regressions/kt13685.kt
index 71d427dede6..bc5d8303712 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt13685.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt13685.kt
@@ -2,6 +2,6 @@
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 
 fun foo() {
-    val <!OI;UNUSED_VARIABLE!>text<!>: List<Any> = null!!
-    text.<!UNRESOLVED_REFERENCE!>map<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>Any<!><!SYNTAX!>?<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>toString<!>
+    val <!UNUSED_VARIABLE{OI}!>text<!>: List<Any> = null!!
+    text.<!UNRESOLVED_REFERENCE!>map<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>Any<!><!SYNTAX!>?<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>toString<!>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt b/compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt
index 4d5835e75ac..e8a38553320 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt
@@ -19,7 +19,7 @@ class C {
     fun p() : Resource? = null
 
     fun bar() {
-        <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>foo<!>(<!NI;TYPE_MISMATCH!>p()<!>) {
+        <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>foo<!>(<!TYPE_MISMATCH{NI}!>p()<!>) {
 
         }
     }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt24488.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt24488.fir.kt
index f454a2de1b0..b4eb7957a51 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt24488.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt24488.fir.kt
@@ -12,4 +12,4 @@ fun <T> Array<out T>.asIterable(): Iterable<T> = TODO()
 fun testFrontend() {
     val bar = Bar()
     foo(bar)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt24488.kt b/compiler/testData/diagnostics/tests/regressions/kt24488.kt
index 1574cb8d248..03710b2c651 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt24488.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt24488.kt
@@ -5,11 +5,11 @@ class Bar {
     val a: Array<String>? = null
 }
 
-fun foo(bar: Bar) = bar.a?.asIterable() ?: <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!><!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyArray<!>()<!>
+fun foo(bar: Bar) = bar.a?.asIterable() ?: <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>emptyArray<!>()<!>
 
 fun <T> Array<out T>.asIterable(): Iterable<T> = TODO()
 
 fun testFrontend() {
     val bar = Bar()
     foo(bar)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt251.kt b/compiler/testData/diagnostics/tests/regressions/kt251.kt
index fb980b2f916..d176a2ec39b 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt251.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt251.kt
@@ -6,7 +6,7 @@ class A() {
             field = <!TYPE_MISMATCH!>value<!>
         }
     val y: Int
-        get(): <!WRONG_GETTER_RETURN_TYPE("Int", "String")!>String<!> = "s"
+        get(): <!WRONG_GETTER_RETURN_TYPE("Int; String")!>String<!> = "s"
     val z: Int
         get() {
             return <!TYPE_MISMATCH!>"s"<!>
diff --git a/compiler/testData/diagnostics/tests/regressions/kt312.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt312.fir.kt
index be907b58530..acc1f575bea 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt312.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt312.fir.kt
@@ -7,4 +7,4 @@ fun <T> Array<out T>.safeGet(index : Int) : T? {
 
 val args : Array<String> = Array<String>(1, {""})
 val name : String = args.safeGet<String>(0) // No error, must be type mismatch
-val name1 : String? = args.safeGet(0)
\ No newline at end of file
+val name1 : String? = args.safeGet(0)
diff --git a/compiler/testData/diagnostics/tests/regressions/kt312.kt b/compiler/testData/diagnostics/tests/regressions/kt312.kt
index 8985a69a3a6..3a9d5e87cc1 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt312.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt312.kt
@@ -6,5 +6,5 @@ fun <T> Array<out T>.safeGet(index : Int) : T? {
 }
 
 val args : Array<String> = Array<String>(1, {""})
-val name : String = <!TYPE_MISMATCH!>args.<!NI;TYPE_MISMATCH!>safeGet<String>(0)<!><!> // No error, must be type mismatch
-val name1 : String? = args.safeGet(0)
\ No newline at end of file
+val name : String = <!TYPE_MISMATCH!>args.<!TYPE_MISMATCH{NI}!>safeGet<String>(0)<!><!> // No error, must be type mismatch
+val name1 : String? = args.safeGet(0)
diff --git a/compiler/testData/diagnostics/tests/regressions/kt328.kt b/compiler/testData/diagnostics/tests/regressions/kt328.kt
index e9bbf3d1671..dd94b10c7a0 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt328.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt328.kt
@@ -12,14 +12,14 @@ fun bar2() = {
 //properties
 //in a class
 class A() {
-    val x = { <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;UNINITIALIZED_VARIABLE, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!> }
+    val x = { <!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE{OI}!>x<!> }
 }
 
 //in a package
-val x = { <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;UNINITIALIZED_VARIABLE, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>x<!> }
+val x = { <!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE{OI}!>x<!> }
 
 //KT-787 AssertionError on code 'val x = x'
-val z = <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;UNINITIALIZED_VARIABLE, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!>z<!>
+val z = <!DEBUG_INFO_MISSING_UNRESOLVED{NI}, TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE{OI}!>z<!>
 
 //KT-329 Assertion failure on local function
 fun block(f : () -> Unit) = f()
diff --git a/compiler/testData/diagnostics/tests/regressions/kt353.kt b/compiler/testData/diagnostics/tests/regressions/kt353.kt
index df1c7cf517e..efe7adee74e 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt353.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt353.kt
@@ -13,7 +13,7 @@ fun foo(a: A) {
     val <!UNUSED_VARIABLE!>u<!>: Unit = a.gen() // Unit should be inferred
 
     if (true) {
-        a.<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>gen<!>() // Shouldn't work: no info for inference
+        a.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>gen<!>() // Shouldn't work: no info for inference
     }
 
     val <!UNUSED_VARIABLE!>b<!> : () -> Unit = {
@@ -29,5 +29,5 @@ fun foo(a: A) {
         a.gen()  //type mismatch, but Int can be derived
     }
 
-    a.<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>gen<!>() // Shouldn't work: no info for inference
+    a.<!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>gen<!>() // Shouldn't work: no info for inference
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt36222.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt36222.fir.kt
index d7a23988aaa..1b411a21a07 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt36222.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt36222.fir.kt
@@ -7,3 +7,4 @@ fun <K> select(x: K, y: K): K = x
 fun test() {
     foo { select("non-null", null) } // inferred String? but String is expected
 }
+
diff --git a/compiler/testData/diagnostics/tests/regressions/kt557.kt b/compiler/testData/diagnostics/tests/regressions/kt557.kt
index fcfcb202f2a..69c28808b02 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt557.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt557.kt
@@ -8,5 +8,5 @@ fun Array<String>.length() : Int {
 }
 
 fun test(array : Array<String?>?) {
-    <!OI;TYPE_MISMATCH!>array?.sure<Array<String?>>()<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>length<!>()
+    <!TYPE_MISMATCH{OI}!>array?.sure<Array<String?>>()<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>length<!>()
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt701.kt b/compiler/testData/diagnostics/tests/regressions/kt701.kt
index 5be7b22e089..544a64a28b6 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt701.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt701.kt
@@ -14,4 +14,4 @@ public class Throwables() {
             propagateIfInstanceOf(throwable, getJavaClass<RuntimeException?>()) // Type inference failed: Mismatch while expanding constraints
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt9682.kt b/compiler/testData/diagnostics/tests/regressions/kt9682.kt
index db72922dbd8..8fd48d9de46 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt9682.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt9682.kt
@@ -25,4 +25,4 @@ interface IFoo2 {
 fun test2(foo: Foo) {
     foo as IFoo2
     foo.<!OVERLOAD_RESOLUTION_AMBIGUITY!>bar<!>() // should be ambiguity
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.kt b/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.kt
index d371da9c931..781679f47e6 100644
--- a/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.kt
+++ b/compiler/testData/diagnostics/tests/resolve/constructorVsCompanion.kt
@@ -20,4 +20,4 @@ val a = <!NO_COMPANION_OBJECT!>A<!>
 val <!EXPOSED_PROPERTY_TYPE!>b<!> = <!INVISIBLE_MEMBER!>B<!>
 val c = <!NO_COMPANION_OBJECT!>C<!>
 val d = D
-val e = E(42)
\ No newline at end of file
+val e = E(42)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.kt
index 84b73ab44fd..5336f397ce8 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.kt
@@ -13,12 +13,12 @@ typealias YBar = <!RECURSIVE_TYPEALIAS_EXPANSION!>ZBar<!>
 typealias ZBar = <!RECURSIVE_TYPEALIAS_EXPANSION!>YBar<!>
 
 fun Foo.foo(body: Foo.() -> Unit) = body()
-fun Foo.zbar(<!OI;UNUSED_PARAMETER!>body<!>: <!RECURSIVE_TYPEALIAS_EXPANSION!>ZBar<!>.() -> Unit) = Bar().<!OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>body<!>()
+fun Foo.zbar(<!UNUSED_PARAMETER{OI}!>body<!>: <!RECURSIVE_TYPEALIAS_EXPANSION!>ZBar<!>.() -> Unit) = Bar().<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{OI}!>body<!>()
 
 fun test() {
     Foo().foo {
         zbar {
-            <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>foo<!> {}
+            <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>foo<!> {}
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt
index df4f3e17450..3b22fe99ffa 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt
@@ -5,7 +5,7 @@ fun Int.invoke(i: Int, a: Any) {}
 fun Int.invoke(a: Any, i: Int) {}
 
 fun foo(i: Int) {
-    <!NI;NONE_APPLICABLE, OI;OVERLOAD_RESOLUTION_AMBIGUITY!>i<!>(1, 1)
+    <!NONE_APPLICABLE{NI}, OVERLOAD_RESOLUTION_AMBIGUITY{OI}!>i<!>(1, 1)
 
-    <!NI;NONE_APPLICABLE, OI;OVERLOAD_RESOLUTION_AMBIGUITY!>5<!>(1, 2)
+    <!NONE_APPLICABLE{NI}, OVERLOAD_RESOLUTION_AMBIGUITY{OI}!>5<!>(1, 2)
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt
index 131f0c14783..4896965ae74 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt
@@ -8,7 +8,7 @@ operator fun <T> T.invoke(a: A<T>) {}
 fun foo(s: String, ai: A<Int>) {
     1(ai)
 
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>s<!>(<!NI;TYPE_MISMATCH!>ai<!>)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>s<!>(<!TYPE_MISMATCH{NI}!>ai<!>)
 
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>""<!>(<!NI;TYPE_MISMATCH!>ai<!>)
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>""<!>(<!TYPE_MISMATCH{NI}!>ai<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt
index 14a26805e52..6ebc3151730 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt
@@ -6,5 +6,5 @@ operator fun String.invoke(i: Int) {}
 fun foo(s: String?) {
     <!UNSAFE_CALL!>s<!>(1)
 
-    <!NI;UNSAFE_IMPLICIT_INVOKE_CALL, OI;UNSAFE_CALL!>(s <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>)<!>(1)
+    <!UNSAFE_CALL{OI}, UNSAFE_IMPLICIT_INVOKE_CALL{NI}!>(s <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>)<!>(1)
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
index 8aea96e9043..85b8d534ef0 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
@@ -14,4 +14,4 @@ fun test3() {
     fun foo(): String.(Int) -> Unit = {}
 
     1.<!UNRESOLVED_REFERENCE!>(foo())(1)<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt
index af96d5c2b83..46c92d47f0c 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt
@@ -1,17 +1,17 @@
 // !WITH_NEW_INFERENCE
 
 fun test1() {
-    <!OI;TYPE_MISMATCH!>1<!>. <!NI;FUNCTION_EXPECTED!>(fun String.(i: Int) = i )<!>(1)
-    <!OI;TYPE_MISMATCH!>1<!>.<!NI;FUNCTION_EXPECTED!>(label@ fun String.(i: Int) = i )<!>(1)
+    <!TYPE_MISMATCH{OI}!>1<!>. <!FUNCTION_EXPECTED{NI}!>(fun String.(i: Int) = i )<!>(1)
+    <!TYPE_MISMATCH{OI}!>1<!>.<!FUNCTION_EXPECTED{NI}!>(label@ fun String.(i: Int) = i )<!>(1)
 }
 
 fun test2(f: String.(Int) -> Unit) {
-    <!OI;TYPE_MISMATCH!>11<!>.<!NI;FUNCTION_EXPECTED!>(f)<!>(1)
-    <!OI;TYPE_MISMATCH!>11<!>.<!NI;FUNCTION_EXPECTED!>(f)<!>(<!OI;NO_VALUE_FOR_PARAMETER!>)<!>
+    <!TYPE_MISMATCH{OI}!>11<!>.<!FUNCTION_EXPECTED{NI}!>(f)<!>(1)
+    <!TYPE_MISMATCH{OI}!>11<!>.<!FUNCTION_EXPECTED{NI}!>(f)<!>(<!NO_VALUE_FOR_PARAMETER{OI}!>)<!>
 }
 
 fun test3() {
     fun foo(): String.(Int) -> Unit = {}
 
-    <!OI;TYPE_MISMATCH!>1<!>.<!NI;FUNCTION_EXPECTED!>(foo())<!>(1)
-}
\ No newline at end of file
+    <!TYPE_MISMATCH{OI}!>1<!>.<!FUNCTION_EXPECTED{NI}!>(foo())<!>(1)
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.fir.kt
index ce28c42c796..8e0ac8d2ca4 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.fir.kt
@@ -20,4 +20,4 @@ fun foo(): A.() -> Int {
     val c: Int = (foo())(A())
 
     return null!!
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.kt b/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.kt
index e7dc0ec67ae..14ba82c59c0 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.kt
@@ -19,5 +19,5 @@ fun foo(): A.() -> Int {
     val b: Int = foo()(A())
     val c: Int = (foo())(A())
 
-    <!OI;UNREACHABLE_CODE!>return<!> null!!
-}
\ No newline at end of file
+    <!UNREACHABLE_CODE{OI}!>return<!> null!!
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt b/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt
index 03dcf869e74..cdcac34ffd7 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt
@@ -7,8 +7,8 @@ fun Int.invoke(a: Int, b: Int) {}
 class SomeClass
 
 fun test(identifier: SomeClass, fn: String.() -> Unit) {
-    <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;DEBUG_INFO_MISSING_UNRESOLVED, OI;FUNCTION_EXPECTED!>identifier<!>()
+    <!DEBUG_INFO_MISSING_UNRESOLVED{OI}, FUNCTION_EXPECTED{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>identifier<!>()
     <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>identifier<!>(123)
     <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>identifier<!>(1, 2)
     1.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>fn<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
index 2ba657f428d..52919c92464 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
@@ -41,7 +41,7 @@ fun test(a: A, b: B) {
     }
 }
 
-// FILE: 1.kt
+// FILE: 2.kt
 package fooIsMember
 
 class A {
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.kt b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.kt
index 2d80c60b1a8..68269dfac25 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.kt
@@ -41,7 +41,7 @@ fun test(a: A, b: B) {
     }
 }
 
-// FILE: 1.kt
+// FILE: 2.kt
 package fooIsMember
 
 class A {
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.fir.kt
index 47c99beab08..9ba5b306186 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.fir.kt
@@ -10,4 +10,4 @@ fun test(identifier: SomeClass, fn: String.() -> Unit) {
     <!INAPPLICABLE_CANDIDATE!>identifier<!>(123)
     <!INAPPLICABLE_CANDIDATE!>identifier<!>(1, 2)
     1.<!INAPPLICABLE_CANDIDATE!>fn<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.kt b/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.kt
index f7b82eb131c..fccb7472ec7 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.kt
@@ -6,8 +6,8 @@ fun Int.invoke() {}
 class SomeClass
 
 fun test(identifier: SomeClass, fn: String.() -> Unit) {
-    <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;DEBUG_INFO_MISSING_UNRESOLVED, OI;FUNCTION_EXPECTED!>identifier<!>()
+    <!DEBUG_INFO_MISSING_UNRESOLVED{OI}, FUNCTION_EXPECTED{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>identifier<!>()
     <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>identifier<!>(123)
     <!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>identifier<!>(1, 2)
     1.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>fn<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/kt36264.kt b/compiler/testData/diagnostics/tests/resolve/kt36264.kt
index fe0d372a3c3..065737f95a8 100644
--- a/compiler/testData/diagnostics/tests/resolve/kt36264.kt
+++ b/compiler/testData/diagnostics/tests/resolve/kt36264.kt
@@ -12,7 +12,7 @@ class Cls {
 
     fun test(s: String) {
         if (s.ext is B)
-            take(<!OI;SMARTCAST_IMPOSSIBLE!>s.ext<!>)
+            take(<!SMARTCAST_IMPOSSIBLE{OI}!>s.ext<!>)
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt
index 7a12450e8c8..b9c4e349144 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt
@@ -5,7 +5,7 @@ fun foo(i: Int) = i
 fun foo(s: String) = s
 
 fun test() {
-    <!NONE_APPLICABLE!>foo<!>(<!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>())
+    <!NONE_APPLICABLE!>foo<!>(<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>emptyList<!>())
 }
 
-fun <T> emptyList(): List<T> {throw Exception()}
\ No newline at end of file
+fun <T> emptyList(): List<T> {throw Exception()}
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.fir.kt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.fir.kt
index d7b16cc0eb8..3e04edb2149 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.fir.kt
@@ -14,4 +14,4 @@ public class ResolutionTaskHolder<F, G : F> {
         tasks.bar(ResolutionTask(candidate))
         tasks.add(ResolutionTask(candidate))
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.kt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.kt
index 65668e6d6d0..a97dcea49d9 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.kt
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.kt
@@ -11,7 +11,7 @@ public class ResolutionTaskHolder<F, G : F> {
         tasks.add(ResolutionTask<F, G>(candidate))
 
         //todo the problem is the type of ResolutionTask is inferred as ResolutionTask<F, F> too early
-        tasks.<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>bar<!>(ResolutionTask(candidate))
+        tasks.<!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>bar<!>(ResolutionTask(candidate))
         tasks.add(ResolutionTask(candidate))
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/newLineLambda.kt b/compiler/testData/diagnostics/tests/resolve/newLineLambda.kt
index 128ee9d30a5..a556a086751 100644
--- a/compiler/testData/diagnostics/tests/resolve/newLineLambda.kt
+++ b/compiler/testData/diagnostics/tests/resolve/newLineLambda.kt
@@ -100,8 +100,8 @@ fun testTwoLambdas() {
         {}
         <!MANY_LAMBDA_EXPRESSION_ARGUMENTS, UNEXPECTED_TRAILING_LAMBDA_ON_A_NEW_LINE!>{}<!>
 
-        return if (true) <!NI;TYPE_MISMATCH!>{
-            <!OI;TYPE_MISMATCH!>twoLambdaArgs({})
+        return if (true) <!TYPE_MISMATCH{NI}!>{
+            <!TYPE_MISMATCH{OI}!>twoLambdaArgs({})
             {}
             <!MANY_LAMBDA_EXPRESSION_ARGUMENTS, UNEXPECTED_TRAILING_LAMBDA_ON_A_NEW_LINE!>{}<!><!>
         }<!> else {
@@ -112,7 +112,7 @@ fun testTwoLambdas() {
 
 fun f1(): (() -> Unit) -> (() -> Unit) -> Unit {
     return { l1 ->
-        <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>l1()
-        <!UNEXPECTED_TRAILING_LAMBDA_ON_A_NEW_LINE!>{ <!CANNOT_INFER_PARAMETER_TYPE, NI;UNUSED_ANONYMOUS_PARAMETER!>l2<!> -> <!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!><!NI;DEBUG_INFO_MISSING_UNRESOLVED!>l2<!>()<!> }<!><!>
+        <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>l1()
+        <!UNEXPECTED_TRAILING_LAMBDA_ON_A_NEW_LINE!>{ <!CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER{NI}!>l2<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}!><!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>l2<!>()<!> }<!><!>
     }
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifier.kt b/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifier.kt
index ffe03215465..3890a2547ca 100644
--- a/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifier.kt
+++ b/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifier.kt
@@ -16,4 +16,4 @@ fun test() {
 fun <T> bar() {
     val typeParameter_as_val = <!TYPE_PARAMETER_IS_NOT_AN_EXPRESSION!>T<!>
     val typeParameter_as_fun = <!RESOLUTION_TO_CLASSIFIER!>T<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.kt b/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.kt
index 138ca4f7441..f4baeb19090 100644
--- a/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.kt
+++ b/compiler/testData/diagnostics/tests/resolve/noCandidates/resolvedToClassifierWithReceiver.kt
@@ -36,4 +36,4 @@ fun test(x: X) {
 
     val object_as_fun = x.<!RESOLUTION_TO_CLASSIFIER!>B<!>()
     val class_as_val = x.<!NESTED_CLASS_ACCESSED_VIA_INSTANCE_REFERENCE, NO_COMPANION_OBJECT!>C<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.fir.kt
index fbfedb7bc2a..0806faef8dc 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.fir.kt
@@ -7,4 +7,4 @@ object X2
 fun <T1> foo(x: T1, f: (T1) -> T1) = X1
 fun <T2> foo(xf: () -> T2, f: (T2) -> T2) = X2
 
-val test: X2 = foo({ 0 }, { it -> it + 1 })
\ No newline at end of file
+val test: X2 = foo({ 0 }, { it -> it + 1 })
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.kt
index e04a1fff003..730b30478cd 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.kt
@@ -7,4 +7,4 @@ object X2
 fun <T1> foo(x: T1, f: (T1) -> T1) = X1
 fun <T2> foo(xf: () -> T2, f: (T2) -> T2) = X2
 
-val test: X2 = <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>foo<!>({ 0 }, { <!OI;CANNOT_INFER_PARAMETER_TYPE!>it<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> 1 })
\ No newline at end of file
+val test: X2 = <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!>({ 0 }, { <!CANNOT_INFER_PARAMETER_TYPE{OI}!>it<!> -> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> 1 })
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.kt
index 0b5472a913a..d79b377d9d7 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.kt
@@ -15,6 +15,6 @@ fun <E> baz(x: String, y: E) {}
 fun bar(x: A<String>) {
     x.<!OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!>("")
 
-    x.<!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>baz<!>("", "")
-    <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>baz<!>("", "")
+    x.<!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>baz<!>("", "")
+    <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>baz<!>("", "")
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.fir.kt
index 1fd5e880bc4..16482cbb981 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.fir.kt
@@ -7,4 +7,4 @@ fun <T2 : Closeable, R2> T2.myUse(f: (T2) -> R2): R2 = f(this)
 
 fun test1(x: Closeable) = x.myUse { 42 }
 fun test2(x: Closeable) = x.myUse<Closeable, Int> { 42 }
-fun test3(x: Closeable) = x.myUse<AutoCloseable, Int> { 42 } // TODO KT-10681
\ No newline at end of file
+fun test3(x: Closeable) = x.myUse<AutoCloseable, Int> { 42 } // TODO KT-10681
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.kt
index 4300405a011..d11483dff2a 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.kt
@@ -7,4 +7,4 @@ fun <T2 : Closeable, R2> T2.myUse(f: (T2) -> R2): R2 = f(this)
 
 fun test1(x: Closeable) = x.myUse { 42 }
 fun test2(x: Closeable) = x.myUse<Closeable, Int> { 42 }
-fun test3(x: Closeable) = x.myUse<<!OI;UPPER_BOUND_VIOLATED!>AutoCloseable<!>, Int> { 42 } // TODO KT-10681
\ No newline at end of file
+fun test3(x: Closeable) = x.myUse<<!UPPER_BOUND_VIOLATED{OI}!>AutoCloseable<!>, Int> { 42 } // TODO KT-10681
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.fir.kt
index 6a5f32372ed..7f17a2117c0 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.fir.kt
@@ -13,4 +13,4 @@ fun <T> B<T>.foo(block: (T) -> Unit) {
 
 fun main() {
     B("string").<!AMBIGUITY!>foo<!> {  }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.kt
index 2ac53c3ca76..2737c6b7d8a 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.kt
@@ -12,5 +12,5 @@ fun <T> B<T>.foo(block: (T) -> Unit) {
 }
 
 fun main() {
-    B("string").<!NI;OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!> {  }
-}
\ No newline at end of file
+    B("string").<!OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!> {  }
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.fir.kt
index 3a67bfa5323..468039157a6 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.fir.kt
@@ -23,4 +23,4 @@ import b.*
 
 fun test() {
     <!AMBIGUITY!>foo<!><A> { }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.kt
index f36b2217a25..38cf41b468d 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.kt
@@ -22,5 +22,5 @@ import a.*
 import b.*
 
 fun test() {
-    <!NI;OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!><A> { }
-}
\ No newline at end of file
+    <!OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!><A> { }
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.fir.kt
index dbbc7e4e962..a757322ceaf 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.fir.kt
@@ -21,4 +21,4 @@ import b.*
 
 fun main() {
     foo<String> {  }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.kt
index 6b3d3afc83f..32ff8d7df0b 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.kt
@@ -20,5 +20,5 @@ import a.*
 import b.*
 
 fun main() {
-    <!OI;OVERLOAD_RESOLUTION_AMBIGUITY!>foo<!><String> {  }
-}
\ No newline at end of file
+    <!OVERLOAD_RESOLUTION_AMBIGUITY{OI}!>foo<!><String> {  }
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.kt
index 39b6f98be7b..6a86023dfc4 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/varargsMixed.kt
@@ -10,4 +10,4 @@ fun overloadedFun5(s: String, vararg ss: String) = X2
 val test1 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>overloadedFun5<!>("")
 val test2 = <!OVERLOAD_RESOLUTION_AMBIGUITY!>overloadedFun5<!>("", "")
 val test3: X2 = <!NONE_APPLICABLE!>overloadedFun5<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>s<!> = "", <!DEBUG_INFO_MISSING_UNRESOLVED!>ss<!> = "")
-val test4: X1 = overloadedFun5(ss = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, TYPE_MISMATCH!>""<!>)
\ No newline at end of file
+val test4: X1 = overloadedFun5(ss = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, TYPE_MISMATCH!>""<!>)
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.fir.kt
index a0203b1cbcf..9a0af8f0569 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.fir.kt
@@ -7,4 +7,4 @@ class A<T>
 fun <T1> A<T1>.foo() = X1
 fun <T2> A<out T2>.foo() = X2
 
-fun <T> A<out T>.test() = foo() // TODO fix constraint system
\ No newline at end of file
+fun <T> A<out T>.test() = foo() // TODO fix constraint system
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.kt
index f45d71818a0..f73fc338e57 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.kt
@@ -7,4 +7,4 @@ class A<T>
 <!CONFLICTING_OVERLOADS!>fun <T1> A<T1>.foo()<!> = X1
 <!CONFLICTING_OVERLOADS!>fun <T2> A<out T2>.foo()<!> = X2
 
-fun <T> A<out T>.test() = <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>foo<!>() // TODO fix constraint system
\ No newline at end of file
+fun <T> A<out T>.test() = <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>foo<!>() // TODO fix constraint system
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.fir.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.fir.kt
index 052ad1c675f..e675a31a9f8 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.fir.kt
@@ -11,4 +11,4 @@ fun test() {
     <!INAPPLICABLE_CANDIDATE!>bar<!>(1 ?: 2)
 }
 
-fun bar(s: String) = s
\ No newline at end of file
+fun bar(s: String) = s
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.kt
index 91feabb9dc3..ce19ae7b491 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.kt
@@ -2,13 +2,13 @@
 // !DIAGNOSTICS: -USELESS_ELVIS
 
 fun test() {
-    bar(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>if (true) {
-        <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>
+    bar(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>if (true) {
+        <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>1<!>
     } else {
-        <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!>
+        <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>2<!>
     }<!>)
 
-    bar(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!><!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!> ?: <!CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!><!>)
+    bar(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!><!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!> ?: <!CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!><!>)
 }
 
-fun bar(s: String) = s
\ No newline at end of file
+fun bar(s: String) = s
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt
index 3abec5dfeab..6860fc3c516 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt
@@ -14,7 +14,7 @@ fun testElvis(a: Int?, b: Int?) {
     if (a != null) {
         doInt(b ?: <!DEBUG_INFO_SMARTCAST!>a<!>)
     }
-    doList(getList() ?: <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>emptyListOfA<!>()) //should be an error
+    doList(getList() ?: <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>emptyListOfA<!>()) //should be an error
     doList(getList() ?: strangeList { doInt(it) }) //lambda was not analyzed
 }
 
@@ -33,5 +33,5 @@ fun testDataFlowInfo2(a: Int?, b: Int?) {
 }
 
 fun testTypeMismatch(a: String?, b: Any) {
-    doInt(<!NI;TYPE_MISMATCH!><!OI;TYPE_MISMATCH!>a<!> ?: <!OI;TYPE_MISMATCH!>b<!><!>)
-}
\ No newline at end of file
+    doInt(<!TYPE_MISMATCH{NI}!><!TYPE_MISMATCH{OI}!>a<!> ?: <!TYPE_MISMATCH{OI}!>b<!><!>)
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt
index b4f44a1b4e9..50e7fc4e026 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt
@@ -26,4 +26,4 @@ fun testDataFlowInfoAfterExclExcl(a: Int?) {
 
 fun testUnnecessaryExclExcl(a: Int) {
     doInt(a!!) //should be warning
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt
index d13c5392542..63f6dc53415 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt
@@ -13,8 +13,8 @@ fun <T: A> emptyNullableListOfA(): List<T>? = null
 //-------------------------------
 
 fun testExclExcl() {
-    doList(<!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>emptyNullableListOfA<!>()!!) //should be an error here
-    val <!UNUSED_VARIABLE!>l<!>: List<Int> = id(<!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>emptyNullableListOfA<!>()!!)
+    doList(<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>emptyNullableListOfA<!>()!!) //should be an error here
+    val <!UNUSED_VARIABLE!>l<!>: List<Int> = id(<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>emptyNullableListOfA<!>()!!)
 
     doList(strangeNullableList { doInt(it) }!!) //lambda should be analyzed (at completion phase)
 }
@@ -26,4 +26,4 @@ fun testDataFlowInfoAfterExclExcl(a: Int?) {
 
 fun testUnnecessaryExclExcl(a: Int) {
     doInt(a<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>) //should be warning
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.fir.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.fir.kt
index 3df6767a807..c3fb5a6fcac 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.fir.kt
@@ -26,4 +26,4 @@ fun foo(c: C?, d: D?, e: E?) {
         2 -> d
         else -> e
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.kt
index c5cfc432cb5..6462bff9bcd 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.kt
@@ -9,7 +9,7 @@ interface D: A, B
 interface E: A, B
 
 fun foo(c: C?, d: D?, e: E?) {
-    val test1: A? = <!OI;TYPE_MISMATCH!>c ?: d<!> ?: e
+    val test1: A? = <!TYPE_MISMATCH{OI}!>c ?: d<!> ?: e
 
     val test2: B? = if (false) if (true) c else d else e
 
@@ -26,4 +26,4 @@ fun foo(c: C?, d: D?, e: E?) {
         2 -> d
         else -> e
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt
index dc507807c72..9fecfc44b98 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt
@@ -4,25 +4,25 @@ package b
 fun bar(i: Int) = i
 
 fun test(a: Int?, b: Int?) {
-    bar(<!NI;TYPE_MISMATCH!>if (a == null) return else <!OI;TYPE_MISMATCH!>b<!><!>)
+    bar(<!TYPE_MISMATCH{NI}!>if (a == null) return else <!TYPE_MISMATCH{OI}!>b<!><!>)
 }
 
 fun test(a: Int?, b: Int?, c: Int?) {
-    bar(<!NI;TYPE_MISMATCH!>if (a == null) return else if (b == null) return else <!OI;TYPE_MISMATCH!>c<!><!>)
+    bar(<!TYPE_MISMATCH{NI}!>if (a == null) return else if (b == null) return else <!TYPE_MISMATCH{OI}!>c<!><!>)
 }
 
 fun test(a: Any?, b: Any?, c: Int?) {
-    bar(<!NI;TYPE_MISMATCH!>if (a == null) if (b == null) <!OI;TYPE_MISMATCH!>c<!> else return else return<!>)
+    bar(<!TYPE_MISMATCH{NI}!>if (a == null) if (b == null) <!TYPE_MISMATCH{OI}!>c<!> else return else return<!>)
 }
 
 fun test(a: Int?, b: Any?, c: Int?) {
-    bar(<!NI;TYPE_MISMATCH!>if (a == null) {
+    bar(<!TYPE_MISMATCH{NI}!>if (a == null) {
         return
     } else {
         if (b == null) {
             return
         } else {
-            <!OI;TYPE_MISMATCH!>c<!>
+            <!TYPE_MISMATCH{OI}!>c<!>
         }
     }<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.fir.kt b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.fir.kt
index 07fc8b72572..1e3a572e7c2 100644
--- a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.fir.kt
@@ -12,4 +12,4 @@ fun <T, R> bar(t: T, r: R) {}
 
 fun test2() {
     <!INAPPLICABLE_CANDIDATE!>bar<!><Int>("", "")
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt
index f2399e13102..9e73278a30e 100644
--- a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt
+++ b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt
@@ -4,12 +4,12 @@
 fun <T> foo(t: T) = t
 
 fun test1() {
-    foo<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int, String><!>(<!OI;TYPE_MISMATCH!>""<!>)
+    foo<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int, String><!>(<!TYPE_MISMATCH{OI}!>""<!>)
 }
 
 
 fun <T, R> bar(t: T, r: R) {}
 
 fun test2() {
-    bar<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>(<!OI;TYPE_MISMATCH!>""<!>, "")
-}
\ No newline at end of file
+    bar<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>(<!TYPE_MISMATCH{OI}!>""<!>, "")
+}
diff --git a/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.kt b/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.kt
index f108ab528f9..102142cdcfb 100644
--- a/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/OverloadPriority.kt
@@ -28,4 +28,4 @@ fun test(j: J) {
 
     // NI: TODO
     j.<!OVERLOAD_RESOLUTION_AMBIGUITY!>bar<!> { <!UNRESOLVED_REFERENCE!>it<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Any>() }; "" } <!DEBUG_INFO_MISSING_UNRESOLVED!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.kt b/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.kt
index e6153c5b49d..024b6f0ad55 100644
--- a/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/OverloadPriorityKT.kt
@@ -27,4 +27,4 @@ fun test(k: K) {
 
     // NI: TODO
     k.<!OVERLOAD_RESOLUTION_AMBIGUITY!>bar<!> { <!UNRESOLVED_REFERENCE!>it<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Any>() }; "" } <!DEBUG_INFO_MISSING_UNRESOLVED!>checkType<!> { <!UNRESOLVED_REFERENCE!>_<!><Int>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentProhibited.kt b/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentProhibited.kt
index 17c8186f00b..61f1ca77387 100644
--- a/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentProhibited.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentProhibited.kt
@@ -51,4 +51,4 @@ fun main(x2: Runnable) {
     i2.foo2({}, {}, *x3)
     i2.foo2({}, x2, <!TYPE_MISMATCH!>x3<!>)
     i2.foo2(x2, {}, *arrayOf(""))
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentWithoutSamConversionsPerArgument.kt b/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentWithoutSamConversionsPerArgument.kt
index b19433357fd..367682d7cdb 100644
--- a/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentWithoutSamConversionsPerArgument.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/arrayAsVarargAfterSamArgumentWithoutSamConversionsPerArgument.kt
@@ -51,4 +51,4 @@ fun main(x2: Runnable) {
     i1.foo2(<!TYPE_MISMATCH!>{}<!>, <!TYPE_MISMATCH!>{}<!>, *x3)
     i1.foo2(<!TYPE_MISMATCH!>{}<!>, x2, <!TYPE_MISMATCH!>x3<!>)
     i1.foo2(x2, <!TYPE_MISMATCH!>{}<!>, *arrayOf(""))
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/samConversions/javaMemberAgainstExtension.kt b/compiler/testData/diagnostics/tests/samConversions/javaMemberAgainstExtension.kt
index 993a3815092..68dfcbfccb0 100644
--- a/compiler/testData/diagnostics/tests/samConversions/javaMemberAgainstExtension.kt
+++ b/compiler/testData/diagnostics/tests/samConversions/javaMemberAgainstExtension.kt
@@ -28,3 +28,4 @@ fun <T> test2(r: Runnable, o: Observer<T>, l: LiveData<T>) {
     val c = l.observe({}) {} // conversion for all arguments
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Unit")!>c<!>
 }
+
diff --git a/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.kt b/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.kt
index 41591ef908c..3be7ad04e94 100644
--- a/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.kt
+++ b/compiler/testData/diagnostics/tests/scopes/VisibilityInClassObject.kt
@@ -30,4 +30,4 @@ class B: A() {
         devNull(A.<!INVISIBLE_MEMBER!>private_val<!>)
         devNull(A.<!SUBCLASS_CANT_CALL_COMPANION_PROTECTED_NON_STATIC!>protected_val<!>)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.kt b/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.kt
index 4f0097fbeb8..b6885dfb852 100644
--- a/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.kt
+++ b/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.kt
@@ -82,4 +82,4 @@ interface Q : R {
 
 class S : P, Q {
     <!CANNOT_WEAKEN_ACCESS_PRIVILEGE!>internal<!> override fun foo() {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/companionObject.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/companionObject.kt
index efd791f306f..77148da35ae 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/companionObject.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/companionObject.kt
@@ -38,4 +38,4 @@ class C: B(), A {
         B.Companion.B_()
         C.<!UNRESOLVED_REFERENCE!>B_<!>()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectAfterJava.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectAfterJava.kt
index e298d612d22..c23589d5cc6 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectAfterJava.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/companionObjectAfterJava.kt
@@ -49,4 +49,4 @@ class D: C() {
         C.<!UNRESOLVED_REFERENCE!>B_<!>()
         D.<!UNRESOLVED_REFERENCE!>B_<!>()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClass.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClass.kt
index f2bd8f0c5d0..ce2b9501c08 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClass.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClass.kt
@@ -36,4 +36,4 @@ class C: A() {
             <!DEPRECATED_ACCESS_BY_SHORT_NAME!>B()<!>
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNested.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNested.kt
index 4824f34ff71..06f87294f86 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNested.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNested.kt
@@ -92,4 +92,4 @@ class C: A() {
         Z().C_C_Z()
         Z().<!UNRESOLVED_REFERENCE!>A_C_Z<!>()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNestedJava.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNestedJava.kt
index d682b0f9f4a..5505b72e294 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNestedJava.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedCompanionClassVsNestedJava.kt
@@ -44,4 +44,4 @@ class Y: C() {
 
         <!DEPRECATED_ACCESS_BY_SHORT_NAME!>Z()<!>.A_C_Z()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedVsToplevelClass.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedVsToplevelClass.kt
index 81ae00acaa4..ff9a4fff2c5 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/nestedVsToplevelClass.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/nestedVsToplevelClass.kt
@@ -35,4 +35,4 @@ class B: A() {
         <!DEPRECATED_ACCESS_BY_SHORT_NAME!>Y()<!>.A_C_Y()
         <!DEPRECATED_ACCESS_BY_SHORT_NAME!>Y()<!>.<!UNRESOLVED_REFERENCE!>T_Y<!>()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/kjk.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/kjk.kt
index 3d6e11b5d29..ca061a2e03f 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/kjk.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/kjk.kt
@@ -14,7 +14,7 @@ class D extends K {
     static void bar() {}
 }
 
-// FILE: K.kt
+// FILE: K2.kt
 
 class K2 {
     companion object {
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1080.kt b/compiler/testData/diagnostics/tests/scopes/kt1080.kt
index 4c36bcd2dd8..4ee1a598e90 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1080.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1080.kt
@@ -16,4 +16,4 @@ class Some: <!UNRESOLVED_REFERENCE!>Test<!>()
 
 package b.d
 
-public open class Test
\ No newline at end of file
+public open class Test
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1244.kt b/compiler/testData/diagnostics/tests/scopes/kt1244.kt
index ce2fa037917..cf03bb828c4 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1244.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1244.kt
@@ -10,4 +10,4 @@ class B() {
     init {
         A().<!INVISIBLE_MEMBER!>a<!> = "Hello"
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt151.kt b/compiler/testData/diagnostics/tests/scopes/kt151.kt
index 1e0e07db876..a4d34a24b6a 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt151.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt151.kt
@@ -37,4 +37,4 @@ class F : C(), T {
 
 class G : C(), T {
     public override fun foo() {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1738.kt b/compiler/testData/diagnostics/tests/scopes/kt1738.kt
index 3ad2f15a121..ab8358c3aba 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1738.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1738.kt
@@ -8,4 +8,4 @@ class A(private var i: Int, var j: Int) {
 fun test(a: A) {
     a.<!INVISIBLE_MEMBER!>i<!>++
     a.j++
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1805.kt b/compiler/testData/diagnostics/tests/scopes/kt1805.kt
index ae88a9f6f6f..1c4e591d50f 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1805.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1805.kt
@@ -17,4 +17,4 @@ fun test() {
 
     val s1 = SomeSubclass()
     s1.<!INVISIBLE_MEMBER!>privateField<!> // 3. Unresolved reference
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1806.kt b/compiler/testData/diagnostics/tests/scopes/kt1806.kt
index a91c7a33a43..d131315f949 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1806.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1806.kt
@@ -21,4 +21,4 @@ class Test {
   }
 }
 
-fun doSmth(s: String) = s
\ No newline at end of file
+fun doSmth(s: String) = s
diff --git a/compiler/testData/diagnostics/tests/scopes/kt37.kt b/compiler/testData/diagnostics/tests/scopes/kt37.kt
index 761a6fa6085..4154c41f8cb 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt37.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt37.kt
@@ -13,4 +13,4 @@ fun box(): String {
     val c = C()
     if (c.<!INVISIBLE_MEMBER!>f<!> != 610) return "fail"
     return "OK"
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt9430.kt b/compiler/testData/diagnostics/tests/scopes/kt9430.kt
index cb743b1d27d..5c5004d4283 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt9430.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt9430.kt
@@ -13,4 +13,4 @@ class C: A() {
 
 class D {
     fun qux() { B().<!INVISIBLE_MEMBER!>foo<!>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.kt
index 308acfa0c82..11b9330481e 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.kt
@@ -21,7 +21,7 @@ class B : A() {
         }
 
         if (d.x is B) {
-            <!OI;SMARTCAST_IMPOSSIBLE!>d.x<!>.<!NI;INVISIBLE_MEMBER!>foo<!> {}
+            <!SMARTCAST_IMPOSSIBLE{OI}!>d.x<!>.<!INVISIBLE_MEMBER{NI}!>foo<!> {}
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.kt
index 1f5b6865394..b16e095a26a 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.kt
@@ -13,7 +13,7 @@ class Derived : BaseOuter() {
     fun test(foo: Foo) {
         if (foo.base is Derived) {
             foo.base.foo() checkType { _<String>() } // Resolved to extension
-            <!OI;SMARTCAST_IMPOSSIBLE!>foo.base<!>.<!NI;INVISIBLE_MEMBER!>bar<!>()
+            <!SMARTCAST_IMPOSSIBLE{OI}!>foo.base<!>.<!INVISIBLE_MEMBER{NI}!>bar<!>()
         }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility.kt b/compiler/testData/diagnostics/tests/scopes/visibility.kt
index db0a3e723cc..dfb38302288 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility.kt
+++ b/compiler/testData/diagnostics/tests/scopes/visibility.kt
@@ -40,8 +40,8 @@ class B {
 }
 
 fun test3(a: A) {
-    a.<!INVISIBLE_MEMBER("v", "private", "'A'")!>v<!> //todo .bMethod()
-    a.<!INVISIBLE_MEMBER("f", "private", "'A'")!>f<!>(0, <!TOO_MANY_ARGUMENTS!>1<!>) //todo .bMethod()
+    a.<!INVISIBLE_MEMBER("v; private; 'A'")!>v<!> //todo .bMethod()
+    a.<!INVISIBLE_MEMBER("f; private; 'A'")!>f<!>(0, <!TOO_MANY_ARGUMENTS!>1<!>) //todo .bMethod()
 }
 
 interface T
@@ -54,7 +54,7 @@ open class C : T {
 }
 
 fun test4(c: C) {
-    c.<!INVISIBLE_MEMBER("i", "protected", "'C'")!>i<!>++
+    c.<!INVISIBLE_MEMBER("i; protected; 'C'")!>i<!>++
 }
 
 class D : C() {
@@ -78,7 +78,7 @@ class F : C() {
 
 class G : T {
     fun test8(c: C) {
-        doSmth(c.<!INVISIBLE_MEMBER("i", "protected", "'C'")!>i<!>)
+        doSmth(c.<!INVISIBLE_MEMBER("i; protected; 'C'")!>i<!>)
     }
 }
 
@@ -91,5 +91,5 @@ import test_visibility.*
 
 fun test() {
     internal_fun()
-    <!INVISIBLE_MEMBER("private_fun", "private", "file")!>private_fun<!>()
+    <!INVISIBLE_MEMBER("private_fun; private; file")!>private_fun<!>()
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility2.kt b/compiler/testData/diagnostics/tests/scopes/visibility2.kt
index c3fee556f45..85d0603543c 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility2.kt
+++ b/compiler/testData/diagnostics/tests/scopes/visibility2.kt
@@ -17,23 +17,23 @@ private object PO {}
 //+JDK
 package b
 
-import a.<!INVISIBLE_REFERENCE("A", "private", "file")!>A<!>
-import a.<!INVISIBLE_REFERENCE("foo", "private", "file")!>foo<!>
+import a.<!INVISIBLE_REFERENCE("A; private; file")!>A<!>
+import a.<!INVISIBLE_REFERENCE("foo; private; file")!>foo<!>
 import a.makeA
-import a.<!INVISIBLE_REFERENCE("PO", "private", "file")!>PO<!>
+import a.<!INVISIBLE_REFERENCE("PO; private; file")!>PO<!>
 
 fun test() {
     val y = makeA()
-    y.<!INVISIBLE_MEMBER("A", "private", "file")!>bar<!>()
-    <!INVISIBLE_MEMBER("foo", "private", "file")!>foo<!>()
+    y.<!INVISIBLE_MEMBER("A; private; file")!>bar<!>()
+    <!INVISIBLE_MEMBER("foo; private; file")!>foo<!>()
 
-    val u : <!INVISIBLE_REFERENCE("A", "private", "file")!>A<!> = <!INVISIBLE_MEMBER("A", "private", "file")!>A<!>()
-    val a : java.util.Arrays.<!INVISIBLE_REFERENCE("ArrayList", "private", "'Arrays'")!>ArrayList<!><Int>;
+    val u : <!INVISIBLE_REFERENCE("A; private; file")!>A<!> = <!INVISIBLE_MEMBER("A; private; file")!>A<!>()
+    val a : java.util.Arrays.<!INVISIBLE_REFERENCE("ArrayList; private; 'Arrays'")!>ArrayList<!><Int>;
 
-    val po = <!INVISIBLE_MEMBER("PO", "private", "file")!>PO<!>
+    val po = <!INVISIBLE_MEMBER("PO; private; file")!>PO<!>
 }
 
-class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A", "private", "file"), INVISIBLE_REFERENCE("A", "private", "file")!>A<!>()<!> {}
+class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A; private; file"), INVISIBLE_REFERENCE("A; private; file")!>A<!>()<!> {}
 
 class Q {
     class W {
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility3.kt b/compiler/testData/diagnostics/tests/scopes/visibility3.kt
index 215e9171f0a..5d17a443b5f 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility3.kt
+++ b/compiler/testData/diagnostics/tests/scopes/visibility3.kt
@@ -25,18 +25,18 @@ package a
 
 fun test() {
     val y = makeA()
-    y.<!INVISIBLE_MEMBER("A", "private", "file")!>bar<!>()
-    <!INVISIBLE_MEMBER("foo", "private", "file")!>foo<!>()
+    y.<!INVISIBLE_MEMBER("A; private; file")!>bar<!>()
+    <!INVISIBLE_MEMBER("foo; private; file")!>foo<!>()
 
-    val u : <!INVISIBLE_REFERENCE("A", "private", "file")!>A<!> = <!INVISIBLE_MEMBER("A", "private", "file")!>A<!>()
+    val u : <!INVISIBLE_REFERENCE("A; private; file")!>A<!> = <!INVISIBLE_MEMBER("A; private; file")!>A<!>()
 
-    val z = <!INVISIBLE_MEMBER("x", "private", "file")!>x<!>
-    <!INVISIBLE_MEMBER("x", "private", "file")!>x<!> = 30
+    val z = <!INVISIBLE_MEMBER("x; private; file")!>x<!>
+    <!INVISIBLE_MEMBER("x; private; file")!>x<!> = 30
 
-    val po = <!INVISIBLE_MEMBER("PO", "private", "file")!>PO<!>
+    val po = <!INVISIBLE_MEMBER("PO; private; file")!>PO<!>
 }
 
-class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A", "private", "file"), INVISIBLE_REFERENCE("A", "private", "file")!>A<!>()<!> {}
+class B : <!EXPOSED_SUPER_CLASS!><!INVISIBLE_MEMBER("A; private; file"), INVISIBLE_REFERENCE("A; private; file")!>A<!>()<!> {}
 
 class Q {
     class W {
diff --git a/compiler/testData/diagnostics/tests/script/NestedInnerClass.kts b/compiler/testData/diagnostics/tests/script/NestedInnerClass.kts
index a23519483ed..74ea7ce82e8 100644
--- a/compiler/testData/diagnostics/tests/script/NestedInnerClass.kts
+++ b/compiler/testData/diagnostics/tests/script/NestedInnerClass.kts
@@ -5,8 +5,8 @@ fun function() = 42
 val property = ""
 
 class Nested {
-    fun f() = <!OI;INACCESSIBLE_OUTER_CLASS_EXPRESSION!>function()<!>
-    fun g() = <!OI;INACCESSIBLE_OUTER_CLASS_EXPRESSION!>property<!>
+    fun f() = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION{OI}!>function()<!>
+    fun g() = <!INACCESSIBLE_OUTER_CLASS_EXPRESSION{OI}!>property<!>
 }
 
 
@@ -22,4 +22,4 @@ inner class Inner {
         fun h() = this@Inner.innerFun()
         fun i() = this@Inner.innerProp
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/sealed/inheritorInDifferentModule.txt b/compiler/testData/diagnostics/tests/sealed/inheritorInDifferentModule.txt
index f6c493cc02d..334e5f75c20 100644
--- a/compiler/testData/diagnostics/tests/sealed/inheritorInDifferentModule.txt
+++ b/compiler/testData/diagnostics/tests/sealed/inheritorInDifferentModule.txt
@@ -18,7 +18,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -31,3 +30,4 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
diff --git a/compiler/testData/diagnostics/tests/sealed/interfaces/inheritorInDifferentModule.txt b/compiler/testData/diagnostics/tests/sealed/interfaces/inheritorInDifferentModule.txt
index 8d6d9f86841..9707ac807d7 100644
--- a/compiler/testData/diagnostics/tests/sealed/interfaces/inheritorInDifferentModule.txt
+++ b/compiler/testData/diagnostics/tests/sealed/interfaces/inheritorInDifferentModule.txt
@@ -16,7 +16,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -28,3 +27,4 @@ package a {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.kt
index 013f49da8be..b364924b1de 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.kt
@@ -21,8 +21,8 @@ val y4: B<Int> = B<Int>("")
 
 val y5: B<String> = B<String>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
 val y6: B<String> = B<String>("")
-val y7: B<String> = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>B(1)<!>
+val y7: B<String> = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>B(1)<!>
 val y8: B<String> = B("")
 
 val y9 = B(1)
-val y10 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>B<!>("")
+val y10 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>B<!>("")
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.kt
index 9e77c08483a..556f65048e7 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/ctrsAnnotationResolve.kt
@@ -9,4 +9,4 @@ class A {
     constructor(x1: Int)
     @Ann2(2)
     constructor(x1: Int, x2: Int)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.kt
index 3736ef1a2a5..e8fc8dad909 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/errorsOnEmptyDelegationCall.kt
@@ -39,4 +39,4 @@ open class B3 {
 class A3 : B3 {
     <!EXPLICIT_DELEGATION_CALL_REQUIRED!>constructor()<!>
     constructor(x: Int) : <!INVISIBLE_MEMBER!>super<!>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.kt
index 9619dfce57d..aaa496a9499 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.kt
@@ -14,14 +14,14 @@ class A0<T1, T2> {
 
 class A1<T1, T2> : B<T1, T2> {
     constructor(x: T1, y: T2): super(x, y)
-    constructor(x: T1, y: Int): super(x, <!TYPE_MISMATCH("T2", "Int")!>y<!>)
-    constructor(x: T1, y: T1, z: T1): super(x, <!TYPE_MISMATCH("T2", "T1")!>y<!>)
+    constructor(x: T1, y: Int): super(x, <!TYPE_MISMATCH("T2; Int")!>y<!>)
+    constructor(x: T1, y: T1, z: T1): super(x, <!TYPE_MISMATCH("T2; T1")!>y<!>)
 }
 
 class A2<T1, T2> : B<T1, Int> {
-    constructor(x: T1, y: T2): super(x, <!TYPE_MISMATCH("Int", "T2")!>y<!>)
+    constructor(x: T1, y: T2): super(x, <!TYPE_MISMATCH("Int; T2")!>y<!>)
     constructor(x: T1, y: Int): super(x, y)
-    constructor(x: T1, y: T1, z: T1): super(x, <!TYPE_MISMATCH("Int", "T1")!>y<!>)
-    constructor(x: T1, y: T2, z: String): super(<!TYPE_MISMATCH("T1", "T2")!>y<!>, 1)
+    constructor(x: T1, y: T1, z: T1): super(x, <!TYPE_MISMATCH("Int; T1")!>y<!>)
+    constructor(x: T1, y: T2, z: String): super(<!TYPE_MISMATCH("T1; T2")!>y<!>, 1)
 }
 
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.kt
index 736edb67a42..868a5611a31 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.kt
@@ -2,4 +2,4 @@
 // !WITH_NEW_INFERENCE
 class X<T>(val t: T) {
     constructor(t: T, i: Int) : this(<!TYPE_MISMATCH!>i<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/redeclarations.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/redeclarations.kt
index 0391ad88b2a..9b3c8f4164c 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/redeclarations.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/redeclarations.kt
@@ -24,4 +24,4 @@ class Outer {
     }
 
     <!CONFLICTING_OVERLOADS!>fun B(x: Int)<!> {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.kt b/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.kt
index 71aea3b88f6..2cc12b56400 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.kt
@@ -11,4 +11,4 @@ class B {
 fun test(a: A, b: B?) {
     a foo b!!
     <!DEBUG_INFO_SMARTCAST!>b<!>.bar()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.fir.kt
index 92202f02d93..29fc541bfce 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.fir.kt
@@ -20,4 +20,4 @@ fun bar(s: String?) {
     s as? String
     s as String?
     s as String
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.kt b/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.kt
index 8c8584c556b..9e1d6a96f66 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.kt
@@ -3,12 +3,12 @@ fun foo(): String {
     var s: String?
     s = null
     <!DEBUG_INFO_CONSTANT!>s<!>?.length
-    <!OI;DEBUG_INFO_CONSTANT!>s<!><!UNSAFE_CALL!>.<!>length
+    <!DEBUG_INFO_CONSTANT{OI}!>s<!><!UNSAFE_CALL!>.<!>length
     if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> == null<!>) return <!ALWAYS_NULL!>s<!>!!
     var t: String? = "y"
     if (t == null) t = "x"
     var x: Int? = null
-    if (x == null) <!TYPE_MISMATCH!><!OI;DEBUG_INFO_CONSTANT!>x<!> += null<!>
+    if (x == null) <!TYPE_MISMATCH!><!DEBUG_INFO_CONSTANT{OI}!>x<!> += null<!>
     return <!DEBUG_INFO_SMARTCAST!>t<!> + s
 }
 
@@ -16,8 +16,8 @@ fun String?.gav() {}
 
 fun bar(s: String?) {
     if (s != null) return
-    <!OI;DEBUG_INFO_CONSTANT!>s<!>.gav()
+    <!DEBUG_INFO_CONSTANT{OI}!>s<!>.gav()
     <!DEBUG_INFO_CONSTANT!>s<!> <!USELESS_CAST!>as? String<!>
     <!DEBUG_INFO_CONSTANT!>s<!> <!USELESS_CAST!>as String?<!>
     <!ALWAYS_NULL!>s<!> as String
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.kt b/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.kt
index bfa431a3c11..6c6fd41b8cf 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.kt
@@ -11,7 +11,7 @@ public class My {
 fun test() {
     val my = My.create()
     if (my == null) {
-        <!OI;DEBUG_INFO_CONSTANT!>my<!><!UNSAFE_CALL!>.<!>foo()
+        <!DEBUG_INFO_CONSTANT{OI}!>my<!><!UNSAFE_CALL!>.<!>foo()
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.fir.kt
index 254fdd6b891..63997330a6c 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.fir.kt
@@ -65,4 +65,4 @@ fun f(a: SomeClass?) {
         c.hashCode()
         c.foo
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.kt b/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.kt
index b3d4d488fd4..b9e005b3ca9 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.kt
@@ -41,7 +41,7 @@ fun f(a: SomeClass?) {
     if (aa as? SomeSubClass != null) {
         aa = null
         // 'aa' cannot be cast to SomeSubClass
-        <!OI;DEBUG_INFO_CONSTANT!>aa<!><!UNSAFE_CALL!>.<!>hashCode()
+        <!DEBUG_INFO_CONSTANT{OI}!>aa<!><!UNSAFE_CALL!>.<!>hashCode()
         aa.<!UNRESOLVED_REFERENCE!>foo<!>
         (<!DEBUG_INFO_CONSTANT!>aa<!> as? SomeSubClass)<!UNSAFE_CALL!>.<!>foo
         (<!ALWAYS_NULL!>aa<!> as SomeSubClass).foo
@@ -50,7 +50,7 @@ fun f(a: SomeClass?) {
     aa = null
     if (b != null) {
         // 'aa' cannot be cast to SomeSubClass
-        <!OI;DEBUG_INFO_CONSTANT!>aa<!><!UNSAFE_CALL!>.<!>hashCode()
+        <!DEBUG_INFO_CONSTANT{OI}!>aa<!><!UNSAFE_CALL!>.<!>hashCode()
         aa.<!UNRESOLVED_REFERENCE!>foo<!>
         (<!DEBUG_INFO_CONSTANT!>aa<!> as? SomeSubClass)<!UNSAFE_CALL!>.<!>foo
         (<!ALWAYS_NULL!>aa<!> as SomeSubClass).foo
@@ -65,4 +65,4 @@ fun f(a: SomeClass?) {
         <!DEBUG_INFO_SMARTCAST!>c<!>.hashCode()
         <!DEBUG_INFO_SMARTCAST!>c<!>.foo
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.fir.kt
index d6f6a2b8607..62ba2cb3653 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.fir.kt
@@ -36,4 +36,4 @@ fun foo(x : String?, y : String?) {
         x.length
         y.length
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.kt b/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.kt
index d41ce7f675a..3f386d860d5 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.kt
@@ -16,12 +16,12 @@ fun foo(x : String?, y : String?) {
     else {
         // y == null but x != y
         <!DEBUG_INFO_SMARTCAST!>x<!>.length
-        <!OI;DEBUG_INFO_CONSTANT!>y<!><!UNSAFE_CALL!>.<!>length
+        <!DEBUG_INFO_CONSTANT{OI}!>y<!><!UNSAFE_CALL!>.<!>length
     }
     if (y == null && x != <!DEBUG_INFO_CONSTANT!>y<!>) {
         // y == null but x != y
         <!DEBUG_INFO_SMARTCAST!>x<!>.length
-        <!OI;DEBUG_INFO_CONSTANT!>y<!><!UNSAFE_CALL!>.<!>length
+        <!DEBUG_INFO_CONSTANT{OI}!>y<!><!UNSAFE_CALL!>.<!>length
     }
     else {
         x<!UNSAFE_CALL!>.<!>length
@@ -36,4 +36,4 @@ fun foo(x : String?, y : String?) {
         <!DEBUG_INFO_SMARTCAST!>x<!>.length
         <!DEBUG_INFO_SMARTCAST!>y<!>.length
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/complexComparison.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/complexComparison.fir.kt
index 2165f847e7e..5ba47dc28b8 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/complexComparison.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/complexComparison.fir.kt
@@ -20,4 +20,4 @@ fun foo(x: String?, y: String?, z: String?, w: String?) {
         y.length
     else
         y.<!INAPPLICABLE_CANDIDATE!>length<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/complexComparison.kt b/compiler/testData/diagnostics/tests/smartCasts/complexComparison.kt
index 6b5aaad4310..bed56cb0280 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/complexComparison.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/complexComparison.kt
@@ -7,7 +7,7 @@ fun foo(x: String?, y: String?, z: String?, w: String?) {
     if (x != null || y != null || (<!DEBUG_INFO_CONSTANT!>x<!> != z && <!DEBUG_INFO_CONSTANT!>y<!> != z))
         z<!UNSAFE_CALL!>.<!>length
     else
-        <!OI;DEBUG_INFO_CONSTANT!>z<!><!UNSAFE_CALL!>.<!>length
+        <!DEBUG_INFO_CONSTANT{OI}!>z<!><!UNSAFE_CALL!>.<!>length
     if (x == null || y == null || (x != z && y != z))
         z<!UNSAFE_CALL!>.<!>length
     else
@@ -20,4 +20,4 @@ fun foo(x: String?, y: String?, z: String?, w: String?) {
         <!DEBUG_INFO_SMARTCAST!>y<!>.length
     else
         y<!UNSAFE_CALL!>.<!>length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.kt b/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.kt
index 8174bd0da67..788f7950c63 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.kt
@@ -18,7 +18,7 @@ fun foo(list: StringList, arg: Unstable) {
     list.remove(arg.first)
     if (arg.first?.isEmpty() ?: false) {
         // Should be still resolved to extension, without smart cast or smart cast impossible
-        list.remove(<!OI;SMARTCAST_IMPOSSIBLE!>arg.first<!>)
+        list.remove(<!SMARTCAST_IMPOSSIBLE{OI}!>arg.first<!>)
     }
 }
 
@@ -36,6 +36,6 @@ fun bar(list: BooleanList, arg: UnstableBoolean) {
     list.remove(arg.first)
     if (arg.first ?: false) {
         // Should be still resolved to extension, without smart cast or smart cast impossible
-        list.remove(<!OI;SMARTCAST_IMPOSSIBLE!>arg.first<!>)
+        list.remove(<!SMARTCAST_IMPOSSIBLE{OI}!>arg.first<!>)
     }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt
index 3a1268c199a..be7f514adc3 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt
@@ -17,7 +17,7 @@ interface C: A
 
 fun test(a: A, b: B, c: C) {
     if (a is B && a is C) {
-        val d: C = id(<!OI;DEBUG_INFO_SMARTCAST!>a<!>)
+        val d: C = id(<!DEBUG_INFO_SMARTCAST{OI}!>a<!>)
         val e: Any = id(a)
         val f = id(a)
         checkSubtype<A>(f)
@@ -31,7 +31,7 @@ fun test(a: A, b: B, c: C) {
         val k = three(a, b, c)
         checkSubtype<A>(k)
         checkSubtype<B>(<!TYPE_MISMATCH!>k<!>)
-        val l: Int = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>three(a, b, c)<!>
+        val l: Int = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>three(a, b, c)<!>
         
         use(d, e, f, g, h, k, l)
     }
@@ -41,11 +41,11 @@ fun <T> foo(t: T, <!UNUSED_PARAMETER!>l<!>: MutableList<T>): T = t
 
 fun testErrorMessages(a: A, ml: MutableList<String>) {
     if (a is B && a is C) {
-        <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>foo<!>(a, <!NI;TYPE_MISMATCH!>ml<!>)
+        <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>foo<!>(a, <!TYPE_MISMATCH{NI}!>ml<!>)
     }
 
     if(a is C) {
-        <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>foo<!>(a, <!NI;TYPE_MISMATCH!>ml<!>)
+        <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>foo<!>(a, <!TYPE_MISMATCH{NI}!>ml<!>)
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.fir.kt
index e2b74b41c29..ea2aa47e601 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.fir.kt
@@ -8,4 +8,4 @@ fun test(a: MutableList<out Int?>?) {
             b.inc()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.kt
index 46f081df69c..ccf8d6892a2 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.kt
@@ -3,9 +3,9 @@
 
 fun test(a: MutableList<out Int?>?) {
     if (a != null) {
-        val b = <!OI;DEBUG_INFO_SMARTCAST!>a<!>[0] // no SMARTCAST diagnostic
+        val b = <!DEBUG_INFO_SMARTCAST{OI}!>a<!>[0] // no SMARTCAST diagnostic
         if (b != null) {
             <!DEBUG_INFO_SMARTCAST!>b<!>.inc()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt39010.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt39010.kt
index 6ab66160644..79b4b03581d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt39010.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt39010.kt
@@ -8,4 +8,4 @@ class B(var a: A<*>?) {
             <!SMARTCAST_IMPOSSIBLE!>a<!>.foo()
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.kt b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.kt
index 7f5faa5ea60..cc13a0c6bc4 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.kt
@@ -17,37 +17,37 @@ interface C {
 
 fun foo(x: Any?) {
     if (x is A && x is B) {
-        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String>() }
+        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String>() }
         <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { _<String?>() }
     }
 
     if (x is B && x is A) {
-        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String>() }
+        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String>() }
         <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { _<String?>() }
     }
 
     if (x is A && x is C) {
         <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { _<String>() }
-        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String?>() }
+        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String?>() }
     }
 
     if (x is C && x is A) {
         <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { _<String>() }
-        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String?>() }
+        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String?>() }
     }
 
     if (x is A && x is B && x is C) {
         <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { _<String>() }
-        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String?>() }
+        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String?>() }
     }
 
     if (x is B && x is A && x is C) {
         <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { _<String>() }
-        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String?>() }
+        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String?>() }
     }
 
     if (x is B && x is C && x is A) {
         <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { _<String>() }
-        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><String?>() }
+        <!DEBUG_INFO_SMARTCAST!>x<!>.foo().checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><String?>() }
     }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt10444.kt b/compiler/testData/diagnostics/tests/smartCasts/kt10444.kt
index 62cefffb4b7..bf336d36415 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt10444.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt10444.kt
@@ -10,7 +10,7 @@ class Qwe<T : Any>(val a: T?) {
 
     fun test1(obj: Qwe<*>) {
         obj <!UNCHECKED_CAST!>as Qwe<T><!>
-        check(<!OI;DEBUG_INFO_SMARTCAST!>obj<!>.a)
+        check(<!DEBUG_INFO_SMARTCAST{OI}!>obj<!>.a)
     }
 
     fun check(a: T?) {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt2865.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/kt2865.fir.kt
index fe9fae8146d..fe257d907eb 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt2865.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt2865.fir.kt
@@ -9,4 +9,4 @@ fun foo(a: MutableMap<String, String>, x: String?) {
 fun foo1(a: MutableMap<String, String>, x: String?) {
     <!INAPPLICABLE_CANDIDATE!>a[x] = x!!<!>
     a[x!!] = x
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt2865.kt b/compiler/testData/diagnostics/tests/smartCasts/kt2865.kt
index a44ddf5de2d..adbf52f7c6b 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt2865.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt2865.kt
@@ -7,6 +7,6 @@ fun foo(a: MutableMap<String, String>, x: String?) {
 }
 
 fun foo1(a: MutableMap<String, String>, x: String?) {
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>a[<!NI;TYPE_MISMATCH!>x<!>]<!> = x!!
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>a[<!TYPE_MISMATCH{NI}!>x<!>]<!> = x!!
     a[x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>] = <!DEBUG_INFO_SMARTCAST!>x<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt
index c696612aea0..c6d8c192664 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt
@@ -48,4 +48,4 @@ fun case_3(z: Any?) {
     y checkType { <!INAPPLICABLE_CANDIDATE!>_<!><Any?>() }
     y checkType { _<kotlin.String>() }
     // y is inferred to String
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt30927.kt b/compiler/testData/diagnostics/tests/smartCasts/kt30927.kt
index 9e68572e8f4..6d6c6e044c2 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt30927.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt30927.kt
@@ -6,22 +6,22 @@ fun case_0() {
     val z: Any? = 10
     val y = z.run {
         this as Int
-        <!NI;DEBUG_INFO_SMARTCAST!>this<!> // error in NI: required Int, found Any?; just inferred to Any? in OI
+        <!DEBUG_INFO_SMARTCAST{NI}!>this<!> // error in NI: required Int, found Any?; just inferred to Any? in OI
     }
-    y checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Any?>() }
-    y checkType { <!OI;TYPE_MISMATCH!>_<!><Int>() }
+    y checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Any?>() }
+    y checkType { <!TYPE_MISMATCH{OI}!>_<!><Int>() }
 }
 
 fun case_1(z: Any?) {
     val y = z.run {
         when (this) {
-            is String -> return@run <!NI;DEBUG_INFO_SMARTCAST!>this<!> // type mismatch in the new inference (required String, found Any?)
+            is String -> return@run <!DEBUG_INFO_SMARTCAST{NI}!>this<!> // type mismatch in the new inference (required String, found Any?)
             is Float -> ""
             else -> return@run ""
         }
     }
-    y checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Any?>() }
-    y checkType { <!OI;TYPE_MISMATCH!>_<!><kotlin.String>() }
+    y checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Any?>() }
+    y checkType { <!TYPE_MISMATCH{OI}!>_<!><kotlin.String>() }
     // y is inferred to Any?
 }
 
@@ -40,12 +40,12 @@ fun case_2(z: Any?) {
 fun case_3(z: Any?) {
     val y = z.let {
         when (it) {
-            is String -> return@let <!NI;DEBUG_INFO_SMARTCAST!>it<!>
+            is String -> return@let <!DEBUG_INFO_SMARTCAST{NI}!>it<!>
             is Float -> ""
             else -> return@let ""
         }
     }
-    y checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Any?>() }
-    y checkType { <!OI;TYPE_MISMATCH!>_<!><kotlin.String>() }
+    y checkType { <!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Any?>() }
+    y checkType { <!TYPE_MISMATCH{OI}!>_<!><kotlin.String>() }
     // y is inferred to String
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.kt b/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.kt
index 2a1a6f3b5b2..e11188b6bdf 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.kt
@@ -13,14 +13,14 @@ val foo: Foo = run {
     <!DEBUG_INFO_SMARTCAST!>x<!>
 }
 
-val foofoo: Foo = <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>run<!> {
+val foofoo: Foo = <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>run<!> {
     val x = foo()
     if (x == null) throw Exception()
-    <!DEBUG_INFO_SMARTCAST, NI;TYPE_MISMATCH!>x<!>
+    <!DEBUG_INFO_SMARTCAST, TYPE_MISMATCH{NI}!>x<!>
 }
 
-val bar: Bar = <!NI;TYPE_MISMATCH!><!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>run<!> {
+val bar: Bar = <!TYPE_MISMATCH{NI}!><!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>run<!> {
     val x = foo()
     if (x == null) throw Exception()
-    <!NI;DEBUG_INFO_SMARTCAST, NI;TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
+    <!DEBUG_INFO_SMARTCAST{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>x<!>
 }<!>
diff --git a/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.kt b/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.kt
index d7d642e66fc..11537043f3f 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.kt
@@ -9,7 +9,7 @@ fun foo() {
             return true
         }
         <!SMARTCAST_IMPOSSIBLE!>i<!>.hashCode()
-        trans(<!NI;SMARTCAST_IMPOSSIBLE, SMARTCAST_IMPOSSIBLE!>i<!>, ::can)
+        trans(<!SMARTCAST_IMPOSSIBLE{NI}, SMARTCAST_IMPOSSIBLE!>i<!>, ::can)
         <!SMARTCAST_IMPOSSIBLE!>i<!>.hashCode()
     }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.kt b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.kt
index 4edee8fe60c..158b6c22d25 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.kt
@@ -17,7 +17,7 @@ fun foo(): Int {
         k.run()
         val d: Int = <!DEBUG_INFO_SMARTCAST!>c<!>
         // a is captured so smart cast is not possible
-        return d + <!NI;SMARTCAST_IMPOSSIBLE, SMARTCAST_IMPOSSIBLE!>a<!>
+        return d + <!SMARTCAST_IMPOSSIBLE{NI}, SMARTCAST_IMPOSSIBLE!>a<!>
     }
     else return -1
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/publicVals/otherModule.txt b/compiler/testData/diagnostics/tests/smartCasts/publicVals/otherModule.txt
index 636370392ef..4c7db673204 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/publicVals/otherModule.txt
+++ b/compiler/testData/diagnostics/tests/smartCasts/publicVals/otherModule.txt
@@ -12,7 +12,6 @@ package a {
     }
 }
 
-
 // -- Module: <m2> --
 package
 
@@ -23,3 +22,4 @@ package a {
 package b {
     public fun a.X.gav(): kotlin.Int
 }
+
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiver.kt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiver.kt
index 94ce4126471..647485c1a2c 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiver.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/nullableReceiver.kt
@@ -10,4 +10,4 @@ fun test(foo: Foo?) {
         // Correct
         foo?.bar?.length
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/safeAccessReceiverNotNull.kt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/safeAccessReceiverNotNull.kt
index 3ae438cc7ce..139653e644f 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/safeAccessReceiverNotNull.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/safeAccessReceiverNotNull.kt
@@ -132,4 +132,4 @@ fun checkInvokable(ip: InvokableProperty?) {
     if (ip?.<!UNSAFE_IMPLICIT_INVOKE_CALL!>i<!>() == "Hello") {
         <!DEBUG_INFO_SMARTCAST!>ip<!>.hashCode()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.kt b/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.kt
index 68f01c6bdbf..b28bd82c100 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/smartcastOnSameFieldOfDifferentInstances.kt
@@ -8,4 +8,4 @@ class A(val x: String?) {
             x<!UNSAFE_CALL!>.<!>length > 0 -> "2"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.fir.kt
index 04df688e9a4..6cf1fc73b07 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.fir.kt
@@ -70,4 +70,4 @@ fun gau(flag: Boolean, arg: String?) {
     }
 
     x.hashCode()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.kt
index b4c09df476a..0f0bd5b8dbf 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.kt
@@ -69,5 +69,5 @@ fun gau(flag: Boolean, arg: String?) {
         }
     }
 
-    <!NI;DEBUG_INFO_SMARTCAST!>x<!><!OI;UNSAFE_CALL!>.<!>hashCode()
-}
\ No newline at end of file
+    <!DEBUG_INFO_SMARTCAST{NI}!>x<!><!UNSAFE_CALL{OI}!>.<!>hashCode()
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.fir.kt
index ac221151837..d7c52abd0f1 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.fir.kt
@@ -7,4 +7,4 @@ fun bar() {
     var x: Int?
     x = 4
     foo(x, { x = null; x.<!INAPPLICABLE_CANDIDATE!>hashCode<!>() }, x)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.kt
index 29b21ad80dc..67884b2c8da 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.kt
@@ -6,5 +6,5 @@ fun foo(x: Int, f: () -> Unit, y: Int) {}
 fun bar() {
     var x: Int?
     x = 4
-    foo(<!DEBUG_INFO_SMARTCAST!>x<!>, { x = null; x<!UNSAFE_CALL!>.<!>hashCode() }, <!NI;SMARTCAST_IMPOSSIBLE, SMARTCAST_IMPOSSIBLE!>x<!>)
-}
\ No newline at end of file
+    foo(<!DEBUG_INFO_SMARTCAST!>x<!>, { x = null; x<!UNSAFE_CALL!>.<!>hashCode() }, <!SMARTCAST_IMPOSSIBLE{NI}, SMARTCAST_IMPOSSIBLE!>x<!>)
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/property.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/property.fir.kt
index 8951d31bf6f..b12b92d08c8 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/property.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/property.fir.kt
@@ -8,4 +8,4 @@ fun bar(s: String): Int {
 fun foo(m: MyClass): Int {
     m.p = "xyz"
     return <!INAPPLICABLE_CANDIDATE!>bar<!>(m.p)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/property.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/property.kt
index ff09a6cf1c2..c6af27d8ad7 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/property.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/property.kt
@@ -7,5 +7,5 @@ fun bar(s: String): Int {
 
 fun foo(m: MyClass): Int {
     m.p = "xyz"
-    return bar(<!NI;SMARTCAST_IMPOSSIBLE, SMARTCAST_IMPOSSIBLE!>m.p<!>)
-}
\ No newline at end of file
+    return bar(<!SMARTCAST_IMPOSSIBLE{NI}, SMARTCAST_IMPOSSIBLE!>m.p<!>)
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.fir.kt
index 853571a14f0..0dce64de076 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.fir.kt
@@ -8,4 +8,4 @@ fun foo() {
     v.<!INAPPLICABLE_CANDIDATE!>length<!>
     v = "abc"
     v.length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.kt
index f899cf84aa2..c3ee5db2cc0 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.kt
@@ -5,7 +5,7 @@ fun foo() {
     v = "abc"
     <!DEBUG_INFO_SMARTCAST!>v<!>.length
     v = null
-    <!OI;DEBUG_INFO_CONSTANT!>v<!><!UNSAFE_CALL!>.<!>length
+    <!DEBUG_INFO_CONSTANT{OI}!>v<!><!UNSAFE_CALL!>.<!>length
     v = "abc"
     <!DEBUG_INFO_SMARTCAST!>v<!>.length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.kt
index af728f2c7a3..49b7e95df7f 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.kt
@@ -6,7 +6,7 @@ fun foo() {
     val y = x
     x = null
     if (y != null) {
-        <!OI;DEBUG_INFO_CONSTANT!>x<!><!UNSAFE_CALL!>.<!>hashCode()
+        <!DEBUG_INFO_CONSTANT{OI}!>x<!><!UNSAFE_CALL!>.<!>hashCode()
     }
 }
 
@@ -23,7 +23,7 @@ fun bar(s: String?) {
     val hashCode = ss?.hashCode()
     ss = null
     if (hashCode != null) {
-        <!OI;DEBUG_INFO_CONSTANT!>ss<!><!UNSAFE_CALL!>.<!>hashCode()
+        <!DEBUG_INFO_CONSTANT{OI}!>ss<!><!UNSAFE_CALL!>.<!>hashCode()
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.kt
index 6890bdaf128..c1248f74030 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.kt
@@ -76,5 +76,5 @@ fun test6() {
     finally {
         a = null
     }
-    <!OI;DEBUG_INFO_CONSTANT!>a<!><!UNSAFE_CALL!>.<!>hashCode() // a is null here
+    <!DEBUG_INFO_CONSTANT{OI}!>a<!><!UNSAFE_CALL!>.<!>hashCode() // a is null here
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.fir.kt
index a5f4d31c26c..430868a8b0c 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.fir.kt
@@ -5,4 +5,4 @@ fun foo() {
     v.<!INAPPLICABLE_CANDIDATE!>length<!>
     v = null
     v.<!INAPPLICABLE_CANDIDATE!>length<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.kt
index c19833c4ce2..3bf5394913e 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.kt
@@ -4,5 +4,5 @@ fun foo() {
     // It is possible in principle to provide smart cast here
     v<!UNSAFE_CALL!>.<!>length
     v = null
-    <!OI;DEBUG_INFO_CONSTANT!>v<!><!UNSAFE_CALL!>.<!>length
-}
\ No newline at end of file
+    <!DEBUG_INFO_CONSTANT{OI}!>v<!><!UNSAFE_CALL!>.<!>length
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt
index 08ec280670c..cac789a2e71 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt
@@ -12,10 +12,10 @@ operator fun Long?.inc() = this?.let { it + 1 }
 fun bar(arg: Long?): Long {
     var i = arg
     if (i++ == 5L) {
-        return i<!UNSAFE_CALL!>--<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> i
+        return i<!UNSAFE_CALL!>--<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> i
     }
     if (i++ == 7L) {
         return i++ <!UNSAFE_OPERATOR_CALL!>+<!> <!TYPE_MISMATCH!>i<!>
     }
     return 0L
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.fir.kt
index f596b8eb5ec..b7520e5f0b1 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.fir.kt
@@ -10,4 +10,4 @@ public fun box() : MyClass? {
     var j = i++
     j.hashCode()
     return i
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt
index a8af60b0b89..b23cf17ff87 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt
@@ -1,7 +1,7 @@
 // !WITH_NEW_INFERENCE
 class MyClass
 
-operator fun MyClass.inc(): MyClass { <!OI;UNREACHABLE_CODE!>return<!> null!! }
+operator fun MyClass.inc(): MyClass { <!UNREACHABLE_CODE{OI}!>return<!> null!! }
 
 public fun box() : MyClass? {
     var i : MyClass?
@@ -10,4 +10,4 @@ public fun box() : MyClass? {
     var j = <!DEBUG_INFO_SMARTCAST!>i<!>++
     <!DEBUG_INFO_SMARTCAST!>j<!>.hashCode()
     return i
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.fir.kt
index b6221b848ba..9193fee27ef 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.fir.kt
@@ -10,4 +10,4 @@ public fun box() {
     var j = ++i
     // j is null so call is unsafe
     j.hashCode()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt
index bc4f25b85b7..f31b9849399 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt
@@ -1,7 +1,7 @@
 // !WITH_NEW_INFERENCE
 class MyClass
 
-operator fun MyClass.inc(): MyClass { <!OI;UNREACHABLE_CODE!>return<!> null!! }
+operator fun MyClass.inc(): MyClass { <!UNREACHABLE_CODE{OI}!>return<!> null!! }
 
 public fun box() {
     var i : MyClass?
@@ -10,4 +10,4 @@ public fun box() {
     var j = ++<!DEBUG_INFO_SMARTCAST!>i<!>
     // j is null so call is unsafe
     j.hashCode()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt
index 3eca82fa791..696a1d23866 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt
@@ -15,7 +15,7 @@ class MyClass {
         m = create()
         // See KT-7428
         for ((k, v) in <!SMARTCAST_IMPOSSIBLE!>m<!>)
-            res += (<!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>k<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>length<!> <!NI;DEBUG_INFO_MISSING_UNRESOLVED!>+<!> <!NI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>v<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>length<!>)
+            res += (<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}!>k<!>.<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>length<!> <!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{NI}!>v<!>.<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>length<!>)
         return res
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.fir.kt
index 508d7330612..009054c8de9 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.fir.kt
@@ -13,4 +13,4 @@ fun max(a: IntArray): Int? {
             maxI = i
     }
     return maxI
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.kt
index 290f8b6f5c9..a5ef4b3718a 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.kt
@@ -9,8 +9,8 @@ fun IntArray.forEachIndexed( op: (i: Int, value: Int) -> Unit) {
 fun max(a: IntArray): Int? {
     var maxI: Int? = null
     a.forEachIndexed { i, value ->
-        if (maxI == null || value >= a[<!NI;SMARTCAST_IMPOSSIBLE, SMARTCAST_IMPOSSIBLE!>maxI<!>])
+        if (maxI == null || value >= a[<!SMARTCAST_IMPOSSIBLE{NI}, SMARTCAST_IMPOSSIBLE!>maxI<!>])
             maxI = i
     }
     return maxI
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.kt
index ad110456f2f..a23c1b027c9 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.kt
@@ -2,5 +2,5 @@
 fun foo(): Int {
     var i: Int? = <!VARIABLE_WITH_REDUNDANT_INITIALIZER!>42<!>
     i = null
-    return <!TYPE_MISMATCH!><!OI;DEBUG_INFO_CONSTANT!>i<!> + 1<!>
-}
\ No newline at end of file
+    return <!TYPE_MISMATCH!><!DEBUG_INFO_CONSTANT{OI}!>i<!> + 1<!>
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.fir.kt
index ffc12c87ecd..e70c299a0d1 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.fir.kt
@@ -3,4 +3,4 @@ fun foo(): Int {
     var s: String? = "abc"
     s = null
     return s.<!INAPPLICABLE_CANDIDATE!>length<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.kt
index da0e7ad3353..91ed7e8410d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.kt
@@ -2,5 +2,5 @@
 fun foo(): Int {
     var s: String? = <!VARIABLE_WITH_REDUNDANT_INITIALIZER!>"abc"<!>
     s = null
-    return <!OI;DEBUG_INFO_CONSTANT!>s<!><!UNSAFE_CALL!>.<!>length
-}
\ No newline at end of file
+    return <!DEBUG_INFO_CONSTANT{OI}!>s<!><!UNSAFE_CALL!>.<!>length
+}
diff --git a/compiler/testData/diagnostics/tests/substitutions/starProjections.kt b/compiler/testData/diagnostics/tests/substitutions/starProjections.kt
index 2ce4d7b1316..185071aec6e 100644
--- a/compiler/testData/diagnostics/tests/substitutions/starProjections.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/starProjections.kt
@@ -17,9 +17,9 @@ interface B<R, T: B<List<R>, <!UPPER_BOUND_VIOLATED!>T<!>>> {
 }
 
 fun testB(b: B<*, *>) {
-    <!OI;TYPE_MISMATCH!>b<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>r<!>().<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>checkType<!> { <!NI;UNRESOLVED_REFERENCE!>_<!><Any?>() }
-    <!OI;TYPE_MISMATCH!>b<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>t<!>().<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>checkType<!> { <!NI;UNRESOLVED_REFERENCE!>_<!><B<List<*>, *>>() }
+    <!TYPE_MISMATCH{OI}!>b<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>r<!>().<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>checkType<!> { <!UNRESOLVED_REFERENCE{NI}!>_<!><Any?>() }
+    <!TYPE_MISMATCH{OI}!>b<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>t<!>().<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>checkType<!> { <!UNRESOLVED_REFERENCE{NI}!>_<!><B<List<*>, *>>() }
 
-    <!OI;TYPE_MISMATCH!><!OI;TYPE_MISMATCH!>b<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>t<!>()<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>r<!>().<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>size<!>
+    <!TYPE_MISMATCH{OI}!><!TYPE_MISMATCH{OI}!>b<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>t<!>()<!>.<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>r<!>().<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>size<!>
 }
 
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.fir.kt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.fir.kt
index fb10e0b812c..5df68887ee8 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.fir.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.fir.kt
@@ -16,4 +16,4 @@ import bar.*
 
 fun <T> test(l: List<T>) {
     <!AMBIGUITY!>f<!>(l)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt
index 02675574551..13b20d49921 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt
@@ -15,5 +15,5 @@ import foo.*
 import bar.*
 
 fun <T> test(l: List<T>) {
-    <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>f<!>(l)
-}
\ No newline at end of file
+    <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>f<!>(l)
+}
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.fir.kt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.fir.kt
index 6516feb3311..92fd0a5ef67 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.fir.kt
@@ -6,4 +6,4 @@ fun <T> f1(c: Collection<T>): T{throw Exception()}
 
 fun <T> test(l: List<T>) {
     f1(l)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt
index 7881086dbfb..b4462ae3337 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt
@@ -5,5 +5,5 @@ fun <T> f1(l: <!UNRESOLVED_REFERENCE!>List2<!><T>): T {throw Exception()} // ERR
 fun <T> f1(c: Collection<T>): T{throw Exception()}
 
 fun <T> test(l: List<T>) {
-    <!NI;OVERLOAD_RESOLUTION_AMBIGUITY, OI;CANNOT_COMPLETE_RESOLVE!>f1<!>(l)
-}
\ No newline at end of file
+    <!CANNOT_COMPLETE_RESOLVE{OI}, OVERLOAD_RESOLUTION_AMBIGUITY{NI}!>f1<!>(l)
+}
diff --git a/compiler/testData/diagnostics/tests/suspendConversion/chainedFunSuspendConversionForSimpleExpression.kt b/compiler/testData/diagnostics/tests/suspendConversion/chainedFunSuspendConversionForSimpleExpression.kt
index 17f0bf5e12f..9c19df99408 100644
--- a/compiler/testData/diagnostics/tests/suspendConversion/chainedFunSuspendConversionForSimpleExpression.kt
+++ b/compiler/testData/diagnostics/tests/suspendConversion/chainedFunSuspendConversionForSimpleExpression.kt
@@ -11,3 +11,4 @@ fun test(f: () -> Unit) {
     foo { }
     foo(f)
 }
+
diff --git a/compiler/testData/diagnostics/tests/suspendConversion/suspendAndFunConversionInDisabledMode.kt b/compiler/testData/diagnostics/tests/suspendConversion/suspendAndFunConversionInDisabledMode.kt
index 1437e84447d..f7fffebc507 100644
--- a/compiler/testData/diagnostics/tests/suspendConversion/suspendAndFunConversionInDisabledMode.kt
+++ b/compiler/testData/diagnostics/tests/suspendConversion/suspendAndFunConversionInDisabledMode.kt
@@ -28,3 +28,4 @@ object Test2 {
         }
     }
 }
+
diff --git a/compiler/testData/diagnostics/tests/suspendConversion/suspendConversionCompatibility.kt b/compiler/testData/diagnostics/tests/suspendConversion/suspendConversionCompatibility.kt
index 2d83b8a378c..90c564f0e13 100644
--- a/compiler/testData/diagnostics/tests/suspendConversion/suspendConversionCompatibility.kt
+++ b/compiler/testData/diagnostics/tests/suspendConversion/suspendConversionCompatibility.kt
@@ -40,4 +40,4 @@ object Test3 {
             <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!>result<!>
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Bases.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Bases.kt
index 2ea41e308b1..9eb9f40821b 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Bases.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Bases.kt
@@ -28,4 +28,4 @@ public class JavaClass1 {
 // FILE: JavaClass2.java
 public class JavaClass2 extends KotlinClass1 {
     public int getSomething2() { return 1; }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Getter.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Getter.kt
index 314f895def1..56f9bd2f56e 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Getter.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/Getter.kt
@@ -17,4 +17,4 @@ fun useInt(<!UNUSED_PARAMETER!>i<!>: Int) {}
 // FILE: JavaClass.java
 public class JavaClass {
     public int getSomething() { return 1; }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyPublic.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyPublic.kt
index 7164afb1eb6..5e057186469 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyPublic.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/OnlyPublic.kt
@@ -19,4 +19,4 @@ public class JavaClass {
     int getSomethingPackage() { return 1; }
 
     protected void setSomethingPublic(int value) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterHasHigherAccess.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterHasHigherAccess.kt
index ddb4ee89226..d0d8de0a565 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterHasHigherAccess.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/javaProperties/SetterHasHigherAccess.kt
@@ -13,4 +13,4 @@ fun foo(javaClass: JavaClass) {
 public class JavaClass {
     protected int getSomething() { return 1; }
     public void setSomething(int value) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethod.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethod.kt
index ab0f7d86bb2..ffa5c54f4e0 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethod.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethod.kt
@@ -11,4 +11,4 @@ public class JavaClass {
 
 interface I<T> {
     T run(T t);
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethodInGenericClass.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethodInGenericClass.kt
index b1a3772167e..f715eebf393 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethodInGenericClass.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/GenericMethodInGenericClass.kt
@@ -13,4 +13,4 @@ public class JavaClass<X> {
 
 interface I<T> {
     T run(T t);
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.kt
index 680412ce5dd..9577f65917d 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.kt
@@ -2,7 +2,7 @@
 // FILE: KotlinFile.kt
 fun foo(javaClass: JavaClass<Int>): Int {
     val inner = javaClass.createInner<String>()
-    return <!TYPE_MISMATCH!>inner.doSomething(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, "") <!OI;TYPE_MISMATCH!>{ }<!><!>
+    return <!TYPE_MISMATCH!>inner.doSomething(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, "") <!TYPE_MISMATCH{OI}!>{ }<!><!>
 }
 
 // FILE: JavaClass.java
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PackageLocal.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PackageLocal.kt
index 55819311328..185dcc0ca49 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PackageLocal.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/PackageLocal.kt
@@ -15,4 +15,4 @@ fun foo(javaClass: JavaClass) {
 // FILE: JavaClass.java
 public class JavaClass {
     void doSomething(Runnable runnable) { runnable.run(); }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.kt
index 044299fd325..9de8a5382e9 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.kt
@@ -1,10 +1,10 @@
 // !WITH_NEW_INFERENCE
 // FILE: KotlinFile.kt
 fun foo(javaClass: JavaClass) {
-    javaClass.<!INVISIBLE_MEMBER!>doSomething<!> <!OI;TYPE_MISMATCH!>{ }<!>
+    javaClass.<!INVISIBLE_MEMBER!>doSomething<!> <!TYPE_MISMATCH{OI}!>{ }<!>
 }
 
 // FILE: JavaClass.java
 public class JavaClass {
     private void doSomething(Runnable runnable) { runnable.run(); }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt
index 4efde3e90e0..1843a358cba 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt
@@ -14,7 +14,7 @@ class GenericDerivedClass<T> : GenericBaseClass<T>(), GenericBaseInterface<T> {
     override fun bar(x: T): T = super.bar(x)
 
     override fun ambiguous(x: T): T =
-            <!AMBIGUOUS_SUPER!>super<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)
+            <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>ambiguous<!>(x)
 }
 
 class <!CONFLICTING_JVM_DECLARATIONS!>SpecializedDerivedClass<!> : GenericBaseClass<Int>(), GenericBaseInterface<String> {
@@ -22,9 +22,9 @@ class <!CONFLICTING_JVM_DECLARATIONS!>SpecializedDerivedClass<!> : GenericBaseCl
     override fun bar(x: String): String = super.bar(x)
 
     override fun ambiguous(x: String): String =
-            <!AMBIGUOUS_SUPER!>super<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)
+            <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>ambiguous<!>(x)
     override fun ambiguous(x: Int): Int =
-            <!AMBIGUOUS_SUPER!>super<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)
+            <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>ambiguous<!>(x)
 }
 
 class <!CONFLICTING_JVM_DECLARATIONS!>MixedDerivedClass<!><T> : GenericBaseClass<Int>(), GenericBaseInterface<T> {
@@ -32,7 +32,7 @@ class <!CONFLICTING_JVM_DECLARATIONS!>MixedDerivedClass<!><T> : GenericBaseClass
     override fun bar(x: T): T = super.bar(x)
 
     override fun ambiguous(x: Int): Int =
-            <!AMBIGUOUS_SUPER!>super<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)
+            <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>ambiguous<!>(x)
     <!CONFLICTING_JVM_DECLARATIONS!>override fun ambiguous(x: T): T<!> =
-            <!AMBIGUOUS_SUPER!>super<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>ambiguous<!>(x)
-}
\ No newline at end of file
+            <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>ambiguous<!>(x)
+}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt
index 6d682b6de24..39b17224993 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt
@@ -14,8 +14,8 @@ interface InterfaceWithFun {
 
 class DerivedUsingFun : BaseWithCallableProp(), InterfaceWithFun {
     fun foo(): String =
-    <!AMBIGUOUS_SUPER!>super<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>fn<!>()
+    <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>fn<!>()
 
     override fun bar(): String =
             super.bar()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.kt b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.kt
index c9b3c768423..a29b5460edd 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.kt
+++ b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.kt
@@ -40,7 +40,7 @@ class Context<T>
 fun <T> Any.decodeIn(typeFrom: Context<in T>): T = something()
 
 fun <T> Any?.decodeOut1(typeFrom: Context<out T>): T {
-    return <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>this?.<!IMPLICIT_NOTHING_TYPE_ARGUMENT_IN_RETURN_POSITION!>decodeIn<!>(typeFrom) ?: <!OI;TYPE_MISMATCH!>kotlin.Unit<!><!>
+    return <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>this?.<!IMPLICIT_NOTHING_TYPE_ARGUMENT_IN_RETURN_POSITION!>decodeIn<!>(typeFrom) ?: <!TYPE_MISMATCH{OI}!>kotlin.Unit<!><!>
 }
 
 fun <T> Any.decodeOut2(typeFrom: Context<out T>): T {
diff --git a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.kt b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.kt
index 2a4864084e6..ac96526df5b 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.kt
@@ -13,6 +13,6 @@ class TColl<T, C : Collection<T>>
 typealias TC<T, C> = TColl<T, C>
 typealias TC2<T, C> = TC<T, C>
 
-val y1 = TColl<Any, <!NI;UPPER_BOUND_VIOLATED, UPPER_BOUND_VIOLATED!>Any<!>>()
-val y2 = TC<Any, <!NI;UPPER_BOUND_VIOLATED, UPPER_BOUND_VIOLATED!>Any<!>>()
-val y3 = TC2<Any, <!NI;UPPER_BOUND_VIOLATED, UPPER_BOUND_VIOLATED!>Any<!>>()
+val y1 = TColl<Any, <!UPPER_BOUND_VIOLATED{NI}, UPPER_BOUND_VIOLATED!>Any<!>>()
+val y2 = TC<Any, <!UPPER_BOUND_VIOLATED{NI}, UPPER_BOUND_VIOLATED!>Any<!>>()
+val y3 = TC2<Any, <!UPPER_BOUND_VIOLATED{NI}, UPPER_BOUND_VIOLATED!>Any<!>>()
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt
index 5a111b724b6..66998fd9bfe 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt
@@ -18,8 +18,8 @@ fun test4(x: <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>NL<Any><!>) {}
 val test5 = NA<Int>()
 val test6 = NA<<!UPPER_BOUND_VIOLATED!>Any<!>>()
 val test7 = NL<Int>()
-val test8 = MMMM<<!NI;UPPER_BOUND_VIOLATED!>Int<!>>()
-val test9dwd = <!OI;UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION!>NL<Any>()<!>
+val test8 = MMMM<<!UPPER_BOUND_VIOLATED{NI}!>Int<!>>()
+val test9dwd = <!UPPER_BOUND_VIOLATED_IN_TYPEALIAS_EXPANSION{OI}!>NL<Any>()<!>
 
 fun test9(x: TC<Number, Collection<Number>>) {}
 fun test10(x: TC<Number, Collection<Int>>) {}
diff --git a/compiler/testData/diagnostics/tests/typealias/importMemberFromJavaViaAlias.fir.kt b/compiler/testData/diagnostics/tests/typealias/importMemberFromJavaViaAlias.fir.kt
deleted file mode 100644
index c07a996b728..00000000000
--- a/compiler/testData/diagnostics/tests/typealias/importMemberFromJavaViaAlias.fir.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// SKIP_JAVAC
-
-// FILE: test/jv/JavaSample.java
-
-package test.jv;
-
-public class JavaSample {
-    public static void member() {}
-}
-
-// FILE: foo.kt
-
-package test.kot
-
-typealias JavaAlias = test.jv.JavaSample
-
-// FILE: test.kt
-
-import test.kot.JavaAlias
-import test.kot.JavaAlias.member
-
-fun foo(
-    sample: JavaSample,
-    alias: JavaAlias
-) {
-    member()
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/typealias/importMemberFromJavaViaAlias.kt b/compiler/testData/diagnostics/tests/typealias/importMemberFromJavaViaAlias.kt
index 07cedb5ffff..8c4115c85b5 100644
--- a/compiler/testData/diagnostics/tests/typealias/importMemberFromJavaViaAlias.kt
+++ b/compiler/testData/diagnostics/tests/typealias/importMemberFromJavaViaAlias.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // SKIP_JAVAC
 
@@ -25,4 +26,4 @@ fun foo(
     alias: JavaAlias
 ) {
     member()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.fir.kt b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.fir.kt
index 33217c3fb62..3fd7f4dd2ba 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.fir.kt
@@ -21,4 +21,4 @@ fun test2(x: Generic<Int>) = x.GI()
 fun <T> test3(x: Generic<T>) = x.GI()
 fun <T> test4(x: Generic<List<T>>) = x.GI()
 fun <T> test5(x: Generic<T>) = x.<!INAPPLICABLE_CANDIDATE!>GIntI<!>()
-fun Generic<Int>.test6() = GIntI()
\ No newline at end of file
+fun Generic<Int>.test6() = GIntI()
diff --git a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.kt b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.kt
index a5f98675826..3a8bc36da99 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.kt
@@ -20,5 +20,5 @@ typealias GIntI = Generic<Int>.Inner
 fun test2(x: Generic<Int>) = x.GI()
 fun <T> test3(x: Generic<T>) = x.GI()
 fun <T> test4(x: Generic<List<T>>) = x.GI()
-fun <T> test5(x: Generic<T>) = <!OI;TYPE_MISMATCH!>x<!>.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>GIntI<!>()
-fun Generic<Int>.test6() = GIntI()
\ No newline at end of file
+fun <T> test5(x: Generic<T>) = <!TYPE_MISMATCH{OI}!>x<!>.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>GIntI<!>()
+fun Generic<Int>.test6() = GIntI()
diff --git a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.kt b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.kt
index 78e5b9fc8de..dc9e4b2b674 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.kt
@@ -22,16 +22,16 @@ class Generic<T1> {
     open inner class Generic<T2>
 
     inner class Test1 : GI<T1>()
-    inner class Test2 : <!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>GIInt<!>()
+    inner class Test2 : <!DEBUG_INFO_UNRESOLVED_WITH_TARGET{NI}, TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>GIInt<!>()
     inner class Test3 : GIStar()
     inner class Test3a : test.Generic<*>.Inner()
 
     inner class Test4<T2> : GG<T1, T2>()
     inner class Test5 : GG<T1, Int>()
-    inner class Test6 : <!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>GG<!><Int, T1>()
-    inner class Test7 : <!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>GG<!><Int, Int>()
-    inner class Test8 : <!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>GIntG<!><Int>()
-    inner class Test9 : <!NI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>GGInt<!><Int>()
+    inner class Test6 : <!DEBUG_INFO_UNRESOLVED_WITH_TARGET{NI}, TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>GG<!><Int, T1>()
+    inner class Test7 : <!DEBUG_INFO_UNRESOLVED_WITH_TARGET{NI}, TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>GG<!><Int, Int>()
+    inner class Test8 : <!DEBUG_INFO_UNRESOLVED_WITH_TARGET{NI}, TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>GIntG<!><Int>()
+    inner class Test9 : <!DEBUG_INFO_UNRESOLVED_WITH_TARGET{NI}, TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>GGInt<!><Int>()
     inner class Test10 : GGInt<T1>()
 
     inner class Test11 : GG<T1, Int> {
diff --git a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt
index 7132d68b6e5..9aec6936a4f 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt
@@ -20,5 +20,5 @@ val test4 = <!FUNCTION_CALL_EXPECTED!>C<Int><!>.<!UNRESOLVED_REFERENCE!>P2<!>(1,
 // C.P() syntax could work if we add captured type parameters as type variables in a constraint system for corresponding call.
 // However, this should be consistent with inner classes capturing type parameters.
 val test5 = C.P(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
-val test6 = C.<!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>P1<!>("", <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
-val test7 = C.<!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>P2<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, "")
+val test6 = C.<!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>P1<!>("", <!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
+val test7 = C.<!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>P2<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, "")
diff --git a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.kt b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.kt
index 00d8fc5e873..b8651e1dfaf 100644
--- a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.kt
+++ b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.kt
@@ -6,7 +6,7 @@ typealias Array2D<T> = Array<Array<T>>
 fun foo1(a: Array2D<out Number>) = a
 
 fun bar1(a: Array2D<Int>) =
-        foo1(<!TYPE_MISMATCH("Array2D<out Number> /* = Array<Array<out Number>> */", "Array2D<Int> /* = Array<Array<Int>> */")!>a<!>)
+        foo1(<!TYPE_MISMATCH("Array2D<out Number> /* = Array<Array<out Number>> */; Array2D<Int> /* = Array<Array<Int>> */")!>a<!>)
 
 
 typealias TMap<T> = Map<T, T>
@@ -14,4 +14,4 @@ typealias TMap<T> = Map<T, T>
 fun <T> foo2(m: TMap<T>) = m
 
 fun bar2(m: TMap<*>) =
-        <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>foo2<!>(<!NI;TYPE_MISMATCH!>m<!>)
+        <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>foo2<!>(<!TYPE_MISMATCH{NI}!>m<!>)
diff --git a/compiler/testData/diagnostics/tests/typealias/noRHS.kt b/compiler/testData/diagnostics/tests/typealias/noRHS.kt
index 6cb972210ab..646828f1dbe 100644
--- a/compiler/testData/diagnostics/tests/typealias/noRHS.kt
+++ b/compiler/testData/diagnostics/tests/typealias/noRHS.kt
@@ -4,4 +4,4 @@ typealias<!SYNTAX!><!>
 <!SYNTAX!><!>typealias A1<!SYNTAX!><!>
 
 <!SYNTAX!><!>typealias A2 =
-<!SYNTAX!><!>
\ No newline at end of file
+<!SYNTAX!><!>
diff --git a/compiler/testData/diagnostics/tests/typealias/privateInFile.kt b/compiler/testData/diagnostics/tests/typealias/privateInFile.kt
index ab48482a624..3b72ee3c5b0 100644
--- a/compiler/testData/diagnostics/tests/typealias/privateInFile.kt
+++ b/compiler/testData/diagnostics/tests/typealias/privateInFile.kt
@@ -19,4 +19,4 @@ private val test2: <!INVISIBLE_REFERENCE!>TA<!> = <!INVISIBLE_MEMBER!>TA<!>()
 private val test2co = <!INVISIBLE_MEMBER!>TA<!>
 
 private class <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>C<!>
-private typealias <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>TA<!> = Int
\ No newline at end of file
+private typealias <!PACKAGE_OR_CLASSIFIER_REDECLARATION!>TA<!> = Int
diff --git a/compiler/testData/diagnostics/tests/typealias/recursive.kt b/compiler/testData/diagnostics/tests/typealias/recursive.kt
index 485491f1dac..3522e2dbf12 100644
--- a/compiler/testData/diagnostics/tests/typealias/recursive.kt
+++ b/compiler/testData/diagnostics/tests/typealias/recursive.kt
@@ -8,4 +8,4 @@ typealias B = <!RECURSIVE_TYPEALIAS_EXPANSION!>A<!>
 typealias F1 = <!RECURSIVE_TYPEALIAS_EXPANSION!>(Int) -> F2<!>
 typealias F2 = <!RECURSIVE_TYPEALIAS_EXPANSION!>(F1) -> Int<!>
 
-val x: <!RECURSIVE_TYPEALIAS_EXPANSION!>A<!> = TODO()
\ No newline at end of file
+val x: <!RECURSIVE_TYPEALIAS_EXPANSION!>A<!> = TODO()
diff --git a/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.fir.kt b/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.fir.kt
index 373869f845c..ea3d6ab50cc 100644
--- a/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.fir.kt
@@ -1,7 +1,5 @@
 // FILE: foo.kt
 
-// FILE: foo.kt
-
 package test
 
 typealias ClassAlias = ClassSample
@@ -27,4 +25,4 @@ import test.EnumAlias
 fun bar() {
     Entry
     EnumAlias.Entry
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.kt b/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.kt
index d1e6dcbfc52..02ae714f6e2 100644
--- a/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.kt
+++ b/compiler/testData/diagnostics/tests/typealias/starImportOnTypeAlias.kt
@@ -1,7 +1,5 @@
 // FILE: foo.kt
 
-// FILE: foo.kt
-
 package test
 
 typealias ClassAlias = ClassSample
@@ -27,4 +25,4 @@ import test.EnumAlias
 fun bar() {
     Entry
     EnumAlias.Entry
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/typealias/starProjection.fir.kt b/compiler/testData/diagnostics/tests/typealias/starProjection.fir.kt
index c30441b6756..a760eb31598 100644
--- a/compiler/testData/diagnostics/tests/typealias/starProjection.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/starProjection.fir.kt
@@ -12,4 +12,4 @@ fun test3(x: Map<Int, String>) = check(x).size
 
 fun test4(x: Map<Int, String>) = <!INAPPLICABLE_CANDIDATE!>check(x)["42"]<!>
 
-fun test5(x: Map<Int, String>) = <!INAPPLICABLE_CANDIDATE!>check(x)[42]<!>
\ No newline at end of file
+fun test5(x: Map<Int, String>) = <!INAPPLICABLE_CANDIDATE!>check(x)[42]<!>
diff --git a/compiler/testData/diagnostics/tests/typealias/starProjection.kt b/compiler/testData/diagnostics/tests/typealias/starProjection.kt
index 1c88d728d2f..0d651e014e8 100644
--- a/compiler/testData/diagnostics/tests/typealias/starProjection.kt
+++ b/compiler/testData/diagnostics/tests/typealias/starProjection.kt
@@ -10,6 +10,6 @@ fun test2(x: Map<String, Int>) = check(x)
 
 fun test3(x: Map<Int, String>) = check(x).size
 
-fun test4(x: Map<Int, String>) = <!OI;MEMBER_PROJECTED_OUT!>check(x)[<!NI;TYPE_MISMATCH!>"42"<!>]<!>
+fun test4(x: Map<Int, String>) = <!MEMBER_PROJECTED_OUT{OI}!>check(x)[<!TYPE_MISMATCH{NI}!>"42"<!>]<!>
 
-fun test5(x: Map<Int, String>) = <!OI;MEMBER_PROJECTED_OUT!>check(x)[<!NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!>]<!>
\ No newline at end of file
+fun test5(x: Map<Int, String>) = <!MEMBER_PROJECTED_OUT{OI}!>check(x)[<!CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>42<!>]<!>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt
index c2b8b12cbf2..23887da1590 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt
@@ -13,4 +13,4 @@ fun <T> listOf(): List<T> = null!!
 // since it has 'out' type projection in 'in' position.
 val test1 = <!INAPPLICABLE_CANDIDATE!>BOutIn<!>(listOf(), null!!)
 
-val test2 = BInIn(listOf(), null!!)
\ No newline at end of file
+val test2 = BInIn(listOf(), null!!)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.kt
index fd3e6ec9b20..516e50eea4b 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.kt
@@ -11,6 +11,6 @@ fun <T> listOf(): List<T> = null!!
 // Unresolved reference is ok here:
 // we can't create a substituted signature for type alias constructor
 // since it has 'out' type projection in 'in' position.
-val test1 = <!UNRESOLVED_REFERENCE!>BOutIn<!>(<!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>listOf<!>(), null!!)
+val test1 = <!UNRESOLVED_REFERENCE!>BOutIn<!>(<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>listOf<!>(), null!!)
 
-val test2 = <!OI;EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED!>BInIn(listOf(), null!!)<!>
\ No newline at end of file
+val test2 = <!EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED{OI}!>BInIn(listOf(), null!!)<!>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt
index a163bc1498c..4218c8cbba6 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt
@@ -12,4 +12,4 @@ val test1 = CStar()
 val test2 = CIn()
 val test3 = COut()
 val test4 = CT<<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
-val test5 = CT<CT<*>>()
\ No newline at end of file
+val test5 = CT<CT<*>>()
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.kt
index 46bbc07fa6a..9f37e11bee7 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.kt
@@ -8,8 +8,8 @@ typealias CIn = C<in Int>
 typealias COut = C<out Int>
 typealias CT<T> = C<T>
 
-val test1 = <!OI;EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED!>CStar()<!>
-val test2 = <!OI;EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED!>CIn()<!>
-val test3 = <!OI;EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED!>COut()<!>
-val test4 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>CT<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
-val test5 = CT<CT<*>>()
\ No newline at end of file
+val test1 = <!EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED{OI}!>CStar()<!>
+val test2 = <!EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED{OI}!>CIn()<!>
+val test3 = <!EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED{OI}!>COut()<!>
+val test4 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>CT<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>*<!>>()
+val test5 = CT<CT<*>>()
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.kt
index dcef82eff8a..0084edb6950 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.kt
@@ -6,12 +6,12 @@ typealias CIn = C<in Int>
 typealias COut = C<out Int>
 typealias CT<T> = C<T>
 
-class Test1 : <!OI;EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED!>CStar()<!>
-class Test2 : <!OI;EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED!>CIn()<!>
-class Test3 : <!OI;EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED!>COut()<!>
+class Test1 : <!EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED{OI}!>CStar()<!>
+class Test2 : <!EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED{OI}!>CIn()<!>
+class Test3 : <!EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED{OI}!>COut()<!>
 
 class Test4 : CStar {
-    constructor() : <!OI;EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED!>super<!>()
+    constructor() : <!EXPANDED_TYPE_CANNOT_BE_CONSTRUCTED{OI}!>super<!>()
 }
 
 class Test5 : CT<<!PROJECTION_IN_IMMEDIATE_ARGUMENT_TO_SUPERTYPE!>*<!>>()
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInSuperCall.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInSuperCall.kt
index 72b7900f92d..5ea5d5b070d 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInSuperCall.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInSuperCall.kt
@@ -11,4 +11,4 @@ class MyDerived2a : MyBase(null)
 
 class MyDerived3 : MyAlias {
     constructor(x: Nothing?) : super(<!DEBUG_INFO_CONSTANT!>x<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.kt
index 93d7d7740be..955d07623f5 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.kt
@@ -4,4 +4,4 @@ typealias R<T> = Ref<T>
 
 // Type inference SHOULD NOT work for type alias constructor in supertypes list
 class Test1 : <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>R<!>(0)
-class Test2 : R<Int>(0)
\ No newline at end of file
+class Test2 : R<Int>(0)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.kt
index 268e740ef69..3b9fb834740 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.kt
@@ -5,15 +5,15 @@ class Num<Tn : Number>(val x: Tn)
 typealias N<T> = Num<T>
 
 val test0 = N(1)
-val test1 = <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>N<!>(<!NI;TYPE_MISMATCH!>"1"<!>)
+val test1 = <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>N<!>(<!TYPE_MISMATCH{NI}!>"1"<!>)
 
 
 class Cons<T>(val head: T, val tail: Cons<T>?)
 typealias C<T> = Cons<T>
 typealias CC<T> = C<C<T>>
 
-val test2 = <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>C<!>(1, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!>)
-val test3 = <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>CC<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!>)
+val test2 = <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>C<!>(1, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!>)
+val test3 = <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>CC<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>2<!>)
 val test4 = CC(C(1, null), null)
 
 
@@ -21,13 +21,13 @@ class Pair<X, Y>(val x: X, val y: Y)
 typealias PL<T> = Pair<T, List<T>>
 typealias PN<T> = Pair<T, Num<T>>
 
-val test5 = <!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>PL<!>(1, <!NULL_FOR_NONNULL_TYPE!>null<!>)
+val test5 = <!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>PL<!>(1, <!NULL_FOR_NONNULL_TYPE!>null<!>)
 
 
 class Foo<T>(val p: Pair<T, T>)
 typealias F<T> = Foo<T>
 
-fun testProjections1(x: Pair<in Int, out String>) = <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>F<!>(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>x<!>)
-fun testProjections2(x: Pair<in Int, out Number>) = <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>F<!>(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>x<!>)
-fun testProjections3(x: Pair<in Number, out Int>) = <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>F<!>(<!NI;TYPE_MISMATCH!>x<!>)
-fun testProjections4(x: Pair<in Int, in Int>) = <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>F<!>(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>x<!>)
\ No newline at end of file
+fun testProjections1(x: Pair<in Int, out String>) = <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>F<!>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>x<!>)
+fun testProjections2(x: Pair<in Int, out Number>) = <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>F<!>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>x<!>)
+fun testProjections3(x: Pair<in Number, out Int>) = <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>F<!>(<!TYPE_MISMATCH{NI}!>x<!>)
+fun testProjections4(x: Pair<in Int, in Int>) = <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>F<!>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>x<!>)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.kt
index b7a04efa96a..75f5863535f 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls.kt
@@ -5,4 +5,4 @@ class Cons<T : Number>(val head: T, val tail: Cons<T>?)
 typealias C<T> = Cons<T>
 
 val test1 = C(1, C(2, null))
-val test2 = C(1, <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!><!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>C<!>(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>""<!>, null)<!>)
+val test2 = C(1, <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!><!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>C<!>(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>""<!>, null)<!>)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.fir.kt
index 52045873554..f2b5bafefc9 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.fir.kt
@@ -38,4 +38,4 @@ fun test() {
     r2a.x = r2a.x
     r3.x = r3.x
     r3a.x = r3a.x
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.kt
index d18d7e9772b..4525dcbbad5 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.kt
@@ -32,10 +32,10 @@ val r3 = LateInitNumRef(1)
 val r3a = LateNR(1)
 
 fun test() {
-    r1.x = <!OI;TYPE_MISMATCH!>r1.x<!>
-    r1a.x = <!OI;TYPE_MISMATCH!>r1a.x<!>
+    r1.x = <!TYPE_MISMATCH{OI}!>r1.x<!>
+    r1a.x = <!TYPE_MISMATCH{OI}!>r1a.x<!>
     r2.x = r2.x
     r2a.x = r2a.x
     r3.x = r3.x
     r3a.x = r3a.x
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.kt
index 8f234c87673..b7e1a1389a5 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.kt
@@ -9,9 +9,9 @@ class Hr<A, B, C, D>(val a: A, val b: B)
 typealias Test<A, B> = Hr<A, B, Foo<A>, Bar<B>>
 
 val test1 = Test(1, "")
-val test2 = <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>Test<!>(1, 2)
+val test2 = <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>Test<!>(1, 2)
 
 
 typealias Bas<T> = Hr<T, T, Foo<T>, Bar<T>>
 
-val test3 = <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>Bas<!>(1, 1)
+val test3 = <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>Bas<!>(1, 1)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.kt
index e0deed70027..d70ce56fb86 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.kt
@@ -26,4 +26,4 @@ class MyDerived : MyClass(1.0) {
     val test5a = <!PROTECTED_CONSTRUCTOR_NOT_IN_SUPER_CALL!>MyClass<!>("")
     val test6 = MyAlias(1.0)
     val test6a = MyClass(1.0)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.kt
index 057e762c472..2d6d5d0e538 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasesInQualifiers.kt
@@ -72,4 +72,4 @@ fun foo(
 
     test.EnumSample.Nested::func
     test.EnumAlias.<!UNRESOLVED_REFERENCE!>Nested<!>::<!DEBUG_INFO_MISSING_UNRESOLVED!>func<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.kt b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.kt
index be6aff68aab..969cd7036c7 100644
--- a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.kt
+++ b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.kt
@@ -21,15 +21,15 @@ val test2p2 = P2<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int, Int><!>(1, 1)
 val test3p2 = P2<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int, Int, Int><!>(1, 1)
 
 val test0pr = PR(1, "")
-val test1pr = PR<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>(1, <!OI;TYPE_MISMATCH!>""<!>)
+val test1pr = PR<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>(1, <!TYPE_MISMATCH{OI}!>""<!>)
 val test2pr = PR<Int, String>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, <!TYPE_MISMATCH!>""<!>)
 val test2pra = PR<String, Int>(1, "")
-val test3pr = P2<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><String, Int, Int><!>(<!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, "")
+val test3pr = P2<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><String, Int, Int><!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>1<!>, "")
 
 class Num<T : Number>(val x: T)
 typealias N<T> = Num<T>
 
-val testN0 = <!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>N<!>(<!NI;TYPE_MISMATCH!>""<!>)
+val testN0 = <!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>N<!>(<!TYPE_MISMATCH{NI}!>""<!>)
 val testN1 = N<Int>(1)
 val testN1a = N<<!UPPER_BOUND_VIOLATED!>String<!>>("")
 val testN2 = N<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int, Int><!>(1)
@@ -38,5 +38,5 @@ class MyPair<T1 : CharSequence, T2 : Number>(val string: T1, val number: T2)
 typealias MP<T1> = MyPair<String, T1>
 
 val testMP0 = MP<Int>("", 1)
-val testMP1 = <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>MP<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, <!NI;TYPE_MISMATCH!>""<!>)
-val testMP2 = MP<<!UPPER_BOUND_VIOLATED!>String<!>>("", "")
\ No newline at end of file
+val testMP1 = <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>MP<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, <!TYPE_MISMATCH{NI}!>""<!>)
+val testMP2 = MP<<!UPPER_BOUND_VIOLATED!>String<!>>("", "")
diff --git a/compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.kt b/compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.kt
index 4a3c38869ae..6815b33cf66 100644
--- a/compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.kt
+++ b/compiler/testData/diagnostics/tests/unitConversion/chainedFunSuspendUnitConversion.kt
@@ -15,4 +15,4 @@ fun test(f: () -> String, s: SubInt) {
     foo(f)
     foo(s)
     foo(::bar)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.kt b/compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.kt
index ad5611f7a73..b0979e6a33f 100644
--- a/compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.kt
+++ b/compiler/testData/diagnostics/tests/unitConversion/chainedUnitSuspendConversion.kt
@@ -11,4 +11,4 @@ fun test(g: () -> Double, s: SubInt) {
     foo(::bar)
     foo(g)
     foo(s)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/unitConversion/unitConversionForAllKinds.kt b/compiler/testData/diagnostics/tests/unitConversion/unitConversionForAllKinds.kt
index 38681e94c2d..3049912bb4c 100644
--- a/compiler/testData/diagnostics/tests/unitConversion/unitConversionForAllKinds.kt
+++ b/compiler/testData/diagnostics/tests/unitConversion/unitConversionForAllKinds.kt
@@ -13,4 +13,4 @@ fun test(g: () -> String, h: (Float) -> String) {
     foo(g)
 
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float")!>fooGeneric(h)<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/valueClasses/presenceOfInitializerBlockInsideValueClass.kt b/compiler/testData/diagnostics/tests/valueClasses/presenceOfInitializerBlockInsideValueClass.kt
index 06e24914753..72b125b8752 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/presenceOfInitializerBlockInsideValueClass.kt
+++ b/compiler/testData/diagnostics/tests/valueClasses/presenceOfInitializerBlockInsideValueClass.kt
@@ -1,6 +1,6 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// FIR_IDENTICAL
 
 package kotlin.jvm
 
diff --git a/compiler/testData/diagnostics/tests/valueClasses/presenceOfPublicPrimaryConstructorForValueClass.kt b/compiler/testData/diagnostics/tests/valueClasses/presenceOfPublicPrimaryConstructorForValueClass.kt
index f5ffb217cda..2e5603bb3a3 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/presenceOfPublicPrimaryConstructorForValueClass.kt
+++ b/compiler/testData/diagnostics/tests/valueClasses/presenceOfPublicPrimaryConstructorForValueClass.kt
@@ -1,5 +1,5 @@
-// !LANGUAGE: +InlineClasses
 // FIR_IDENTICAL
+// !LANGUAGE: +InlineClasses
 
 package kotlin.jvm
 
diff --git a/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.fir.kt b/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.fir.kt
index af729da9c91..037cf7fa0fd 100644
--- a/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.fir.kt
@@ -63,4 +63,4 @@ fun invokeTest(goodArgs: Array<String>) {
     J.staticFun(*goodArgs)
     J.staticFun(*args)
     J.staticFun(*args ?: null)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.kt b/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.kt
index dc44796bbce..405e452a716 100644
--- a/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.kt
+++ b/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.kt
@@ -32,13 +32,13 @@ fun getArr(): Array<String>? = null
 fun f() {
     A().foo(1, <!SPREAD_OF_NULLABLE!>*<!>args)
     bar(2, <!SPREAD_OF_NULLABLE!>*<!><!TYPE_MISMATCH!>args<!>)
-    baz(<!NON_VARARG_SPREAD, SPREAD_OF_NULLABLE!>*<!><!NI;TYPE_MISMATCH!>args<!>)
+    baz(<!NON_VARARG_SPREAD, SPREAD_OF_NULLABLE!>*<!><!TYPE_MISMATCH{NI}!>args<!>)
 }
 
 fun g(args: Array<String>?) {
 
     if (args != null) {
-        A().foo(1, *<!OI;DEBUG_INFO_SMARTCAST!>args<!>)
+        A().foo(1, *<!DEBUG_INFO_SMARTCAST{OI}!>args<!>)
     }
     A().foo(1, *A.ar)
 }
@@ -49,18 +49,18 @@ class B {
 
 fun h(b: B) {
     if (b.args != null) {
-        A().foo(1, <!SPREAD_OF_NULLABLE!>*<!><!OI;SMARTCAST_IMPOSSIBLE!>b.args<!>)
+        A().foo(1, <!SPREAD_OF_NULLABLE!>*<!><!SMARTCAST_IMPOSSIBLE{OI}!>b.args<!>)
     }
 }
 
 fun k() {
     A().foo(1, <!SPREAD_OF_NULLABLE!>*<!>getArr())
     bar(2, <!SPREAD_OF_NULLABLE!>*<!><!TYPE_MISMATCH!>getArr()<!>)
-    baz(<!NON_VARARG_SPREAD, SPREAD_OF_NULLABLE!>*<!><!NI;TYPE_MISMATCH!>getArr()<!>)
+    baz(<!NON_VARARG_SPREAD, SPREAD_OF_NULLABLE!>*<!><!TYPE_MISMATCH{NI}!>getArr()<!>)
 }
 
 fun invokeTest(goodArgs: Array<String>) {
     J.staticFun(*goodArgs)
     J.staticFun(<!SPREAD_OF_NULLABLE!>*<!>args)
     J.staticFun(<!SPREAD_OF_NULLABLE!>*<!>args <!USELESS_ELVIS_RIGHT_IS_NULL!>?: null<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
index af94f1b47ce..59b89bb4c96 100644
--- a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
@@ -20,7 +20,7 @@ fun test_fun(s: String, arr: Array<String>) {
 }
 
 fun test_ann(s: String, arr: Array<String>) {
-    @Ann(<!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>[""]<!>, x = 1)
+    @Ann(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>[""]<!>, x = 1)
     foo()
     @Ann(*[""], x = 1)
     foo()
@@ -31,6 +31,6 @@ fun test_ann(s: String, arr: Array<String>) {
 
     @Ann("", x = 1)
     foo()
-    @Ann(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR, NI;TYPE_MISMATCH!>""<!>, x = 1)
+    @Ann(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR, TYPE_MISMATCH{NI}!>""<!>, x = 1)
     foo()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt
index d74bf038a54..2d25dc50f1c 100644
--- a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt
@@ -16,11 +16,11 @@ fun test_fun(s: String, arr: Array<String>) {
     withVararg(s = *<!REDUNDANT_SPREAD_OPERATOR_IN_NAMED_FORM_IN_FUNCTION!>arr<!>) // Warning
 
     withVararg(s) // OK
-    withVararg(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, NI;TYPE_MISMATCH!>s<!>) // Error
+    withVararg(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, TYPE_MISMATCH{NI}!>s<!>) // Error
 }
 
 fun test_ann(s: String, arr: Array<String>) {
-    @Ann(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, OI;TYPE_MISMATCH!>[""]<!>, x = 1)
+    @Ann(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>[""]<!>, x = 1)
     foo()
     @Ann(*[""], x = 1)
     foo()
@@ -31,6 +31,6 @@ fun test_ann(s: String, arr: Array<String>) {
 
     @Ann("", x = 1)
     foo()
-    @Ann(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR, NI;TYPE_MISMATCH!>""<!>, x = 1)
+    @Ann(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION_ERROR, TYPE_MISMATCH{NI}!>""<!>, x = 1)
     foo()
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt b/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt
index e830c54b743..c74b302baae 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt
@@ -18,7 +18,7 @@ fun test1() {}
 @Ann(s = <!TYPE_MISMATCH!>intArrayOf()<!>)
 fun test2() {}
 
-@Ann(s = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf(1)<!>)
+@Ann(s = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>arrayOf(1)<!>)
 fun test3() {}
 
 @Ann("value1", "value2")
@@ -43,4 +43,4 @@ annotation class IntAnn(vararg val i: Int)
 fun foo1() {}
 
 @IntAnn(i = intArrayOf(0))
-fun foo2() {}
\ No newline at end of file
+fun foo2() {}
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_after.kt b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_after.kt
index 6f3a0c756fd..1a65bf35926 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_after.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_after.kt
@@ -27,4 +27,4 @@ fun test4() {}
 fun test5() {}
 
 @JavaAnn("value", path = ["path"])
-fun test6() {}
\ No newline at end of file
+fun test6() {}
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_before.kt b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_before.kt
index 56e78abbebc..b4738e722b2 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_before.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormAnnDeprecation_before.kt
@@ -27,4 +27,4 @@ fun test4() {}
 fun test5() {}
 
 @JavaAnn("value", path = ["path"])
-fun test6() {}
\ No newline at end of file
+fun test6() {}
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.kt b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.kt
index f6edfe187fe..6fe42670ea9 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.kt
@@ -53,8 +53,8 @@ fun testMany(a: Any) {
     manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>""<!>)
 
     <!NONE_APPLICABLE!>manyFoo<!>(a)
-    <!NI;NONE_APPLICABLE!>manyFoo<!>(<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>v<!> = <!OI;ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, OI;TYPE_MISMATCH!>a<!>)
-    <!NI;NONE_APPLICABLE!>manyFoo<!>(<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>s<!> = <!OI;ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR, OI;TYPE_MISMATCH!>a<!>)
+    <!NONE_APPLICABLE{NI}!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>v<!> = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR{OI}, TYPE_MISMATCH{OI}!>a<!>)
+    <!NONE_APPLICABLE{NI}!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>s<!> = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR{OI}, TYPE_MISMATCH{OI}!>a<!>)
     manyFoo(v = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>a as Int<!>)
     manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION_ERROR!>a as String<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.kt b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.kt
index 279279f695e..19e64a41598 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.kt
@@ -53,8 +53,8 @@ fun testMany(a: Any) {
     manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>""<!>)
 
     <!NONE_APPLICABLE!>manyFoo<!>(a)
-    <!NI;NONE_APPLICABLE!>manyFoo<!>(<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>v<!> = <!OI;ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION, OI;TYPE_MISMATCH!>a<!>)
-    <!NI;NONE_APPLICABLE!>manyFoo<!>(<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>s<!> = <!OI;ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION, OI;TYPE_MISMATCH!>a<!>)
+    <!NONE_APPLICABLE{NI}!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>v<!> = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION{OI}, TYPE_MISMATCH{OI}!>a<!>)
+    <!NONE_APPLICABLE{NI}!>manyFoo<!>(<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>s<!> = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION{OI}, TYPE_MISMATCH{OI}!>a<!>)
     manyFoo(v = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>a as Int<!>)
     manyFoo(s = <!ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION!>a as String<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt b/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt
index 203747e07d8..65fec28db67 100644
--- a/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt
+++ b/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt
@@ -12,30 +12,30 @@
 
 annotation class Ann(vararg val s: String)
 
-@Ann(s = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf()<!>)
+@Ann(s = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>arrayOf()<!>)
 fun test1() {}
 
 @Ann(s = <!TYPE_MISMATCH!>intArrayOf()<!>)
 fun test2() {}
 
-@Ann(s = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf(1)<!>)
+@Ann(s = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>arrayOf(1)<!>)
 fun test3() {}
 
-@Ann(s = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!>)
+@Ann(s = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>["value"]<!>)
 fun test5() {}
 
-@JavaAnn(value = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf("value")<!>)
+@JavaAnn(value = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>arrayOf("value")<!>)
 fun jTest1() {}
 
-@JavaAnn(value = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!>)
+@JavaAnn(value = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>["value"]<!>)
 fun jTest2() {}
 
-@JavaAnn(value = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>["value"]<!>, path = ["path"])
+@JavaAnn(value = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>["value"]<!>, path = ["path"])
 fun jTest3() {}
 
 annotation class IntAnn(vararg val i: Int)
 
-@IntAnn(i = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, TYPE_MISMATCH!>[1, 2]<!>)
+@IntAnn(i = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH!>[1, 2]<!>)
 fun foo1() {}
 
 @IntAnn(i = <!TYPE_MISMATCH!>intArrayOf(0)<!>)
@@ -46,4 +46,4 @@ fun foo(vararg <!UNUSED_PARAMETER!>i<!>: Int) {}
 @Ann(s = "value")
 fun dep1() {
     foo(i = 1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/varargViewedAsArray.kt b/compiler/testData/diagnostics/tests/varargs/varargViewedAsArray.kt
index b9d02d090bf..5a1fc141b2b 100644
--- a/compiler/testData/diagnostics/tests/varargs/varargViewedAsArray.kt
+++ b/compiler/testData/diagnostics/tests/varargs/varargViewedAsArray.kt
@@ -21,9 +21,9 @@ fun test() {
     useStringArray(::stringVararg)
     useIntArray(::numberVararg)
     usePrimitiveIntArray(::intVararg)
-    useIntArray(<!TYPE_MISMATCH("(Array<Int>) -> Unit", "KFunction1<IntArray, Unit>")!>::intVararg<!>)
-    useMixedStringArgs1(<!TYPE_MISMATCH("(String, Array<String>) -> Unit", "KFunction1<Array<out String>, Unit>")!>::stringVararg<!>)
-    useMixedStringArgs2(<!TYPE_MISMATCH("(Array<String>, String) -> Unit", "KFunction1<Array<out String>, Unit>")!>::stringVararg<!>)
-    useMixedStringArgs3(<!TYPE_MISMATCH("(String, Array<String>, String) -> Unit", "KFunction1<Array<out String>, Unit>")!>::stringVararg<!>)
-    useTwoStringArrays(<!TYPE_MISMATCH("(Array<String>, Array<String>) -> Unit", "KFunction1<Array<out String>, Unit>")!>::stringVararg<!>)
+    useIntArray(<!TYPE_MISMATCH("(Array<Int>) -> Unit; KFunction1<IntArray, Unit>")!>::intVararg<!>)
+    useMixedStringArgs1(<!TYPE_MISMATCH("(String, Array<String>) -> Unit; KFunction1<Array<out String>, Unit>")!>::stringVararg<!>)
+    useMixedStringArgs2(<!TYPE_MISMATCH("(Array<String>, String) -> Unit; KFunction1<Array<out String>, Unit>")!>::stringVararg<!>)
+    useMixedStringArgs3(<!TYPE_MISMATCH("(String, Array<String>, String) -> Unit; KFunction1<Array<out String>, Unit>")!>::stringVararg<!>)
+    useTwoStringArrays(<!TYPE_MISMATCH("(Array<String>, Array<String>) -> Unit; KFunction1<Array<out String>, Unit>")!>::stringVararg<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/variance/Class.fir.kt b/compiler/testData/diagnostics/tests/variance/Class.fir.kt
index 3993b556f6f..09ebdfe5ea5 100644
--- a/compiler/testData/diagnostics/tests/variance/Class.fir.kt
+++ b/compiler/testData/diagnostics/tests/variance/Class.fir.kt
@@ -20,4 +20,4 @@ class SubClass3<in I, out O, P> : Out<P>
 class SubClass4<in I, out O, P> : In<I>
 class SubClass5<in I, out O, P> : In<O>
 class SubClass6<in I, out O, P> : Inv<O>
-class SubClass7<in I, out O, P> : Inv<I>
\ No newline at end of file
+class SubClass7<in I, out O, P> : Inv<I>
diff --git a/compiler/testData/diagnostics/tests/variance/Class.kt b/compiler/testData/diagnostics/tests/variance/Class.kt
index bbc7c8044c7..a4148f9ac16 100644
--- a/compiler/testData/diagnostics/tests/variance/Class.kt
+++ b/compiler/testData/diagnostics/tests/variance/Class.kt
@@ -2,22 +2,22 @@ interface In<in T>
 interface Out<out T>
 interface Inv<T>
 
-interface TypeBounds1<in I, out O, P, X : <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "I")!>I<!>>
+interface TypeBounds1<in I, out O, P, X : <!TYPE_VARIANCE_CONFLICT("I; in; out; I")!>I<!>>
 interface TypeBounds2<in I, out O, P, X : O>
 interface TypeBounds3<in I, out O, P, X : P>
 interface TypeBounds4<in I, out O, P, X : In<I>>
-interface TypeBounds5<in I, out O, P, X : In<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<O>")!>O<!>>>
+interface TypeBounds5<in I, out O, P, X : In<<!TYPE_VARIANCE_CONFLICT("O; out; in; In<O>")!>O<!>>>
 
-interface WhereTypeBounds1<in I, out O, P, X> where X : <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "I")!>I<!>
+interface WhereTypeBounds1<in I, out O, P, X> where X : <!TYPE_VARIANCE_CONFLICT("I; in; out; I")!>I<!>
 interface WhereTypeBounds2<in I, out O, P, X> where X : O
 interface WhereTypeBounds3<in I, out O, P, X> where X : P
 interface WhereTypeBounds4<in I, out O, P, X> where X : In<I>
-interface WhereTypeBounds5<in I, out O, P, X> where X : In<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<O>")!>O<!>>
+interface WhereTypeBounds5<in I, out O, P, X> where X : In<<!TYPE_VARIANCE_CONFLICT("O; out; in; In<O>")!>O<!>>
 
-class SubClass1<in I, out O, P> : Out<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "Out<I>")!>I<!>>
+class SubClass1<in I, out O, P> : Out<<!TYPE_VARIANCE_CONFLICT("I; in; out; Out<I>")!>I<!>>
 class SubClass2<in I, out O, P> : Out<O>
 class SubClass3<in I, out O, P> : Out<P>
 class SubClass4<in I, out O, P> : In<I>
-class SubClass5<in I, out O, P> : In<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<O>")!>O<!>>
-class SubClass6<in I, out O, P> : Inv<<!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "Inv<O>")!>O<!>>
-class SubClass7<in I, out O, P> : Inv<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Inv<I>")!>I<!>>
\ No newline at end of file
+class SubClass5<in I, out O, P> : In<<!TYPE_VARIANCE_CONFLICT("O; out; in; In<O>")!>O<!>>
+class SubClass6<in I, out O, P> : Inv<<!TYPE_VARIANCE_CONFLICT("O; out; invariant; Inv<O>")!>O<!>>
+class SubClass7<in I, out O, P> : Inv<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; Inv<I>")!>I<!>>
diff --git a/compiler/testData/diagnostics/tests/variance/Function.fir.kt b/compiler/testData/diagnostics/tests/variance/Function.fir.kt
index f405959daeb..a85f51153d0 100644
--- a/compiler/testData/diagnostics/tests/variance/Function.fir.kt
+++ b/compiler/testData/diagnostics/tests/variance/Function.fir.kt
@@ -31,4 +31,4 @@ interface Test<in I, out O, P> {
     fun <X : P> typeParameter3()
     fun <X : In<I>> typeParameter4()
     fun <X : In<O>> typeParameter5()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/variance/Function.kt b/compiler/testData/diagnostics/tests/variance/Function.kt
index 9f58506d52e..1f2ed9ca1e6 100644
--- a/compiler/testData/diagnostics/tests/variance/Function.kt
+++ b/compiler/testData/diagnostics/tests/variance/Function.kt
@@ -4,31 +4,31 @@ interface Inv<T>
 fun <T> getT(): T = null!!
 
 interface Test<in I, out O, P> {
-    fun parameters1(i: I, o: <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "O")!>O<!>, p: P)
-    fun parameters2(i: In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "In<I>")!>I<!>>)
+    fun parameters1(i: I, o: <!TYPE_VARIANCE_CONFLICT("O; out; in; O")!>O<!>, p: P)
+    fun parameters2(i: In<<!TYPE_VARIANCE_CONFLICT("I; in; out; In<I>")!>I<!>>)
     fun parameters3(i: In<O>)
 
-    fun explicitReturnType1() : <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "I")!>I<!>
+    fun explicitReturnType1() : <!TYPE_VARIANCE_CONFLICT("I; in; out; I")!>I<!>
     fun explicitReturnType2() : O
     fun explicitReturnType3() : P
     fun explicitReturnType4() : In<I>
-    fun explicitReturnType5() : In<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<O>")!>O<!>>
+    fun explicitReturnType5() : In<<!TYPE_VARIANCE_CONFLICT("O; out; in; In<O>")!>O<!>>
 
-    <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "I")!>fun imlicitReturnType1()<!> = getT<I>()
+    <!TYPE_VARIANCE_CONFLICT("I; in; out; I")!>fun imlicitReturnType1()<!> = getT<I>()
     fun imlicitReturnType2() = getT<O>()
     fun imlicitReturnType3() = getT<P>()
     fun imlicitReturnType4() = getT<In<I>>()
-    <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<O>")!>fun imlicitReturnType5()<!> = getT<In<O>>()
+    <!TYPE_VARIANCE_CONFLICT("O; out; in; In<O>")!>fun imlicitReturnType5()<!> = getT<In<O>>()
 
     fun I.receiver1()
-    fun <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "O")!>O<!>.receiver2()
+    fun <!TYPE_VARIANCE_CONFLICT("O; out; in; O")!>O<!>.receiver2()
     fun P.receiver3()
-    fun In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "In<I>")!>I<!>>.receiver4()
+    fun In<<!TYPE_VARIANCE_CONFLICT("I; in; out; In<I>")!>I<!>>.receiver4()
     fun In<O>.receiver5()
 
     fun <X : I> typeParameter1()
-    fun <X : <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "O")!>O<!>> typeParameter2()
+    fun <X : <!TYPE_VARIANCE_CONFLICT("O; out; in; O")!>O<!>> typeParameter2()
     fun <X : P> typeParameter3()
-    fun <X : In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "In<I>")!>I<!>>> typeParameter4()
+    fun <X : In<<!TYPE_VARIANCE_CONFLICT("I; in; out; In<I>")!>I<!>>> typeParameter4()
     fun <X : In<O>> typeParameter5()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/variance/InPosition.fir.kt b/compiler/testData/diagnostics/tests/variance/InPosition.fir.kt
index 78d0051f8d3..8a8b8171ec3 100644
--- a/compiler/testData/diagnostics/tests/variance/InPosition.fir.kt
+++ b/compiler/testData/diagnostics/tests/variance/InPosition.fir.kt
@@ -47,4 +47,4 @@ interface Test<in I, out O, P> {
     fun neOk33(i: Inv<<!SYNTAX!><!>>)
     fun neOk34(i: <!UNRESOLVED_REFERENCE!>Inv<C><!>)
     fun neOk35(i: <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<P, P><!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/variance/InPosition.kt b/compiler/testData/diagnostics/tests/variance/InPosition.kt
index b5b8e51a7bc..d10054e83b8 100644
--- a/compiler/testData/diagnostics/tests/variance/InPosition.kt
+++ b/compiler/testData/diagnostics/tests/variance/InPosition.kt
@@ -27,24 +27,24 @@ interface Test<in I, out O, P> {
     fun Ok22(i: Inv<out I>)
     fun Ok23(i: Inv<out P>)
 
-    fun neOk1(i: <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "O")!>O<!>)
-    fun neOk2(i: In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "In<I>")!>I<!>>)
-    fun neOk3(i: In<In<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<In<O>>")!>O<!>>>)
-    fun neOk4(i: Inv<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Inv<I>")!>I<!>>)
-    fun neOk5(i: Inv<<!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "Inv<O>")!>O<!>>)
-    fun neOk6(i: In<In<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<In<O>>")!>O<!>>>)
-    fun neOk7(i: Pair<In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "Pair<In<I>, O>")!>I<!>>, <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "Pair<In<I>, O>")!>O<!>>)
-    fun neOk8(i: Inv<out <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "Inv<out O>")!>O<!>>)
+    fun neOk1(i: <!TYPE_VARIANCE_CONFLICT("O; out; in; O")!>O<!>)
+    fun neOk2(i: In<<!TYPE_VARIANCE_CONFLICT("I; in; out; In<I>")!>I<!>>)
+    fun neOk3(i: In<In<<!TYPE_VARIANCE_CONFLICT("O; out; in; In<In<O>>")!>O<!>>>)
+    fun neOk4(i: Inv<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; Inv<I>")!>I<!>>)
+    fun neOk5(i: Inv<<!TYPE_VARIANCE_CONFLICT("O; out; invariant; Inv<O>")!>O<!>>)
+    fun neOk6(i: In<In<<!TYPE_VARIANCE_CONFLICT("O; out; in; In<In<O>>")!>O<!>>>)
+    fun neOk7(i: Pair<In<<!TYPE_VARIANCE_CONFLICT("I; in; out; Pair<In<I>, O>")!>I<!>>, <!TYPE_VARIANCE_CONFLICT("O; out; in; Pair<In<I>, O>")!>O<!>>)
+    fun neOk8(i: Inv<out <!TYPE_VARIANCE_CONFLICT("O; out; in; Inv<out O>")!>O<!>>)
     fun neOk9(i: In<<!CONFLICTING_PROJECTION!>out<!> P>)
-    fun neOk10(i: Out<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "Out<O>")!>O<!>>)
+    fun neOk10(i: Out<<!TYPE_VARIANCE_CONFLICT("O; out; in; Out<O>")!>O<!>>)
 
-    fun neOk11(i: Inv<in <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "Inv<in I>")!>I<!>>)
-    fun neOk12(i: Inv<out <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "Inv<out O>")!>O<!>>)
+    fun neOk11(i: Inv<in <!TYPE_VARIANCE_CONFLICT("I; in; out; Inv<in I>")!>I<!>>)
+    fun neOk12(i: Inv<out <!TYPE_VARIANCE_CONFLICT("O; out; in; Inv<out O>")!>O<!>>)
 
     fun neOk30(i: Pair<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><O<!UNSUPPORTED_FEATURE!>,<!> ><!>)
-    fun neOk31(i: Pair<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "Pair<O, [ERROR : Inv]>")!>O<!>, <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<!>>)
+    fun neOk31(i: Pair<<!TYPE_VARIANCE_CONFLICT("O; out; in; Pair<O, [ERROR : Inv]>")!>O<!>, <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<!>>)
     fun neOk32(i: <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<!>)
     fun neOk33(i: Inv<<!SYNTAX!><!>>)
     fun neOk34(i: Inv<<!UNRESOLVED_REFERENCE!>C<!>>)
     fun neOk35(i: Inv<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><P, P><!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/variance/InvariantPosition.fir.kt b/compiler/testData/diagnostics/tests/variance/InvariantPosition.fir.kt
index 31f2c5717d5..4b0754eeb12 100644
--- a/compiler/testData/diagnostics/tests/variance/InvariantPosition.fir.kt
+++ b/compiler/testData/diagnostics/tests/variance/InvariantPosition.fir.kt
@@ -44,4 +44,4 @@ interface Test<in I, out O, P> {
     var neOk33: Inv<<!SYNTAX!><!>>
     var neOk34: <!UNRESOLVED_REFERENCE!>Inv<C><!>
     var neOk35: <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<P, P><!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/variance/InvariantPosition.kt b/compiler/testData/diagnostics/tests/variance/InvariantPosition.kt
index 008381f6084..e6ce71c676c 100644
--- a/compiler/testData/diagnostics/tests/variance/InvariantPosition.kt
+++ b/compiler/testData/diagnostics/tests/variance/InvariantPosition.kt
@@ -14,34 +14,34 @@ interface Test<in I, out O, P> {
     var ok6: Inv<in P>
     var ok7: Inv<out P>
 
-    var neOk1: <!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "O")!>O<!>
-    var neOk2: In<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "In<I>")!>I<!>>
-    var neOk3: In<In<<!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "In<In<O>>")!>O<!>>>
-    var neOk4: Inv<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Inv<I>")!>I<!>>
-    var neOk5: Inv<<!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "Inv<O>")!>O<!>>
-    var neOk6: In<In<<!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "In<In<O>>")!>O<!>>>
-    var neOk7: Pair<In<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Pair<In<I>, O>")!>I<!>>, <!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "Pair<In<I>, O>")!>O<!>>
-    var neOk8: Inv<in <!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "Inv<in O>")!>O<!>>
-    var neOk9: Inv<in <!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Inv<in I>")!>I<!>>
+    var neOk1: <!TYPE_VARIANCE_CONFLICT("O; out; invariant; O")!>O<!>
+    var neOk2: In<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; In<I>")!>I<!>>
+    var neOk3: In<In<<!TYPE_VARIANCE_CONFLICT("O; out; invariant; In<In<O>>")!>O<!>>>
+    var neOk4: Inv<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; Inv<I>")!>I<!>>
+    var neOk5: Inv<<!TYPE_VARIANCE_CONFLICT("O; out; invariant; Inv<O>")!>O<!>>
+    var neOk6: In<In<<!TYPE_VARIANCE_CONFLICT("O; out; invariant; In<In<O>>")!>O<!>>>
+    var neOk7: Pair<In<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; Pair<In<I>, O>")!>I<!>>, <!TYPE_VARIANCE_CONFLICT("O; out; invariant; Pair<In<I>, O>")!>O<!>>
+    var neOk8: Inv<in <!TYPE_VARIANCE_CONFLICT("O; out; invariant; Inv<in O>")!>O<!>>
+    var neOk9: Inv<in <!TYPE_VARIANCE_CONFLICT("I; in; invariant; Inv<in I>")!>I<!>>
     var neOk10: In<<!CONFLICTING_PROJECTION!>out<!> I>
 
-    var neOk11: <!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "I")!>I<!>
-    var neOk12: In<<!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "In<O>")!>O<!>>
-    var neOk13: In<In<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "In<In<I>>")!>I<!>>>
-    var neOk14: Out<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Out<I>")!>I<!>>
-    var neOk15: Out<Out<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Out<Out<I>>")!>I<!>>>
-    var neOk16: Out<In<<!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "Out<In<O>>")!>O<!>>>
-    var neOk17: Pair<In<<!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "Pair<In<O>, I>")!>O<!>>, <!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Pair<In<O>, I>")!>I<!>>
+    var neOk11: <!TYPE_VARIANCE_CONFLICT("I; in; invariant; I")!>I<!>
+    var neOk12: In<<!TYPE_VARIANCE_CONFLICT("O; out; invariant; In<O>")!>O<!>>
+    var neOk13: In<In<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; In<In<I>>")!>I<!>>>
+    var neOk14: Out<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; Out<I>")!>I<!>>
+    var neOk15: Out<Out<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; Out<Out<I>>")!>I<!>>>
+    var neOk16: Out<In<<!TYPE_VARIANCE_CONFLICT("O; out; invariant; Out<In<O>>")!>O<!>>>
+    var neOk17: Pair<In<<!TYPE_VARIANCE_CONFLICT("O; out; invariant; Pair<In<O>, I>")!>O<!>>, <!TYPE_VARIANCE_CONFLICT("I; in; invariant; Pair<In<O>, I>")!>I<!>>
 
-    var neOk20: Inv<in <!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "Inv<in O>")!>O<!>>
-    var neOk21: Inv<in <!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Inv<in I>")!>I<!>>
-    var neOk22: Inv<out <!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "Inv<out O>")!>O<!>>
-    var neOk23: Inv<out <!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Inv<out I>")!>I<!>>
+    var neOk20: Inv<in <!TYPE_VARIANCE_CONFLICT("O; out; invariant; Inv<in O>")!>O<!>>
+    var neOk21: Inv<in <!TYPE_VARIANCE_CONFLICT("I; in; invariant; Inv<in I>")!>I<!>>
+    var neOk22: Inv<out <!TYPE_VARIANCE_CONFLICT("O; out; invariant; Inv<out O>")!>O<!>>
+    var neOk23: Inv<out <!TYPE_VARIANCE_CONFLICT("I; in; invariant; Inv<out I>")!>I<!>>
 
     var neOk30: Pair<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><I<!UNSUPPORTED_FEATURE!>,<!> ><!>
-    var neOk31: Pair<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Pair<I, [ERROR : Inv]>")!>I<!>, <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<!>>
+    var neOk31: Pair<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; Pair<I, [ERROR : Inv]>")!>I<!>, <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<!>>
     var neOk32: <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<!>
     var neOk33: Inv<<!SYNTAX!><!>>
     var neOk34: Inv<<!UNRESOLVED_REFERENCE!>C<!>>
     var neOk35: Inv<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><P, P><!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/variance/NullableTypes.fir.kt b/compiler/testData/diagnostics/tests/variance/NullableTypes.fir.kt
index 66626173ee0..9f3b7b7913d 100644
--- a/compiler/testData/diagnostics/tests/variance/NullableTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/variance/NullableTypes.fir.kt
@@ -13,4 +13,4 @@ interface Test<in I : Any, out O : Any, P : Any> {
     fun neOk(i: Out<O?>?) : In<O?>?
     fun neOk3(i: Inv<in I?>)
     fun neOk4() = getT<Inv<in O?>?>()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/variance/NullableTypes.kt b/compiler/testData/diagnostics/tests/variance/NullableTypes.kt
index d5fc03917cf..089729b268f 100644
--- a/compiler/testData/diagnostics/tests/variance/NullableTypes.kt
+++ b/compiler/testData/diagnostics/tests/variance/NullableTypes.kt
@@ -9,8 +9,8 @@ interface Test<in I : Any, out O : Any, P : Any> {
     fun ok2(i: In<O?>?) : Out<O?>?
     fun ok3(i: Inv<in O?>) = getT<Inv<in I?>>()
 
-    fun neOk1(i: <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "O?")!>O?<!>) : <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "I?")!>I?<!>
-    fun neOk(i: Out<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "Out<O?>?")!>O?<!>>?) : In<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<O?>?")!>O?<!>>?
-    fun neOk3(i: Inv<in <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "Inv<in I?>")!>I?<!>>)
-    <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "Inv<in O?>?")!>fun neOk4()<!> = getT<Inv<in O?>?>()
-}
\ No newline at end of file
+    fun neOk1(i: <!TYPE_VARIANCE_CONFLICT("O; out; in; O?")!>O?<!>) : <!TYPE_VARIANCE_CONFLICT("I; in; out; I?")!>I?<!>
+    fun neOk(i: Out<<!TYPE_VARIANCE_CONFLICT("O; out; in; Out<O?>?")!>O?<!>>?) : In<<!TYPE_VARIANCE_CONFLICT("O; out; in; In<O?>?")!>O?<!>>?
+    fun neOk3(i: Inv<in <!TYPE_VARIANCE_CONFLICT("I; in; out; Inv<in I?>")!>I?<!>>)
+    <!TYPE_VARIANCE_CONFLICT("O; out; in; Inv<in O?>?")!>fun neOk4()<!> = getT<Inv<in O?>?>()
+}
diff --git a/compiler/testData/diagnostics/tests/variance/OutPosition.fir.kt b/compiler/testData/diagnostics/tests/variance/OutPosition.fir.kt
index 3e048d33525..7fa171d1429 100644
--- a/compiler/testData/diagnostics/tests/variance/OutPosition.fir.kt
+++ b/compiler/testData/diagnostics/tests/variance/OutPosition.fir.kt
@@ -39,4 +39,4 @@ interface Test<in I, out O, P> {
     fun neOk33(): Inv<<!SYNTAX!><!>>
     fun neOk34(): <!UNRESOLVED_REFERENCE!>Inv<C><!>
     fun neOk35(): <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<P, P><!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/variance/OutPosition.kt b/compiler/testData/diagnostics/tests/variance/OutPosition.kt
index 274e5a7e2e8..f1d567f2766 100644
--- a/compiler/testData/diagnostics/tests/variance/OutPosition.kt
+++ b/compiler/testData/diagnostics/tests/variance/OutPosition.kt
@@ -21,22 +21,22 @@ interface Test<in I, out O, P> {
     fun ok12(): Inv<in P>
     fun ok13(): Inv<out P>
 
-    fun neOk1(): <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "I")!>I<!>
-    fun neOk2(): In<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<O>")!>O<!>>
-    fun neOk3(): In<In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "In<In<I>>")!>I<!>>>
-    fun neOk4(): Inv<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "Inv<I>")!>I<!>>
-    fun neOk5(): Inv<<!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "Inv<O>")!>O<!>>
-    fun neOk6(): Pair<In<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "Pair<In<O>, I>")!>O<!>>, <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "Pair<In<O>, I>")!>I<!>>
-    fun neOk7(): Inv<in <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "Inv<in O>")!>O<!>>
+    fun neOk1(): <!TYPE_VARIANCE_CONFLICT("I; in; out; I")!>I<!>
+    fun neOk2(): In<<!TYPE_VARIANCE_CONFLICT("O; out; in; In<O>")!>O<!>>
+    fun neOk3(): In<In<<!TYPE_VARIANCE_CONFLICT("I; in; out; In<In<I>>")!>I<!>>>
+    fun neOk4(): Inv<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; Inv<I>")!>I<!>>
+    fun neOk5(): Inv<<!TYPE_VARIANCE_CONFLICT("O; out; invariant; Inv<O>")!>O<!>>
+    fun neOk6(): Pair<In<<!TYPE_VARIANCE_CONFLICT("O; out; in; Pair<In<O>, I>")!>O<!>>, <!TYPE_VARIANCE_CONFLICT("I; in; out; Pair<In<O>, I>")!>I<!>>
+    fun neOk7(): Inv<in <!TYPE_VARIANCE_CONFLICT("O; out; in; Inv<in O>")!>O<!>>
     fun neOk8(): Out<<!CONFLICTING_PROJECTION("Out")!>in<!> I>
     
-    fun neOk10(): Inv<in <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "Inv<in O>")!>O<!>>
-    fun neOk11(): Inv<out <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "Inv<out I>")!>I<!>>
+    fun neOk10(): Inv<in <!TYPE_VARIANCE_CONFLICT("O; out; in; Inv<in O>")!>O<!>>
+    fun neOk11(): Inv<out <!TYPE_VARIANCE_CONFLICT("I; in; out; Inv<out I>")!>I<!>>
 
     fun neOk30(): Pair<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><I<!UNSUPPORTED_FEATURE!>,<!> ><!>
-    fun neOk31(): Pair<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "Pair<I, [ERROR : Inv]>")!>I<!>, <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<!>>
+    fun neOk31(): Pair<<!TYPE_VARIANCE_CONFLICT("I; in; out; Pair<I, [ERROR : Inv]>")!>I<!>, <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<!>>
     fun neOk32(): <!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>Inv<!>
     fun neOk33(): Inv<<!SYNTAX!><!>>
     fun neOk34(): Inv<<!UNRESOLVED_REFERENCE!>C<!>>
     fun neOk35(): Inv<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><P, P><!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/variance/PrimaryConstructor.fir.kt b/compiler/testData/diagnostics/tests/variance/PrimaryConstructor.fir.kt
index c97cf42397c..d0fa36fb22d 100644
--- a/compiler/testData/diagnostics/tests/variance/PrimaryConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/variance/PrimaryConstructor.fir.kt
@@ -22,4 +22,4 @@ class Test<in I, out O, P>(
         type13: P,
         type14: In<I>,
         type15: In<O>
-)
\ No newline at end of file
+)
diff --git a/compiler/testData/diagnostics/tests/variance/PrimaryConstructor.kt b/compiler/testData/diagnostics/tests/variance/PrimaryConstructor.kt
index 2d36e579433..7338a1f618e 100644
--- a/compiler/testData/diagnostics/tests/variance/PrimaryConstructor.kt
+++ b/compiler/testData/diagnostics/tests/variance/PrimaryConstructor.kt
@@ -5,21 +5,21 @@ interface Inv<T>
 fun <T> getT(): T = null!!
 
 class Test<in I, out O, P>(
-        val type1: <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "I")!>I<!>,
+        val type1: <!TYPE_VARIANCE_CONFLICT("I; in; out; I")!>I<!>,
         val type2: O,
         val type3: P,
         val type4: In<I>,
-        val type5: In<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<O>")!>O<!>>,
+        val type5: In<<!TYPE_VARIANCE_CONFLICT("O; out; in; In<O>")!>O<!>>,
 
-        var type6: <!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "I")!>I<!>,
-        var type7: <!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "O")!>O<!>,
+        var type6: <!TYPE_VARIANCE_CONFLICT("I; in; invariant; I")!>I<!>,
+        var type7: <!TYPE_VARIANCE_CONFLICT("O; out; invariant; O")!>O<!>,
         var type8: P,
-        var type9: In<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "In<I>")!>I<!>>,
-        var type0: In<<!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "In<O>")!>O<!>>,
+        var type9: In<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; In<I>")!>I<!>>,
+        var type0: In<<!TYPE_VARIANCE_CONFLICT("O; out; invariant; In<O>")!>O<!>>,
 
         <!UNUSED_PARAMETER!>type11<!>: I,
         <!UNUSED_PARAMETER!>type12<!>: O,
         <!UNUSED_PARAMETER!>type13<!>: P,
         <!UNUSED_PARAMETER!>type14<!>: In<I>,
         <!UNUSED_PARAMETER!>type15<!>: In<O>
-)
\ No newline at end of file
+)
diff --git a/compiler/testData/diagnostics/tests/variance/ValProperty.kt b/compiler/testData/diagnostics/tests/variance/ValProperty.kt
index 69e7e33fc16..94ab374cd21 100644
--- a/compiler/testData/diagnostics/tests/variance/ValProperty.kt
+++ b/compiler/testData/diagnostics/tests/variance/ValProperty.kt
@@ -12,39 +12,39 @@ class Delegate<T> {
 fun <T> getT(): T = null!!
 
 abstract class Test<in I, out O, P> {
-    abstract val type1: <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "I")!>I<!>
+    abstract val type1: <!TYPE_VARIANCE_CONFLICT("I; in; out; I")!>I<!>
     abstract val type2: O
     abstract val type3: P
     abstract val type4: In<I>
-    abstract val type5: In<<!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<O>")!>O<!>>
+    abstract val type5: In<<!TYPE_VARIANCE_CONFLICT("O; out; in; In<O>")!>O<!>>
 
-    <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "I")!>val implicitType1<!> = getT<I>()
+    <!TYPE_VARIANCE_CONFLICT("I; in; out; I")!>val implicitType1<!> = getT<I>()
     val implicitType2 = getT<O>()
     val implicitType3 = getT<P>()
     val implicitType4 = getT<In<I>>()
-    <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<O>")!>val implicitType5<!> = getT<In<O>>()
+    <!TYPE_VARIANCE_CONFLICT("O; out; in; In<O>")!>val implicitType5<!> = getT<In<O>>()
 
-    <!TYPE_VARIANCE_CONFLICT("I", "in", "out", "I")!>val delegateType1<!> by Delegate<I>()
+    <!TYPE_VARIANCE_CONFLICT("I; in; out; I")!>val delegateType1<!> by Delegate<I>()
     val delegateType2 by Delegate<O>()
     val delegateType3 by Delegate<P>()
     val delegateType4 by Delegate<In<I>>()
-    <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "In<O>")!>val delegateType5<!> by Delegate<In<O>>()
+    <!TYPE_VARIANCE_CONFLICT("O; out; in; In<O>")!>val delegateType5<!> by Delegate<In<O>>()
 
     abstract val I.receiver1: Int
-    abstract val <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "O")!>O<!>.receiver2: Int
+    abstract val <!TYPE_VARIANCE_CONFLICT("O; out; in; O")!>O<!>.receiver2: Int
     abstract val P.receiver3: Int
-    abstract val In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "In<I>")!>I<!>>.receiver4: Int
+    abstract val In<<!TYPE_VARIANCE_CONFLICT("I; in; out; In<I>")!>I<!>>.receiver4: Int
     abstract val In<O>.receiver5: Int
 
     val <X : I> X.typeParameter1: Int get() = 0
-    val <X : <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "O")!>O<!>> X.typeParameter2: Int get() = 0
+    val <X : <!TYPE_VARIANCE_CONFLICT("O; out; in; O")!>O<!>> X.typeParameter2: Int get() = 0
     val <X : P> X.typeParameter3: Int get() = 0
-    val <X : In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "In<I>")!>I<!>>> X.typeParameter4: Int get() = 0
+    val <X : In<<!TYPE_VARIANCE_CONFLICT("I; in; out; In<I>")!>I<!>>> X.typeParameter4: Int get() = 0
     val <X : In<O>> X.typeParameter5: Int get() = 0
 
     val <X> X.typeParameter6: Int where X : I get() = 0
-    val <X> X.typeParameter7: Int where X : <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "O")!>O<!> get() = 0
+    val <X> X.typeParameter7: Int where X : <!TYPE_VARIANCE_CONFLICT("O; out; in; O")!>O<!> get() = 0
     val <X> X.typeParameter8: Int where X : P get() = 0
-    val <X> X.typeParameter9: Int where X : In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "In<I>")!>I<!>> get() = 0
+    val <X> X.typeParameter9: Int where X : In<<!TYPE_VARIANCE_CONFLICT("I; in; out; In<I>")!>I<!>> get() = 0
     val <X> X.typeParameter0: Int where X : In<O> get() = 0
 }
diff --git a/compiler/testData/diagnostics/tests/variance/VarProperty.kt b/compiler/testData/diagnostics/tests/variance/VarProperty.kt
index 31d3b348e1a..38dd3ff7f02 100644
--- a/compiler/testData/diagnostics/tests/variance/VarProperty.kt
+++ b/compiler/testData/diagnostics/tests/variance/VarProperty.kt
@@ -12,39 +12,39 @@ class Delegate<T> {
 fun <T> getT(): T = null!!
 
 abstract class Test<in I, out O, P> {
-    abstract var type1: <!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "I")!>I<!>
-    abstract var type2: <!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "O")!>O<!>
+    abstract var type1: <!TYPE_VARIANCE_CONFLICT("I; in; invariant; I")!>I<!>
+    abstract var type2: <!TYPE_VARIANCE_CONFLICT("O; out; invariant; O")!>O<!>
     abstract var type3: P
-    abstract var type4: In<<!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "In<I>")!>I<!>>
-    abstract var type5: In<<!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "In<O>")!>O<!>>
+    abstract var type4: In<<!TYPE_VARIANCE_CONFLICT("I; in; invariant; In<I>")!>I<!>>
+    abstract var type5: In<<!TYPE_VARIANCE_CONFLICT("O; out; invariant; In<O>")!>O<!>>
 
-    <!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "I")!>var implicitType1<!> = getT<I>()
-    <!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "O")!>var implicitType2<!> = getT<O>()
+    <!TYPE_VARIANCE_CONFLICT("I; in; invariant; I")!>var implicitType1<!> = getT<I>()
+    <!TYPE_VARIANCE_CONFLICT("O; out; invariant; O")!>var implicitType2<!> = getT<O>()
     var implicitType3 = getT<P>()
-    <!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "In<I>")!>var implicitType4<!> = getT<In<I>>()
-    <!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "In<O>")!>var implicitType5<!> = getT<In<O>>()
+    <!TYPE_VARIANCE_CONFLICT("I; in; invariant; In<I>")!>var implicitType4<!> = getT<In<I>>()
+    <!TYPE_VARIANCE_CONFLICT("O; out; invariant; In<O>")!>var implicitType5<!> = getT<In<O>>()
 
-    <!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "I")!>var delegateType1<!> by Delegate<I>()
-    <!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "O")!>var delegateType2<!> by Delegate<O>()
+    <!TYPE_VARIANCE_CONFLICT("I; in; invariant; I")!>var delegateType1<!> by Delegate<I>()
+    <!TYPE_VARIANCE_CONFLICT("O; out; invariant; O")!>var delegateType2<!> by Delegate<O>()
     var delegateType3 by Delegate<P>()
-    <!TYPE_VARIANCE_CONFLICT("I", "in", "invariant", "In<I>")!>var delegateType4<!> by Delegate<In<I>>()
-    <!TYPE_VARIANCE_CONFLICT("O", "out", "invariant", "In<O>")!>var delegateType5<!> by Delegate<In<O>>()
+    <!TYPE_VARIANCE_CONFLICT("I; in; invariant; In<I>")!>var delegateType4<!> by Delegate<In<I>>()
+    <!TYPE_VARIANCE_CONFLICT("O; out; invariant; In<O>")!>var delegateType5<!> by Delegate<In<O>>()
 
     abstract var I.receiver1: Int
-    abstract var <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "O")!>O<!>.receiver2: Int
+    abstract var <!TYPE_VARIANCE_CONFLICT("O; out; in; O")!>O<!>.receiver2: Int
     abstract var P.receiver3: Int
-    abstract var In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "In<I>")!>I<!>>.receiver4: Int
+    abstract var In<<!TYPE_VARIANCE_CONFLICT("I; in; out; In<I>")!>I<!>>.receiver4: Int
     abstract var In<O>.receiver5: Int
 
     var <X : I> X.typeParameter1: Int get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
-    var <X : <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "O")!>O<!>> X.typeParameter2: Int get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
+    var <X : <!TYPE_VARIANCE_CONFLICT("O; out; in; O")!>O<!>> X.typeParameter2: Int get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
     var <X : P> X.typeParameter3: Int get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
-    var <X : In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "In<I>")!>I<!>>> X.typeParameter4: Int get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
+    var <X : In<<!TYPE_VARIANCE_CONFLICT("I; in; out; In<I>")!>I<!>>> X.typeParameter4: Int get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
     var <X : In<O>> X.typeParameter5: Int get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
 
     var <X> X.typeParameter6: Int where X : I get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
-    var <X> X.typeParameter7: Int where X : <!TYPE_VARIANCE_CONFLICT("O", "out", "in", "O")!>O<!> get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
+    var <X> X.typeParameter7: Int where X : <!TYPE_VARIANCE_CONFLICT("O; out; in; O")!>O<!> get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
     var <X> X.typeParameter8: Int where X : P get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
-    var <X> X.typeParameter9: Int where X : In<<!TYPE_VARIANCE_CONFLICT("I", "in", "out", "In<I>")!>I<!>> get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
+    var <X> X.typeParameter9: Int where X : In<<!TYPE_VARIANCE_CONFLICT("I; in; out; In<I>")!>I<!>> get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
     var <X> X.typeParameter0: Int where X : In<O> get() = 0; set(<!UNUSED_PARAMETER!>i<!>) {}
 }
diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.kt b/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.kt
index 438996b8560..9fe7c3e6a9a 100644
--- a/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.kt
+++ b/compiler/testData/diagnostics/tests/variance/privateToThis/FunctionCall.kt
@@ -15,23 +15,23 @@ class Test<in I> {
         apply(this.foo())
         with(Test<I>()) {
             apply(foo()) // resolved to this@Test.foo
-            apply(this.<!INVISIBLE_MEMBER("foo", "private/*private to this*/", "'Test'")!>foo<!>())
-            apply(this@with.<!INVISIBLE_MEMBER("foo", "private/*private to this*/", "'Test'")!>foo<!>())
+            apply(this.<!INVISIBLE_MEMBER("foo; private/*private to this*/; 'Test'")!>foo<!>())
+            apply(this@with.<!INVISIBLE_MEMBER("foo; private/*private to this*/; 'Test'")!>foo<!>())
             apply(this@Test.foo())
         }
     }
 
     fun <I> test(t: Test<I>) {
-        t.apply(t.<!INVISIBLE_MEMBER("foo", "private/*private to this*/", "'Test'")!>foo<!>())
+        t.apply(t.<!INVISIBLE_MEMBER("foo; private/*private to this*/; 'Test'")!>foo<!>())
     }
 
     companion object {
         fun <I> test(t: Test<I>) {
-            t.apply(t.<!INVISIBLE_MEMBER("foo", "private/*private to this*/", "'Test'")!>foo<!>())
+            t.apply(t.<!INVISIBLE_MEMBER("foo; private/*private to this*/; 'Test'")!>foo<!>())
         }
     }
 }
 
 fun <I> test(t: Test<I>) {
-    t.apply(t.<!INVISIBLE_MEMBER("foo", "private/*private to this*/", "'Test'")!>foo<!>())
+    t.apply(t.<!INVISIBLE_MEMBER("foo; private/*private to this*/; 'Test'")!>foo<!>())
 }
diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.kt b/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.kt
index b63854a2012..b05426a7dc5 100644
--- a/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.kt
+++ b/compiler/testData/diagnostics/tests/variance/privateToThis/GetVal.kt
@@ -15,23 +15,23 @@ class Test<in I, out O> {
         apply(this.i)
         with(Test<I, O>()) {
             apply(i) // resolved to this@Test.i
-            apply(this.<!INVISIBLE_MEMBER("i", "private/*private to this*/", "'Test'")!>i<!>)
-            apply(this@with.<!INVISIBLE_MEMBER("i", "private/*private to this*/", "'Test'")!>i<!>)
+            apply(this.<!INVISIBLE_MEMBER("i; private/*private to this*/; 'Test'")!>i<!>)
+            apply(this@with.<!INVISIBLE_MEMBER("i; private/*private to this*/; 'Test'")!>i<!>)
             apply(this@Test.i)
         }
     }
 
     fun <I, O> test(t: Test<I, O>) {
-        t.apply(t.<!INVISIBLE_MEMBER("i", "private/*private to this*/", "'Test'")!>i<!>)
+        t.apply(t.<!INVISIBLE_MEMBER("i; private/*private to this*/; 'Test'")!>i<!>)
     }
 
     companion object {
         fun <I, O> test(t: Test<I, O>) {
-            t.apply(t.<!INVISIBLE_MEMBER("i", "private/*private to this*/", "'Test'")!>i<!>)
+            t.apply(t.<!INVISIBLE_MEMBER("i; private/*private to this*/; 'Test'")!>i<!>)
         }
     }
 }
 
 fun <I, O> test(t: Test<I, O>) {
-    t.apply(t.<!INVISIBLE_MEMBER("i", "private/*private to this*/", "'Test'")!>i<!>)
+    t.apply(t.<!INVISIBLE_MEMBER("i; private/*private to this*/; 'Test'")!>i<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.kt b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.kt
index 66d588b6f3d..35a199d2403 100644
--- a/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.kt
+++ b/compiler/testData/diagnostics/tests/variance/privateToThis/SetVar.kt
@@ -15,23 +15,23 @@ class Test<in I, out O> {
         this.i = getT()
         with(Test<I, O>()) {
             i = getT() // resolved to this@Test.i
-            this.<!INVISIBLE_MEMBER("i", "private/*private to this*/", "'Test'")!>i<!> = getT()
-            this@with.<!INVISIBLE_MEMBER("i", "private/*private to this*/", "'Test'")!>i<!> = getT()
+            this.<!INVISIBLE_MEMBER("i; private/*private to this*/; 'Test'")!>i<!> = getT()
+            this@with.<!INVISIBLE_MEMBER("i; private/*private to this*/; 'Test'")!>i<!> = getT()
             this@Test.i  = getT()
         }
     }
 
     fun <I, O> test(t: Test<I, O>) {
-        t.<!INVISIBLE_MEMBER("i", "private/*private to this*/", "'Test'")!>i<!> = getT()
+        t.<!INVISIBLE_MEMBER("i; private/*private to this*/; 'Test'")!>i<!> = getT()
     }
 
     companion object {
         fun <I, O> test(t: Test<I, O>) {
-            t.<!INVISIBLE_MEMBER("i", "private/*private to this*/", "'Test'")!>i<!> = getT()
+            t.<!INVISIBLE_MEMBER("i; private/*private to this*/; 'Test'")!>i<!> = getT()
         }
     }
 }
 
 fun <I, O> test(t: Test<I, O>) {
-    t.<!INVISIBLE_MEMBER("i", "private/*private to this*/", "'Test'")!>i<!> = getT()
+    t.<!INVISIBLE_MEMBER("i; private/*private to this*/; 'Test'")!>i<!> = getT()
 }
diff --git a/compiler/testData/diagnostics/tests/visibility/abstractInvisibleMemberFromKotlin.txt b/compiler/testData/diagnostics/tests/visibility/abstractInvisibleMemberFromKotlin.txt
index cd709d494b4..86b166f70c3 100644
--- a/compiler/testData/diagnostics/tests/visibility/abstractInvisibleMemberFromKotlin.txt
+++ b/compiler/testData/diagnostics/tests/visibility/abstractInvisibleMemberFromKotlin.txt
@@ -22,6 +22,20 @@ package base {
     }
 }
 
+// -- Module: <intermediate> --
+package
+
+package intermediate {
+
+    public abstract class Intermediate : base.Base {
+        public constructor Intermediate()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        invisible_fake abstract override /*1*/ /*fake_override*/ fun internalFoo(): kotlin.String
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}
 
 // -- Module: <impl> --
 package
@@ -75,18 +89,3 @@ package impl {
     }
 }
 
-
-// -- Module: <intermediate> --
-package
-
-package intermediate {
-
-    public abstract class Intermediate : base.Base {
-        public constructor Intermediate()
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public final override /*1*/ /*fake_override*/ fun foo(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        invisible_fake abstract override /*1*/ /*fake_override*/ fun internalFoo(): kotlin.String
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/visibility/abstractInvisibleMemberFromKotlinWarning.txt b/compiler/testData/diagnostics/tests/visibility/abstractInvisibleMemberFromKotlinWarning.txt
index 4ead4cb08c7..bf0d5a3ad31 100644
--- a/compiler/testData/diagnostics/tests/visibility/abstractInvisibleMemberFromKotlinWarning.txt
+++ b/compiler/testData/diagnostics/tests/visibility/abstractInvisibleMemberFromKotlinWarning.txt
@@ -13,7 +13,6 @@ package base {
     }
 }
 
-
 // -- Module: <impl> --
 package
 
@@ -29,3 +28,4 @@ package impl {
         public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
     }
 }
+
diff --git a/compiler/testData/diagnostics/tests/when/BranchBypassVal.fir.kt b/compiler/testData/diagnostics/tests/when/BranchBypassVal.fir.kt
index 1fc11675ec2..cda408221da 100644
--- a/compiler/testData/diagnostics/tests/when/BranchBypassVal.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/BranchBypassVal.fir.kt
@@ -1,4 +1,14 @@
 // !WITH_NEW_INFERENCE
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 1
+ * expressions, when-expression -> paragraph 5 -> sentence 1
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 6
+ */
 class A
 
 fun test(a: Any): String {
diff --git a/compiler/testData/diagnostics/tests/when/BranchBypassVar.fir.kt b/compiler/testData/diagnostics/tests/when/BranchBypassVar.fir.kt
index 7a8e4484cca..90053fe80f2 100644
--- a/compiler/testData/diagnostics/tests/when/BranchBypassVar.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/BranchBypassVar.fir.kt
@@ -1,4 +1,14 @@
 // !WITH_NEW_INFERENCE
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 1
+ * expressions, when-expression -> paragraph 5 -> sentence 1
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 8
+ */
 class A
 
 fun test(a: Any) {
diff --git a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.fir.kt b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.fir.kt
index 1b406849f6e..5c0f881fe1a 100644
--- a/compiler/testData/diagnostics/tests/when/BranchFalseBypass.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/BranchFalseBypass.fir.kt
@@ -1,3 +1,13 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * expressions, when-expression -> paragraph 6 -> sentence 1
+ * expressions, when-expression -> paragraph 5 -> sentence 1
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 8
+ */
 enum class My { A, B }
 
 fun test(a: My): String {
diff --git a/compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.fir.kt b/compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.fir.kt
index c66f5e955aa..1ae41ddd45c 100644
--- a/compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/BranchFalseBypassElse.fir.kt
@@ -1,3 +1,13 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 1
+ * expressions, when-expression -> paragraph 5 -> sentence 1
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 8
+ */
 class A
 
 fun test(a: Any): String {
diff --git a/compiler/testData/diagnostics/tests/when/CommaInWhenConditionWithoutArgument.fir.kt b/compiler/testData/diagnostics/tests/when/CommaInWhenConditionWithoutArgument.fir.kt
index da4a6d4c2a7..67d01c6de6a 100644
--- a/compiler/testData/diagnostics/tests/when/CommaInWhenConditionWithoutArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/CommaInWhenConditionWithoutArgument.fir.kt
@@ -1,3 +1,10 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 2 -> sentence 1
+ * expressions, when-expression -> paragraph 5 -> sentence 1
+ */
 fun foo(x: Int, y: Int): Int =
         when {
             x > 0, y > 0,<!SYNTAX!>,<!> x < 0 -> 1
@@ -8,4 +15,4 @@ fun bar(x: Int): Int =
         when (x) {
             0 -> 0
             else -> 1
-        }
\ No newline at end of file
+        }
diff --git a/compiler/testData/diagnostics/tests/when/CommaInWhenConditionWithoutArgument.kt b/compiler/testData/diagnostics/tests/when/CommaInWhenConditionWithoutArgument.kt
index 447cf794d78..a666f056153 100644
--- a/compiler/testData/diagnostics/tests/when/CommaInWhenConditionWithoutArgument.kt
+++ b/compiler/testData/diagnostics/tests/when/CommaInWhenConditionWithoutArgument.kt
@@ -15,4 +15,4 @@ fun bar(x: Int): Int =
         when (x) {
             0 -> 0
             else -> 1
-        }
\ No newline at end of file
+        }
diff --git a/compiler/testData/diagnostics/tests/when/DuplicatedLabels.fir.kt b/compiler/testData/diagnostics/tests/when/DuplicatedLabels.fir.kt
index 72d12360fa9..1d9dc3ced95 100644
--- a/compiler/testData/diagnostics/tests/when/DuplicatedLabels.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/DuplicatedLabels.fir.kt
@@ -1,3 +1,13 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 9 -> sentence 1
+ * expressions, when-expression -> paragraph 2 -> sentence 4
+ * expressions, when-expression -> paragraph 2 -> sentence 5
+ */
+
 package test
 
 const val four = 4
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.fir.kt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.fir.kt
index 049871ff6bb..31da011183f 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.fir.kt
@@ -1,4 +1,12 @@
 // KT-2902 Check for null should be required when match nullable enum element
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
+ */
 
 // FILE: 1.kt
 
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.fir.kt b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.fir.kt
index f0f8219837f..5c9fb47e6d2 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.fir.kt
@@ -1,3 +1,12 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
+ */
+
 enum class E { A, B }
 
 fun foo(e: E, something: Any?): Int {
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.fir.kt
index 8a4910d7564..35760e6cd2c 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.fir.kt
@@ -1,3 +1,14 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, boolean-operators -> paragraph 0 -> sentence 0
+ * control--and-data-flow-analysis, control-flow-graph, statements-1 -> paragraph 0 -> sentence 0
+ */
+
 enum class Color { RED, GREEN, BLUE }
 
 fun foo(arr: Array<Color>): Color {
@@ -11,4 +22,4 @@ fun foo(arr: Array<Color>): Color {
         return Color.BLUE
     }
     return Color.GREEN
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.kt
index d0db24cde50..239615121b0 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveBreakContinue.kt
@@ -22,4 +22,4 @@ fun foo(arr: Array<Color>): Color {
         <!UNREACHABLE_CODE!>return Color.BLUE<!>
     }
     return Color.GREEN
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.fir.kt
index fe9a153a267..278ee04bced 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.fir.kt
@@ -1,3 +1,12 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ */
+
 enum class MyEnum {
     A, B, C
 }
@@ -8,4 +17,4 @@ fun foo(x: MyEnum): Int {
         is <!UNRESOLVED_REFERENCE!>MyEnum.B<!> -> 2
         is <!UNRESOLVED_REFERENCE!>MyEnum.C<!> -> 3
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.kt
index db917e778c0..11ed0d1520a 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumIs.kt
@@ -17,4 +17,4 @@ fun foo(x: MyEnum): Int {
         is <!IS_ENUM_ENTRY!>MyEnum.<!ENUM_ENTRY_AS_TYPE!>B<!><!> -> 2
         is <!IS_ENUM_ENTRY!>MyEnum.<!ENUM_ENTRY_AS_TYPE!>C<!><!> -> 3
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.fir.kt
index cceb426abbf..481970e4455 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.fir.kt
@@ -1,3 +1,13 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 5
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ */
+
 enum class MyEnum {
     A, B, C
 }
@@ -8,4 +18,4 @@ fun foo(x: MyEnum): Int {
         is <!UNRESOLVED_REFERENCE!>MyEnum.B<!> -> 2
         is <!UNRESOLVED_REFERENCE!>MyEnum.C<!> -> 3
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt
index 9864e2eb57a..468d5dc5bb3 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveEnumMixed.kt
@@ -18,4 +18,4 @@ fun foo(x: MyEnum): Int {
         is <!IS_ENUM_ENTRY!>MyEnum.<!ENUM_ENTRY_AS_TYPE!>B<!><!> -> 2
         is <!IS_ENUM_ENTRY!>MyEnum.<!ENUM_ENTRY_AS_TYPE!>C<!><!> -> 3
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.fir.kt
index 0e15e5efb3d..39f8824c742 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveInitialization.fir.kt
@@ -1,3 +1,14 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 5
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 3
+ */
+
 enum class Direction {
     NORTH, SOUTH, WEST, EAST
 }
@@ -12,4 +23,4 @@ fun foo(dir: Direction): Int {
         Direction.EAST  -> res = 4
     }
     return res
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.fir.kt
index b7f68238504..99bffa09a59 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.fir.kt
@@ -1,3 +1,15 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 4
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 5
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 3
+ */
+
 fun foo(b: Boolean): Int {
     val x: Int
     val y: Int
@@ -8,4 +20,4 @@ fun foo(b: Boolean): Int {
     // x is initialized here
     x = 3
     return x + y
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.kt
index 25e23ad8b76..2511cf26411 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveNoInitialization.kt
@@ -20,4 +20,4 @@ fun foo(b: Boolean): Int {
     // x is initialized here
     x = 3
     return x + y
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.fir.kt
index 19edb89d8fd..0229225035d 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.fir.kt
@@ -1,3 +1,14 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 3
+ */
+
 enum class MyEnum {
     A, B
 }
@@ -11,4 +22,4 @@ fun foo(x: MyEnum?): Int {
         null -> y = 0
     }
     return y
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt
index 2d4e0543a55..eb1c3a6b23a 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveNullable.kt
@@ -22,4 +22,4 @@ fun foo(x: MyEnum?): Int {
         null -> y = 0
     }<!>
     return y
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.fir.kt
index 2a97dd3827c..bde25dbecb6 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnum.fir.kt
@@ -1,3 +1,11 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-313
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ */
+
 // See KT-6399: exhaustive whens on platform enums
 
 // FILE: J.java
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.fir.kt
index a51fda0cbdd..2f70bcdc05b 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustivePlatformEnumStatement.fir.kt
@@ -1,3 +1,12 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 923
+ */
+
 // See KT-6399: exhaustive whens on platform enums
 
 // FILE: J.java
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.fir.kt
index 11c764c8ccd..6990583e18e 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.fir.kt
@@ -1,3 +1,13 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, boolean-operators -> paragraph 0 -> sentence 0
+ */
+
 enum class Direction {
     NORTH, SOUTH, WEST, EAST
 }
@@ -10,4 +20,4 @@ fun foo(dir: Direction): Int {
         Direction.EAST  -> return 4
     }
     // See KT-1882: no return is needed at the end
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.kt
index 8eb102e1655..b261e3419c4 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturn.kt
@@ -20,4 +20,4 @@ fun foo(dir: Direction): Int {
         Direction.EAST  -> return 4
     }<!>
     // See KT-1882: no return is needed at the end
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.fir.kt
index b6bafbb0de4..90780a78450 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.fir.kt
@@ -1,3 +1,13 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, boolean-operators -> paragraph 0 -> sentence 0
+ */
+
 enum class Direction {
     NORTH, SOUTH, WEST, EAST
 }
@@ -11,4 +21,4 @@ fun foo(dir: Direction): Int {
     }
     // Error: Unreachable code. Return is not required.
     if (dir == Direction.SOUTH) return 2
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.kt
index 684de364469..59d43058120 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveReturnThrow.kt
@@ -21,4 +21,4 @@ fun foo(dir: Direction): Int {
     }<!>
     // Error: Unreachable code. Return is not required.
     <!UNREACHABLE_CODE!>if (dir == Direction.SOUTH) return 2<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.fir.kt
index 27e53b8833c..314fffa5bc6 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.fir.kt
@@ -1,3 +1,15 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 3
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 3 -> sentence 2
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 3 -> sentence 3
+ */
+
 fun foo(a: Boolean, b: Boolean): Int {
     val x: Int
     if (a) {
@@ -19,4 +31,4 @@ fun bar(a: Boolean, b: Boolean): Int {
         false -> x = 3
     }
     return <!UNINITIALIZED_VARIABLE!>x<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.kt
index c5dd4ef380b..2d9cb6ed869 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveValOverConditionalInit.kt
@@ -31,4 +31,4 @@ fun bar(a: Boolean, b: Boolean): Int {
         false -> <!VAL_REASSIGNMENT!>x<!> = 3
     }
     return <!UNINITIALIZED_VARIABLE!>x<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveVarOverConditionalInit.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveVarOverConditionalInit.fir.kt
index 50d1442f1cf..be1be855c35 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveVarOverConditionalInit.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveVarOverConditionalInit.fir.kt
@@ -1,3 +1,14 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 3
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 3 -> sentence 2
+ */
+
 fun foo(a: Boolean, b: Boolean): Int {
     var x: Int
     if (a) {
@@ -19,4 +30,4 @@ fun bar(a: Boolean, b: Boolean): Int {
         false -> x = 3
     }
     return <!UNINITIALIZED_VARIABLE!>x<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveVarOverConditionalInit.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveVarOverConditionalInit.kt
index ebf6e94a18a..4ad5438cfa0 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveVarOverConditionalInit.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveVarOverConditionalInit.kt
@@ -30,4 +30,4 @@ fun bar(a: Boolean, b: Boolean): Int {
         false -> x = 3
     }
     return <!UNINITIALIZED_VARIABLE!>x<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.fir.kt
index 86925b7212a..4f42f7fc9c9 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.fir.kt
@@ -1,3 +1,12 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ */
+
 // KT-7857: when exhaustiveness does not take previous nullability checks into account
 enum class X { A, B }
 fun foo(arg: X?): Int {
@@ -11,4 +20,4 @@ fun foo(arg: X?): Int {
     else {
         return 0
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.kt
index 22ccf26e884..f69d29641d9 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheck.kt
@@ -20,4 +20,4 @@ fun foo(arg: X?): Int {
     else {
         return 0
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.fir.kt
index 41d97447c03..bf200671e98 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.fir.kt
@@ -1,3 +1,14 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 1 -> sentence 1
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, boolean-operators -> paragraph 0 -> sentence 0
+ */
+
 // KT-7857: when exhaustiveness does not take previous nullability checks into account
 enum class X { A, B }
 fun foo(arg: X?): Int {
@@ -9,4 +20,4 @@ fun foo(arg: X?): Int {
         X.B -> 2
         // else or null branch should not be required here!
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.kt
index 1e9a81fcc3d..569fe558f63 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBefore.kt
@@ -20,4 +20,4 @@ fun foo(arg: X?): Int {
         X.B -> 2
         // else or null branch should not be required here!
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.fir.kt
index 67e7e269297..6949dcc30b8 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.fir.kt
@@ -1,3 +1,14 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 4
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 5
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ */
+
 // KT-7857: when exhaustiveness does not take previous nullability checks into account
 fun foo(arg: Boolean?): Int {
     if (arg != null) {
@@ -10,4 +21,4 @@ fun foo(arg: Boolean?): Int {
     else {
         return -1
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.kt
index 7061a5e8d27..c1d3710359e 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckBoolean.kt
@@ -21,4 +21,4 @@ fun foo(arg: Boolean?): Int {
     else {
         return -1
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.fir.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.fir.kt
index 3b315600ab8..bad9021aa46 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.fir.kt
@@ -1,3 +1,14 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 1 -> sentence 1
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, boolean-operators -> paragraph 0 -> sentence 0
+ */
+
 // KT-7857: when exhaustiveness does not take previous nullability checks into account
 enum class X { A, B }
 fun foo(arg: X?): Int {
@@ -11,4 +22,4 @@ fun foo(arg: X?): Int {
             // else or null branch should not be required here!
         }
     } 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.kt b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.kt
index 3259ceaf08b..5ee29c145da 100644
--- a/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.kt
+++ b/compiler/testData/diagnostics/tests/when/ExhaustiveWithNullabilityCheckElse.kt
@@ -22,4 +22,4 @@ fun foo(arg: X?): Int {
             // else or null branch should not be required here!
         }
     } 
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.fir.kt b/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.fir.kt
index 4b240e601c9..382c03583e0 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.fir.kt
@@ -1,7 +1,16 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 9 -> sentence 2
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ */
+
 fun foo(x: Int) {
     val y: Unit = when (x) {
         2 -> {}
         3 -> {}
     }
     return y
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.kt b/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.kt
index 9cd15b14552..d08e040bc97 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.kt
@@ -13,4 +13,4 @@ fun foo(x: Int) {
         3 -> {}
     }
     return y
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.fir.kt b/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.fir.kt
index c625fff796e..81081046fa7 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.fir.kt
@@ -1,6 +1,15 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 9 -> sentence 2
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ */
+
 fun foo(x: Int): Any {
     val v = when (x) {
         2 -> 0
     }
     return v
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.kt b/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.kt
index 53a35c30195..5cc1a2be78f 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.kt
@@ -12,4 +12,4 @@ fun foo(x: Int): Any {
         2 -> 0
     }
     return v
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.fir.kt b/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.fir.kt
index 695f64ab91c..cfdaa269fe4 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.fir.kt
@@ -1,3 +1,13 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 9 -> sentence 2
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ * expressions, function-literals, lambda-literals -> paragraph 10 -> sentence 1
+ */
+
 fun foo(x: Int) {
     r {
         when (x) {
@@ -8,4 +18,4 @@ fun foo(x: Int) {
 
 fun r(f: () -> Unit) {
     f()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.kt b/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.kt
index 791a254b8e0..230a1fefe70 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.kt
@@ -18,4 +18,4 @@ fun foo(x: Int) {
 
 fun r(f: () -> Unit) {
     f()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.fir.kt b/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.fir.kt
index 4dfb9c7dbcf..3a452e87291 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.fir.kt
@@ -1,3 +1,14 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 9 -> sentence 2
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ * expressions, function-literals, lambda-literals -> paragraph 10 -> sentence 1
+ * overload-resolution, determining-function-applicability-for-a-specific-call, description -> paragraph 3 -> sentence 3
+ */
+
 fun foo(x: Int) {
     r {
         when (x) {
@@ -8,4 +19,4 @@ fun foo(x: Int) {
 
 fun r(f: () -> Int) {
     f()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.kt b/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.kt
index f6b22498c82..e57636611b9 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.kt
@@ -19,4 +19,4 @@ fun foo(x: Int) {
 
 fun r(f: () -> Int) {
     f()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.fir.kt b/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.fir.kt
index 1ba2b607982..69423511de3 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.fir.kt
@@ -1,5 +1,14 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 9 -> sentence 2
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ */
+
 fun foo(x: Int): Any {
     return when (x) {
         2 -> 0
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.kt b/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.kt
index 4dc63a2739a..6822f03a47a 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.kt
@@ -11,4 +11,4 @@ fun foo(x: Int): Any {
     return <!NO_ELSE_IN_WHEN!>when<!> (x) {
         2 -> 0
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.fir.kt b/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.fir.kt
index 606fe43e816..94b8f840ec2 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.fir.kt
@@ -1,6 +1,16 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 9 -> sentence 2
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ */
+
+
 fun foo(x: Int) {
     return when (x) {
         2 -> {}
         3 -> {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.kt b/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.kt
index 833c96c7602..4a5dbe3116a 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.kt
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.kt
@@ -13,4 +13,4 @@ fun foo(x: Int) {
         2 -> {}
         3 -> {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveBooleanNullable.fir.kt b/compiler/testData/diagnostics/tests/when/NonExhaustiveBooleanNullable.fir.kt
index a1b0cf6478c..0a39652a6fd 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveBooleanNullable.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveBooleanNullable.fir.kt
@@ -1,3 +1,13 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
+ */
+
 // See also: KT-3743
 fun foo(arg: Boolean?): String {
     // Must be NOT exhaustive
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.fir.kt b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.fir.kt
index f88086ef62a..c3014d5ef6f 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.fir.kt
@@ -1,3 +1,12 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ */
+
 // See KT-6399: exhaustive whens on platform enums
 
 // FILE: J.java
@@ -17,4 +26,4 @@ fun foo(): Int {
     return when (J.create()) {
         J.A -> 1
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.kt b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.kt
index e07e7975845..b9480bf6cc4 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.kt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustivePlatformEnum.kt
@@ -26,4 +26,4 @@ fun foo(): Int {
     return <!NO_ELSE_IN_WHEN!>when<!> (J.create()) {
         J.A -> 1
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.fir.kt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.fir.kt
index 311b12aae32..4786062e25d 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.fir.kt
@@ -1,3 +1,15 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * expressions, when-expression -> paragraph 9 -> sentence 2
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 3
+ */
+
 // Base for KT-6227
 enum class X { A, B, C, D }
 
@@ -8,4 +20,4 @@ fun foo(arg: X): String {
         X.B -> res = "B"
     }
     return res
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.kt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.kt
index a0cbfd75119..5e6ef130882 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.kt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarning.kt
@@ -20,4 +20,4 @@ fun foo(arg: X): String {
         X.B -> res = "B"
     }
     return res
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.fir.kt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.fir.kt
index c78080fd833..cd256cdf297 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.fir.kt
@@ -1,3 +1,14 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 3
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 3 -> sentence 2
+ */
+
 // Base for KT-6227
 enum class X { A, B, C, D }
 
@@ -10,4 +21,4 @@ fun foo(arg: X): String {
         X.D -> res = "D"
     }
     return res
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.kt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.kt
index 16d6c63b033..12ebb10b332 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.kt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningFalse.kt
@@ -21,4 +21,4 @@ fun foo(arg: X): String {
         X.D -> res = "D"
     }<!>
     return res
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningForSealedClass.fir.kt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningForSealedClass.fir.kt
index 36e760226ea..02c0d4d56b0 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningForSealedClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningForSealedClass.fir.kt
@@ -1,3 +1,16 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 6
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 7
+ * expressions, when-expression -> paragraph 9 -> sentence 2
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 3 -> sentence 1
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ */
+
 sealed class S
 
 object First : S()
@@ -13,4 +26,4 @@ fun foo(s: S) {
         First -> {}
         is Derived -> use(s.s)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningForSealedClass.kt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningForSealedClass.kt
index 2b3f3e3070a..845ba67b987 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningForSealedClass.kt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWarningForSealedClass.kt
@@ -26,4 +26,4 @@ fun foo(s: S) {
         First -> {}
         is Derived -> use(<!DEBUG_INFO_SMARTCAST!>s<!>.s)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.fir.kt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.fir.kt
index 97cb1995804..e0bcb365303 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.fir.kt
@@ -1,3 +1,14 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * expressions, when-expression -> paragraph 9 -> sentence 2
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ */
+
 // KT-7857: when exhaustiveness does not take previous nullability checks into account
 enum class X { A, B }
 fun foo(arg: X?): Int {
@@ -9,4 +20,4 @@ fun foo(arg: X?): Int {
     else {
         return 0
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.kt b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.kt
index 34ba7eced8d..baec7c29eea 100644
--- a/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.kt
+++ b/compiler/testData/diagnostics/tests/when/NonExhaustiveWithNullabilityCheck.kt
@@ -20,4 +20,4 @@ fun foo(arg: X?): Int {
     else {
         return 0
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.fir.kt b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.fir.kt
index c286b1e93c3..5f48f19aa9a 100644
--- a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.fir.kt
@@ -1,3 +1,15 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 2 -> sentence 3
+ * control--and-data-flow-analysis, performing-analysis-on-the-control-flow-graph, variable-initialization-analysis -> paragraph 3 -> sentence 2
+ * declarations, classifier-declaration, classifier-initialization -> paragraph 6 -> sentence 4
+ */
+
 // See KT-5113
 enum class E {
     A,
@@ -13,4 +25,4 @@ class Outer(e: E) {
             E.B -> prop = 2
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.kt b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.kt
index 649173b7a64..5561c8066ed 100644
--- a/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.kt
+++ b/compiler/testData/diagnostics/tests/when/PropertyNotInitialized.kt
@@ -25,4 +25,4 @@ class Outer(e: E) {
             E.B -> prop = 2
         }<!>
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/RedundantElse.fir.kt b/compiler/testData/diagnostics/tests/when/RedundantElse.fir.kt
index 88d76554d03..829fb30787e 100644
--- a/compiler/testData/diagnostics/tests/when/RedundantElse.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/RedundantElse.fir.kt
@@ -1,3 +1,15 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 6
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 9
+ * expressions, when-expression -> paragraph 6 -> sentence 10
+ * expressions, when-expression -> paragraph 6 -> sentence 11
+ */
+
 // FILE: MyEnum.java
 public enum MyEnum {
     SINGLE;
@@ -65,4 +77,4 @@ fun useJava(): String {
         MyEnum.SINGLE -> "OK"
         else -> "FAIL" // no warning
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/RedundantElse.kt b/compiler/testData/diagnostics/tests/when/RedundantElse.kt
index a82f36e3435..88e3c40c2fd 100644
--- a/compiler/testData/diagnostics/tests/when/RedundantElse.kt
+++ b/compiler/testData/diagnostics/tests/when/RedundantElse.kt
@@ -77,4 +77,4 @@ fun useJava(): String {
         MyEnum.SINGLE -> "OK"
         else -> "FAIL" // no warning
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ReservedExhaustiveWhen.fir.kt b/compiler/testData/diagnostics/tests/when/ReservedExhaustiveWhen.fir.kt
index 768ca9e343d..35d56121810 100644
--- a/compiler/testData/diagnostics/tests/when/ReservedExhaustiveWhen.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/ReservedExhaustiveWhen.fir.kt
@@ -1,3 +1,12 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 2 -> sentence 1
+ * expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
+ */
+
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 infix fun Any.sealed(a: Any?) {}
@@ -34,4 +43,4 @@ fun foo() {
     when {
         else -> {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/ReservedExhaustiveWhen.kt b/compiler/testData/diagnostics/tests/when/ReservedExhaustiveWhen.kt
index 6989da12de5..dce46c0d290 100644
--- a/compiler/testData/diagnostics/tests/when/ReservedExhaustiveWhen.kt
+++ b/compiler/testData/diagnostics/tests/when/ReservedExhaustiveWhen.kt
@@ -43,4 +43,4 @@ fun foo() {
     when {
         else -> {}
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/TopLevelSealed.fir.kt b/compiler/testData/diagnostics/tests/when/TopLevelSealed.fir.kt
index 51371115be4..b7577c720de 100644
--- a/compiler/testData/diagnostics/tests/when/TopLevelSealed.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/TopLevelSealed.fir.kt
@@ -1,4 +1,14 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 6
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 7
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 8
+ */
 
 sealed class A {
     class B: A() {
@@ -19,4 +29,4 @@ fun test(a: A) {
         is A.B.C -> "C"
         is D -> "D"
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/TopLevelSealed.kt b/compiler/testData/diagnostics/tests/when/TopLevelSealed.kt
index 9ea59cd85d8..14d6fd04291 100644
--- a/compiler/testData/diagnostics/tests/when/TopLevelSealed.kt
+++ b/compiler/testData/diagnostics/tests/when/TopLevelSealed.kt
@@ -29,4 +29,4 @@ fun test(a: A) {
         is A.B.C -> "C"
         is D -> "D"
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/When.fir.kt b/compiler/testData/diagnostics/tests/when/When.fir.kt
index 7a7be97f158..f292d20fbd8 100644
--- a/compiler/testData/diagnostics/tests/when/When.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/When.fir.kt
@@ -1,4 +1,17 @@
 // !WITH_NEW_INFERENCE
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 2 -> sentence 5
+ * expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 3
+ * expressions, when-expression -> paragraph 6 -> sentence 5
+ * expressions, when-expression -> paragraph 6 -> sentence 9
+ * expressions, when-expression -> paragraph 6 -> sentence 10
+ * expressions, when-expression -> paragraph 6 -> sentence 11
+ */
 
 fun Int.foo() : Boolean = true
 
@@ -44,4 +57,4 @@ fun test() {
   when (z) {
     else -> 1
   }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/When.kt b/compiler/testData/diagnostics/tests/when/When.kt
index e657da1d321..a8a475024e9 100644
--- a/compiler/testData/diagnostics/tests/when/When.kt
+++ b/compiler/testData/diagnostics/tests/when/When.kt
@@ -57,4 +57,4 @@ fun test() {
   when (<!UNUSED_EXPRESSION!>z<!>) {
     else -> <!UNUSED_EXPRESSION!>1<!>
   }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/WhenTypeDisjunctions.fir.kt b/compiler/testData/diagnostics/tests/when/WhenTypeDisjunctions.fir.kt
index 61f82a393b6..7233c101745 100644
--- a/compiler/testData/diagnostics/tests/when/WhenTypeDisjunctions.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/WhenTypeDisjunctions.fir.kt
@@ -1,3 +1,15 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 1
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 2 -> sentence 1
+ * control--and-data-flow-analysis, control-flow-graph, expressions-1, boolean-operators -> paragraph 0 -> sentence 0
+ */
+
 fun foo(s: Any): String {
     val x = when (s) {
         is String -> s
@@ -18,4 +30,4 @@ fun bar(s: Any): String {
 
     val y: String = x // no error
     return y
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/WhenTypeDisjunctions.kt b/compiler/testData/diagnostics/tests/when/WhenTypeDisjunctions.kt
index fe6a807d59b..94ebf7b8880 100644
--- a/compiler/testData/diagnostics/tests/when/WhenTypeDisjunctions.kt
+++ b/compiler/testData/diagnostics/tests/when/WhenTypeDisjunctions.kt
@@ -30,4 +30,4 @@ fun bar(s: Any): String {
 
     val y: String = x // no error
     return y
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/kt10439.fir.kt b/compiler/testData/diagnostics/tests/when/kt10439.fir.kt
index 72d49f53481..c30fc705cc3 100644
--- a/compiler/testData/diagnostics/tests/when/kt10439.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/kt10439.fir.kt
@@ -1,4 +1,15 @@
 // !WITH_NEW_INFERENCE
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 9 -> sentence 1
+ * expressions, conditional-expression -> paragraph 4 -> sentence 1
+ * expressions, conditional-expression -> paragraph 5 -> sentence 1
+ * overload-resolution, determining-function-applicability-for-a-specific-call, rationale -> paragraph 1 -> sentence 1
+ * overload-resolution, determining-function-applicability-for-a-specific-call, description -> paragraph 3 -> sentence 1
+ */
 
 fun foo(x: Int) = x
 
diff --git a/compiler/testData/diagnostics/tests/when/kt10439.kt b/compiler/testData/diagnostics/tests/when/kt10439.kt
index 4f419505dc2..45ee0a3a834 100644
--- a/compiler/testData/diagnostics/tests/when/kt10439.kt
+++ b/compiler/testData/diagnostics/tests/when/kt10439.kt
@@ -14,12 +14,12 @@
 fun foo(x: Int) = x
 
 fun test0(flag: Boolean) {
-    foo(<!NI;TYPE_MISMATCH!>if (flag) <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>true<!> else <!OI;TYPE_MISMATCH!>""<!><!>)
+    foo(<!TYPE_MISMATCH{NI}!>if (flag) <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>true<!> else <!TYPE_MISMATCH{OI}!>""<!><!>)
 }
 
 fun test1(flag: Boolean) {
-    foo(<!NI;TYPE_MISMATCH!>when (flag) {
-        true -> <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>true<!>
-        else -> <!OI;TYPE_MISMATCH!>""<!>
+    foo(<!TYPE_MISMATCH{NI}!>when (flag) {
+        true -> <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>true<!>
+        else -> <!TYPE_MISMATCH{OI}!>""<!>
     }<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/when/kt10809.fir.kt b/compiler/testData/diagnostics/tests/when/kt10809.fir.kt
index 3ccd6260110..6765d688134 100644
--- a/compiler/testData/diagnostics/tests/when/kt10809.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/kt10809.fir.kt
@@ -1,6 +1,22 @@
 // !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEBUG_INFO_SMARTCAST
 // NI_EXPECTED_FILE
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 1
+ * expressions, when-expression -> paragraph 2 -> sentence 1
+ * expressions, when-expression -> paragraph 9 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
+ * expressions, conditional-expression -> paragraph 4 -> sentence 1
+ * declarations, function-declaration -> paragraph 7 -> sentence 1
+ * type-inference, smart-casts, smart-cast-types -> paragraph 9 -> sentence 1
+ * type-system, type-kinds, type-parameters -> paragraph 4 -> sentence 1
+ * type-inference, local-type-inference -> paragraph 8 -> sentence 1
+ * type-inference, local-type-inference -> paragraph 2 -> sentence 1
+ */
 
 interface Data
 interface Item
diff --git a/compiler/testData/diagnostics/tests/when/kt10809.kt b/compiler/testData/diagnostics/tests/when/kt10809.kt
index fd4baa81a4a..d7ae441fdfb 100644
--- a/compiler/testData/diagnostics/tests/when/kt10809.kt
+++ b/compiler/testData/diagnostics/tests/when/kt10809.kt
@@ -25,7 +25,7 @@ class ListData<T : Item>(val list: List<T>) : Data
 
 fun <T> listOf(vararg items: T): List<T> = null!!
 
-fun test1(o: Any) = <!OI;TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT!>when<!> (o) {
+fun test1(o: Any) = <!TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT{OI}!>when<!> (o) {
     is List<*> ->
         ListData(listOf())
     is Int -> when {
@@ -52,7 +52,7 @@ fun test1x(o: Any): Data? = when (o) {
 }
 
 fun test2() =
-        <!OI;TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT!>if<!> (true)
+        <!TYPE_INFERENCE_FAILED_ON_SPECIAL_CONSTRUCT{OI}!>if<!> (true)
             ListData(listOf())
         else
             FlagData(true)
diff --git a/compiler/testData/diagnostics/tests/when/kt4434.fir.kt b/compiler/testData/diagnostics/tests/when/kt4434.fir.kt
index 2d2809f0b0b..46abd84179d 100644
--- a/compiler/testData/diagnostics/tests/when/kt4434.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/kt4434.fir.kt
@@ -1,3 +1,13 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 5 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 1 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
+ * expressions, when-expression -> paragraph 6 -> sentence 5
+ */
+
 // KT-4434 Missed diagnostic about else branch in when
 
 package test
diff --git a/compiler/testData/diagnostics/tests/when/kt9929.fir.kt b/compiler/testData/diagnostics/tests/when/kt9929.fir.kt
index bdcef146df4..99e8a97adf9 100644
--- a/compiler/testData/diagnostics/tests/when/kt9929.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/kt9929.fir.kt
@@ -7,4 +7,4 @@ val test: Int = if (true) {
 }
 else {
     2
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/kt9929.kt b/compiler/testData/diagnostics/tests/when/kt9929.kt
index e70a58c428e..5ca2059e1ee 100644
--- a/compiler/testData/diagnostics/tests/when/kt9929.kt
+++ b/compiler/testData/diagnostics/tests/when/kt9929.kt
@@ -1,10 +1,10 @@
 // !WITH_NEW_INFERENCE
-val test: Int = if (true) <!NI;TYPE_MISMATCH!>{
+val test: Int = if (true) <!TYPE_MISMATCH{NI}!>{
     when (2) {
         1 -> 1
-        else -> <!OI;NULL_FOR_NONNULL_TYPE!>null<!>
+        else -> <!NULL_FOR_NONNULL_TYPE{OI}!>null<!>
     }
 }<!>
 else {
     2
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/kt9972.fir.kt b/compiler/testData/diagnostics/tests/when/kt9972.fir.kt
index 4db13805be5..779a4c0b0ab 100644
--- a/compiler/testData/diagnostics/tests/when/kt9972.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/kt9972.fir.kt
@@ -1,4 +1,14 @@
 // !WITH_NEW_INFERENCE
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 2 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
+ * expressions, when-expression -> paragraph 9 -> sentence 1
+ * expressions, conditional-expression -> paragraph 4 -> sentence 1
+ * expressions, conditional-expression -> paragraph 5 -> sentence 1
+ */
 
 fun test1(): Int {
     val x: String = if (true) {
@@ -16,4 +26,4 @@ fun test2(): Int {
                         else -> null
                     } ?: return 0
     return x.hashCode()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/kt9972.kt b/compiler/testData/diagnostics/tests/when/kt9972.kt
index 529f2cf3f6b..591722f3354 100644
--- a/compiler/testData/diagnostics/tests/when/kt9972.kt
+++ b/compiler/testData/diagnostics/tests/when/kt9972.kt
@@ -11,19 +11,19 @@
  */
 
 fun test1(): Int {
-    val x: String = if (true) <!NI;TYPE_MISMATCH!>{
+    val x: String = if (true) <!TYPE_MISMATCH{NI}!>{
         when {
-            true -> <!OI;TYPE_MISMATCH!>Any()<!>
-            else -> <!OI;NULL_FOR_NONNULL_TYPE!>null<!>
+            true -> <!TYPE_MISMATCH{OI}!>Any()<!>
+            else -> <!NULL_FOR_NONNULL_TYPE{OI}!>null<!>
         }
     }<!> else ""
     return x.hashCode()
 }
 
 fun test2(): Int {
-    val x: String = <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>when {
-                        true -> <!OI;TYPE_MISMATCH!>Any()<!>
+    val x: String = <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>when {
+                        true -> <!TYPE_MISMATCH{OI}!>Any()<!>
                         else -> null
                     } ?: return 0<!>
     return x.hashCode()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.fir.kt b/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.fir.kt
index 8f793c6fb58..ce5df31b6d7 100644
--- a/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.fir.kt
@@ -1,4 +1,14 @@
 // !WITH_NEW_INFERENCE
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 2 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
+ * type-system, subtyping, subtyping-rules -> paragraph 2 -> sentence 1
+ * type-inference, local-type-inference -> paragraph 2 -> sentence 1
+ * overload-resolution, determining-function-applicability-for-a-specific-call, description -> paragraph 3 -> sentence 3
+ */
 
 val test1: (String) -> Boolean =
         when {
diff --git a/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.kt b/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.kt
index 3fe94eaf418..7642b53335d 100644
--- a/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.kt
@@ -30,7 +30,7 @@ val test3: (String) -> Boolean =
 
 val test4: (String) -> Boolean =
         when {
-            true -> <!NI;TYPE_MISMATCH!>{ <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!><!UNUSED_ANONYMOUS_PARAMETER!>s1<!>, <!CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER!>s2<!><!> -> true }<!>
+            true -> <!TYPE_MISMATCH{NI}!>{ <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!><!UNUSED_ANONYMOUS_PARAMETER!>s1<!>, <!CANNOT_INFER_PARAMETER_TYPE, UNUSED_ANONYMOUS_PARAMETER!>s2<!><!> -> true }<!>
             else -> null!!
         }
 
diff --git a/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.fir.kt b/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.fir.kt
index 22c7a8247c6..f48235d51ab 100644
--- a/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.fir.kt
@@ -1,5 +1,16 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-152
+ * PRIMARY LINKS: expressions, when-expression -> paragraph 2 -> sentence 1
+ * expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
+ * declarations, function-declaration -> paragraph 7 -> sentence 1
+ * declarations, function-declaration -> paragraph 7 -> sentence 2
+ * declarations, function-declaration -> paragraph 8 -> sentence 1
+ * overload-resolution, determining-function-applicability-for-a-specific-call, description -> paragraph 1 -> sentence 3
+ */
 
 val test1 = when {
     true -> { { true } }
@@ -37,4 +48,4 @@ val test3a: () -> Boolean = when {
     true -> { { true } }
     true -> { { true } }
     else -> TODO()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.kt b/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.kt
index 4874ca7bc58..3c96278cbf4 100644
--- a/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.kt
+++ b/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.kt
@@ -12,8 +12,8 @@
  * overload-resolution, determining-function-applicability-for-a-specific-call, description -> paragraph 1 -> sentence 3
  */
 
-val <!OI;IMPLICIT_NOTHING_PROPERTY_TYPE!>test1<!> = when {
-    true -> { <!OI;TYPE_MISMATCH!>{ true }<!> }
+val <!IMPLICIT_NOTHING_PROPERTY_TYPE{OI}!>test1<!> = when {
+    true -> { <!TYPE_MISMATCH{OI}!>{ true }<!> }
     else -> TODO()
 }
 
@@ -22,10 +22,10 @@ val test1a: () -> Boolean = when {
     else -> TODO()
 }
 
-val <!OI;IMPLICIT_NOTHING_PROPERTY_TYPE!>test2<!> = when {
-    true -> { <!OI;TYPE_MISMATCH!>{ true }<!> }
+val <!IMPLICIT_NOTHING_PROPERTY_TYPE{OI}!>test2<!> = when {
+    true -> { <!TYPE_MISMATCH{OI}!>{ true }<!> }
     else -> when {
-        true -> { <!OI;TYPE_MISMATCH!>{ true }<!> }
+        true -> { <!TYPE_MISMATCH{OI}!>{ true }<!> }
         else -> TODO()
     }
 }
@@ -33,14 +33,14 @@ val <!OI;IMPLICIT_NOTHING_PROPERTY_TYPE!>test2<!> = when {
 val test2a: () -> Boolean = when {
     true -> { { true } }
     else -> when {
-        true -> { <!OI;TYPE_MISMATCH!>{ true }<!> } // TODO
+        true -> { <!TYPE_MISMATCH{OI}!>{ true }<!> } // TODO
         else -> TODO()
     }
 }
 
-val <!OI;IMPLICIT_NOTHING_PROPERTY_TYPE!>test3<!> = when {
-    true -> { <!OI;TYPE_MISMATCH!>{ true }<!> }
-    true -> { <!OI;TYPE_MISMATCH!>{ true }<!> }
+val <!IMPLICIT_NOTHING_PROPERTY_TYPE{OI}!>test3<!> = when {
+    true -> { <!TYPE_MISMATCH{OI}!>{ true }<!> }
+    true -> { <!TYPE_MISMATCH{OI}!>{ true }<!> }
     else -> TODO()
 }
 
@@ -48,4 +48,4 @@ val test3a: () -> Boolean = when {
     true -> { { true } }
     true -> { { true } }
     else -> TODO()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.kt b/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.kt
index 0d47fae1499..b84f5e7c54e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.kt
@@ -1,14 +1,14 @@
 // !WITH_NEW_INFERENCE
 
 fun test(mc: MutableCollection<out CharSequence>) {
-    mc.addAll(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>mc<!>)
+    mc.addAll(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>mc<!>)
 
-    mc.addAll(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>arrayListOf<CharSequence>()<!>)
+    mc.addAll(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>arrayListOf<CharSequence>()<!>)
     mc.addAll(arrayListOf())
 
-    mc.addAll(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>listOf("")<!>)
-    mc.addAll(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>listOf<String>("")<!>)
-    mc.addAll(<!NI;TYPE_MISMATCH, OI;TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS!>listOf<CharSequence>("")<!>)
+    mc.addAll(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>listOf("")<!>)
+    mc.addAll(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>listOf<String>("")<!>)
+    mc.addAll(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>listOf<CharSequence>("")<!>)
 
     mc.addAll(emptyList())
     mc.addAll(emptyList<Nothing>())
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmNameOnMangledNames.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmNameOnMangledNames.fir.kt
index aaf1391ee81..c936aeb4b86 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmNameOnMangledNames.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmNameOnMangledNames.fir.kt
@@ -27,4 +27,4 @@ class C {
 }
 
 @JvmName("extensionFun")
-fun Foo.extensionFun() {}
\ No newline at end of file
+fun Foo.extensionFun() {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.fir.kt
index eebe8baba18..a5d2bdf8807 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.fir.kt
@@ -1,4 +1,4 @@
 // !WITH_NEW_INFERENCE
 // See KT-15839
 
-val x = "1".let(@Suppress("DEPRECATION") Integer::parseInt)
\ No newline at end of file
+val x = "1".let(@Suppress("DEPRECATION") Integer::parseInt)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.kt
index 8f2a2593ab0..5a5c919edf5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.kt
@@ -1,4 +1,4 @@
 // !WITH_NEW_INFERENCE
 // See KT-15839
 
-val x = "1".let(@<!NI;DEBUG_INFO_MISSING_UNRESOLVED!>Suppress<!>("DEPRECATION") Integer::parseInt)
\ No newline at end of file
+val x = "1".let(@<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>Suppress<!>("DEPRECATION") Integer::parseInt)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt
index a4fbc2da293..ae79a26a374 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt
@@ -6,6 +6,6 @@ public @interface A {
 }
 
 // FILE: b.kt
-@A(*<!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf(<!NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, "b")<!>)
+@A(*<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>arrayOf(<!CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>1<!>, "b")<!>)
 fun test() {
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt
index f19fe4b86e5..b6c06233464 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt
@@ -2,6 +2,6 @@
 
 annotation class B(vararg val args: String)
 
-@B(*<!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf(<!NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>, "b")<!>)
+@B(*<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>arrayOf(<!CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>1<!>, "b")<!>)
 fun test() {
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt
index 28b7b07b3fb..25304cc7a88 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt
@@ -59,4 +59,4 @@ class <!JVM_DEFAULT_THROUGH_INHERITANCE!>ManySupers2<!>: Foo2(), C {
         super<C>.<!USAGE_OF_JVM_DEFAULT_THROUGH_SUPER_CALL!>test<!>()
         <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>test<!>()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.kt
index 3d45621274f..a5d59fbb61a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.kt
@@ -14,7 +14,7 @@ class MyClass1
 @Ann1(arrayOf(Any::class))
 class MyClass1a
 
-@Ann1(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf(<!NI;TYPE_MISMATCH!>B1::class<!>)<!>)
+@Ann1(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>arrayOf(<!TYPE_MISMATCH{NI}!>B1::class<!>)<!>)
 class MyClass2
 
 annotation class Ann2(val arg: Array<KClass<in B1>>)
@@ -25,5 +25,5 @@ class MyClass3
 @Ann2(arrayOf(B1::class))
 class MyClass4
 
-@Ann2(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf(<!NI;TYPE_MISMATCH!>B2::class<!>)<!>)
+@Ann2(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>arrayOf(<!TYPE_MISMATCH{NI}!>B2::class<!>)<!>)
 class MyClass5
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.kt
index b0f09ecd02e..50c73321702 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.kt
@@ -11,7 +11,7 @@ annotation class Ann1(val arg: Array<KClass<out A>>)
 @Ann1(arrayOf(A::class))
 class MyClass1
 
-@Ann1(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf(<!NI;TYPE_MISMATCH!>Any::class<!>)<!>)
+@Ann1(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>arrayOf(<!TYPE_MISMATCH{NI}!>Any::class<!>)<!>)
 class MyClass1a
 
 @Ann1(arrayOf(B1::class))
@@ -19,11 +19,11 @@ class MyClass2
 
 annotation class Ann2(val arg: Array<KClass<out B1>>)
 
-@Ann2(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf(<!NI;TYPE_MISMATCH!>A::class<!>)<!>)
+@Ann2(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>arrayOf(<!TYPE_MISMATCH{NI}!>A::class<!>)<!>)
 class MyClass3
 
 @Ann2(arrayOf(B1::class))
 class MyClass4
 
-@Ann2(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>arrayOf(<!NI;TYPE_MISMATCH!>B2::class<!>)<!>)
+@Ann2(<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>arrayOf(<!TYPE_MISMATCH{NI}!>B2::class<!>)<!>)
 class MyClass5
diff --git a/compiler/testData/diagnostics/testsWithStdLib/assert/cast.kt b/compiler/testData/diagnostics/testsWithStdLib/assert/cast.kt
index 55e2e594208..5210167b086 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/assert/cast.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/assert/cast.kt
@@ -11,11 +11,11 @@ class B: A {
 
 fun test1(a: A) {
     assert((a as B).bool())
-    <!NI;DEBUG_INFO_SMARTCAST!>a<!>.<!OI;UNRESOLVED_REFERENCE!>bool<!>()
+    <!DEBUG_INFO_SMARTCAST{NI}!>a<!>.<!UNRESOLVED_REFERENCE{OI}!>bool<!>()
 }
 
 fun test2() {
     val a: A? = null;
     assert((a as B).bool())
-    <!NI;DEBUG_INFO_SMARTCAST!>a<!><!NI;UNNECESSARY_SAFE_CALL!>?.<!><!OI;UNRESOLVED_REFERENCE!>bool<!>()
+    <!DEBUG_INFO_SMARTCAST{NI}!>a<!><!UNNECESSARY_SAFE_CALL{NI}!>?.<!><!UNRESOLVED_REFERENCE{OI}!>bool<!>()
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.kt b/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.kt
index e66f96c8efd..eca2c5f8a5d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.kt
@@ -5,34 +5,34 @@
 
 fun test1(s: String?) {
     assert(s!!.isEmpty())
-    s<!NI;UNNECESSARY_SAFE_CALL!>?.<!>length
+    s<!UNNECESSARY_SAFE_CALL{NI}!>?.<!>length
 }
 
 fun test2(s: String?) {
     assert(s!!.isEmpty())
-    s<!NI;UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+    s<!UNNECESSARY_NOT_NULL_ASSERTION{NI}!>!!<!>.length
 }
 
 fun test3(s: String?) {
     assert(s!!.isEmpty())
-    <!NI;DEBUG_INFO_SMARTCAST!>s<!><!OI;UNSAFE_CALL!>.<!>length
+    <!DEBUG_INFO_SMARTCAST{NI}!>s<!><!UNSAFE_CALL{OI}!>.<!>length
 }
 
 fun test4() {
     val s: String? = null;
     assert(s!!.isEmpty())
-    s<!NI;UNNECESSARY_SAFE_CALL!>?.<!>length
+    s<!UNNECESSARY_SAFE_CALL{NI}!>?.<!>length
 }
 
 fun test5() {
     val s: String? = null;
     assert(s!!.isEmpty())
-    s<!NI;UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.length
+    s<!UNNECESSARY_NOT_NULL_ASSERTION{NI}!>!!<!>.length
 }
 
 fun test6() {
     val s: String? = null;
     assert(s!!.isEmpty())
-    <!NI;DEBUG_INFO_SMARTCAST!>s<!><!OI;UNSAFE_CALL!>.<!>length
+    <!DEBUG_INFO_SMARTCAST{NI}!>s<!><!UNSAFE_CALL{OI}!>.<!>length
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/commonCollections.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/commonCollections.fir.kt
index 0e42f2f16b9..905eb9f1aa8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/commonCollections.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/commonCollections.fir.kt
@@ -28,4 +28,4 @@ fun foo() {
     hm[""]
 
     hm.remove("")
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/commonCollections.kt b/compiler/testData/diagnostics/testsWithStdLib/commonCollections.kt
index c5ae9f45219..361426dc751 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/commonCollections.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/commonCollections.kt
@@ -5,7 +5,7 @@ import java.util.*
 fun foo() {
     val al = ArrayList<String>()
     al.size
-    al.<!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>contains<!>(<!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
+    al.<!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>contains<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>1<!>)
     al.contains("")
 
     al.remove("")
@@ -13,7 +13,7 @@ fun foo() {
 
     val hs = HashSet<String>()
     hs.size
-    hs.<!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>contains<!>(<!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
+    hs.<!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>contains<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>1<!>)
     hs.contains("")
 
     hs.remove("")
@@ -21,11 +21,11 @@ fun foo() {
 
     val hm = HashMap<String, Int>()
     hm.size
-    hm.<!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>containsKey<!>(<!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>)
+    hm.<!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>containsKey<!>(<!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>1<!>)
     hm.containsKey("")
 
-    <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>hm[<!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!>]<!>
+    <!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>hm[<!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>1<!>]<!>
     hm[""]
 
     hm.remove("")
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchs.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchs.kt
index 429e24dd162..5896a2a50a7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchs.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/nestedTryCatchs.kt
@@ -44,4 +44,4 @@ fun innerTryCatchInitializes() {
     }
     // Here x=I because outer try-catch either exited normally (x=I) or catched exception (x=I, with reassingment, though)
     x.inc()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/throwIfNotCalled.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/throwIfNotCalled.kt
index 33907cea37c..b015db64a14 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/throwIfNotCalled.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/controlflow/flowInlining/throwIfNotCalled.kt
@@ -45,4 +45,4 @@ fun catchThrowIfNotCalled() {
 
     // x *isn't* initialized here!
     println(<!UNINITIALIZED_VARIABLE!>x<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver.kt
index c4af95ceeab..3ea7f80c23d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver.kt
@@ -35,4 +35,4 @@ fun mixedReceiver(s: String?) {
             <!UNSAFE_CALL!>length<!>
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver_after.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver_after.kt
index 3e0213fe764..9e6713cb635 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver_after.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/extensionReceiver_after.kt
@@ -35,4 +35,4 @@ fun mixedReceiver(s: String?) {
             <!UNSAFE_CALL!>length<!>
         }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.kt
index 29b5a273c70..81a0eccec94 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.kt
@@ -6,7 +6,7 @@ import kotlin.reflect.KProperty
 fun testLambdaArgumentSmartCast(foo: Int?) {
     val v = run {
         if (foo != null)
-            return@run <!NI;DEBUG_INFO_SMARTCAST!>foo<!>
+            return@run <!DEBUG_INFO_SMARTCAST{NI}!>foo<!>
         15
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.kt
index 36e561b161c..72a7ff346dd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.kt
@@ -42,4 +42,4 @@ fun testDeMorgan2(x: Any?) {
         <!DEBUG_INFO_SMARTCAST!>x<!>.length
         <!DEBUG_INFO_SMARTCAST!>x<!>.inc()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.kt
index 3aad95c869b..247bcf9074c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.kt
@@ -54,4 +54,4 @@ fun testNotNullWhenNotNull (x: Int?) {
     }
 
     x<!UNSAFE_CALL!>.<!>dec()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.kt
index 1cc38efdac6..38ba78827b5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.kt
@@ -78,4 +78,4 @@ fun falsefalse(x: Any?) {
         x.<!UNRESOLVED_REFERENCE!>length<!>
         x.<!UNRESOLVED_REFERENCE_WRONG_RECEIVER!>inc<!>()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.kt
index c9b7b2d305c..42ea9a96433 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.kt
@@ -75,4 +75,4 @@ fun falsefalse(x: Any?) {
         <!DEBUG_INFO_SMARTCAST!>x<!>.length
         <!DEBUG_INFO_SMARTCAST!>x<!>.inc()
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.fir.kt
index 9aacb4b796b..93bc5b88964 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.fir.kt
@@ -34,4 +34,4 @@ val test3 = generate {
 
 interface A
 object B : A
-object C : A
\ No newline at end of file
+object C : A
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt
index c19433676f1..8aee3020c07 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt
@@ -9,21 +9,21 @@ class Controller<T> {
 
 fun <S> generate(g: suspend Controller<S>.() -> Unit): S = TODO()
 
-val test1 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test1 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     apply {
         yield(4)
     }
 }
 
-val test2 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test2 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     yield(B)
     apply {
         yield(C)
     }
 }
 
-val test3 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
-    this.<!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>let<!> {
+val test3 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
+    this.<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>let<!> {
         yield(B)
     }
 
@@ -34,4 +34,4 @@ val test3 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_N
 
 interface A
 object B : A
-object C : A
\ No newline at end of file
+object C : A
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/callableReferenceToASuspendFunction.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/callableReferenceToASuspendFunction.kt
index fe50e80173d..930e6240889 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/callableReferenceToASuspendFunction.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/callableReferenceToASuspendFunction.kt
@@ -19,4 +19,4 @@ fun test() {
 
     test0(<!TYPE_MISMATCH!>::bar<!>)
     test1(::bar)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt
index d8915915fa1..da066ee810a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt
@@ -59,4 +59,4 @@ val test7 = generate {
 
 val test8 = generate {
     safeExtension()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
index 492567df776..ffdda40308c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
@@ -29,7 +29,7 @@ val test1 = generate {
     baseExtension()
 }
 
-val test2 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test2 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     baseExtension()
 }
 
@@ -38,25 +38,25 @@ val test3 = generate {
     outNullableAnyExtension()
 }
 
-val test4 = <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test4 = <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     outNullableAnyExtension()
 }
 
-val test5 = <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test5 = <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     yield(42)
     outAnyExtension()
 }
 
-val test6 = <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test6 = <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     yield("bar")
     invNullableAnyExtension()
 }
 
-val test7 = <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
-    yield(<!NI;TYPE_MISMATCH!>"baz"<!>)
+val test7 = <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
+    yield(<!TYPE_MISMATCH{NI}!>"baz"<!>)
     genericExtension<Int>()
 }
 
 val test8 = generate {
     safeExtension()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.fir.kt
index d81a3c85025..7811e1ce8ef 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.fir.kt
@@ -49,4 +49,4 @@ val test5 = generateSpecific {
 
 val test6 = generateSpecific {
     stringBase()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt
index dbab0a5e154..0b971c8be82 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt
@@ -28,11 +28,11 @@ val test1 = generate {
     yield("foo")
 }
 
-val test2 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test2 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     starBase()
 }
 
-val test3 = <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test3 = <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     yield("bar")
     stringBase()
 }
@@ -47,6 +47,6 @@ val test5 = generateSpecific {
     stringBase()
 }
 
-val test6 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generateSpecific<!> {
+val test6 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generateSpecific<!> {
     stringBase()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.fir.kt
index cf1b8c54790..955a0c766fd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.fir.kt
@@ -33,4 +33,4 @@ val test3 = generate {
 val test4 = generate {
     yield(3)
     barReturnType()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.kt
index 867437b8ba7..befdfa9876a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.kt
@@ -25,12 +25,12 @@ val test2 = generate {
     notYield(3)
 }
 
-val test3 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test3 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     yield(3)
     yieldBarReturnType(3)
 }
 
-val test4 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test4 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     yield(3)
     barReturnType()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.kt
index 6b0fbee7b15..37c751dc857 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.kt
@@ -17,11 +17,11 @@ val member = build {
     add(42)
 }
 
-val memberWithoutAnn = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>wrongBuild<!> {
+val memberWithoutAnn = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>wrongBuild<!> {
     <!ILLEGAL_SUSPEND_FUNCTION_CALL!>add<!>(42)
 }
 
-val extension = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>build<!> {
+val extension = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>build<!> {
     extensionAdd("foo")
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.fir.kt
index f55f52aba1a..a6573fc2c0f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt35684.fir.kt
@@ -32,4 +32,4 @@ interface Inv<T> {
     fun yield(element: T)
 }
 
-fun <K> materialize(): Inv<K> = TODO()
\ No newline at end of file
+fun <K> materialize(): Inv<K> = TODO()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.fir.kt
index bd5060ad377..08380daa150 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.fir.kt
@@ -17,4 +17,4 @@ fun main() {
         parse { it.toInt() }
         serialize { it.toString() }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt
index c8ed5d607a5..f6cf08db1ce 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt
@@ -13,8 +13,8 @@ class TypeDefinition<KotlinType : Any> {
 fun <KotlinType : Any> defineType(@BuilderInference definition: TypeDefinition<KotlinType>.() -> Unit): Unit = TODO()
 
 fun main() {
-    <!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>defineType<!> {
+    <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>defineType<!> {
         parse { it.toInt() }
-        serialize { <!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>it<!>.<!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>toString<!>() }
+        serialize { <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}!>it<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}!>toString<!>() }
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41308.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41308.fir.kt
index 14e081cacc7..f31747fa9b1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41308.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt41308.fir.kt
@@ -4,6 +4,6 @@ fun main() {
     sequence {
         val list: List<String>? = null
         val outputList = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.List<kotlin.String>")!>list ?: listOf()<!>
-        yieldAll(outputList)
+        <!NONE_APPLICABLE!>yieldAll<!>(outputList)
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.fir.kt
index c2f11e09f17..ad6c02c3c56 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.fir.kt
@@ -21,4 +21,4 @@ val test1 = generate {
     yieldGenerate {
         yield(4)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
index 7be80eb1d6e..343ff7160d9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
@@ -18,7 +18,7 @@ suspend fun <S> GenericController<List<S>>.yieldGenerate(g: suspend GenericContr
 
 val test1 = generate {
     // TODO: KT-15185
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR, OI;TYPE_MISMATCH!>yieldGenerate<!> {
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}, TYPE_MISMATCH{OI}!>yieldGenerate<!> {
         yield(4)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.kt
index e79f2c2119c..1a8fad0022b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.kt
@@ -24,11 +24,11 @@ val member = build {
     add(42)
 }
 
-val memberWithoutAnn = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>wrongBuild<!> {
+val memberWithoutAnn = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>wrongBuild<!> {
     add(42)
 }
 
-val extension = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>build<!> {
+val extension = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>build<!> {
     extensionAdd("foo")
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt
index 32d9df49a67..7da1401ab2a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt
@@ -21,4 +21,4 @@ val test1 = generate {
 
 val test2: Int = generate {
     yield(A())
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt
index 006b57f0ff3..e55c7eb1b07 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt
@@ -15,10 +15,10 @@ fun <S> generate(@BuilderInference g: suspend Controller<S>.() -> Unit): S = TOD
 
 class A
 
-val test1 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test1 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     yield(<!NO_COMPANION_OBJECT!>A<!>)
 }
 
-val test2: Int = <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>generate {
-    yield(<!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>A()<!>)
-}<!>
\ No newline at end of file
+val test2: Int = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>generate {
+    yield(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>A()<!>)
+}<!>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.fir.kt
index 7a585a63ab7..5cb3cc89a30 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.fir.kt
@@ -10,4 +10,4 @@ fun <S : Number> generate(g: suspend Controller<S>.() -> Unit): S = TODO()
 
 val test = generate {
     <!INAPPLICABLE_CANDIDATE!>yield<!>("foo")
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.kt
index 78b722505fc..cef8b8759be 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.kt
@@ -8,6 +8,6 @@ class Controller<T : Number> {
 
 fun <S : Number> generate(g: suspend Controller<S>.() -> Unit): S = TODO()
 
-val test = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     yield("foo")
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.fir.kt
index db4efb8fc5d..897aceff9c5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.fir.kt
@@ -30,4 +30,4 @@ val extension = generate {
 
 val safeExtension = generate {
     safeExtensionYield("foo")
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.kt
index bc2077c95d0..ed52208c740 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.kt
@@ -24,10 +24,10 @@ val normal = generate {
     yield(42)
 }
 
-val extension = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val extension = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     extensionYield("foo")
 }
 
 val safeExtension = generate {
     safeExtensionYield("foo")
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.kt
index d085841f48e..ccd4f6cae80 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.kt
@@ -8,7 +8,7 @@ class GenericController<T> {
 
 fun <S> generate(g: suspend GenericController<S>.(S) -> Unit): S = TODO()
 
-val test1 = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>generate<!> {
+val test1 = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>generate<!> {
     yield(4)
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.fir.kt
index 8061049251e..f0ee16f3589 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.fir.kt
@@ -16,4 +16,4 @@ suspend fun fib(n: Long) =
             n < 2 -> n
             else -> fib(n - 1).<!UNRESOLVED_REFERENCE!>await<!>() <!AMBIGUITY!>+<!> fib(n - 2).<!UNRESOLVED_REFERENCE!>await<!>()
         }
-    }
\ No newline at end of file
+    }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt
index 893ff1442e1..508c6b911a0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt
@@ -14,6 +14,6 @@ suspend fun fib(n: Long) =
     async {
         when {
             n < 2 -> n
-            else -> <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED!>fib<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>n<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>-<!> 1)<!>.<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>await<!>() <!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>+<!> fib(n - 2).<!NI;DEBUG_INFO_MISSING_UNRESOLVED, OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>await<!>()
+            else -> <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED!>fib<!>(<!DEBUG_INFO_MISSING_UNRESOLVED!>n<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>-<!> 1)<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>await<!>() <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>+<!> fib(n - 2).<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>await<!>()
         }
-    }
\ No newline at end of file
+    }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.kt
index bfa44b2e1eb..91441f5f00d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.kt
@@ -21,7 +21,7 @@ fun foo() {
     builder { 1 }
 
     val x = { 1 }
-    builder(<!NI;UNSUPPORTED_FEATURE, OI;TYPE_MISMATCH!>x<!>)
+    builder(<!TYPE_MISMATCH{OI}, UNSUPPORTED_FEATURE{NI}!>x<!>)
     builder({1} <!UNCHECKED_CAST!>as (suspend () -> Int)<!>)
 
     var i: Int = 1
@@ -29,10 +29,10 @@ fun foo() {
     i = genericBuilder { 1 }
     genericBuilder { 1 }
     genericBuilder<Int> { 1 }
-    genericBuilder<Int> { <!NI;TYPE_MISMATCH, TYPE_MISMATCH!>""<!> }
+    genericBuilder<Int> { <!TYPE_MISMATCH{NI}, TYPE_MISMATCH!>""<!> }
 
     val y = { 1 }
-    <!OI;TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR!>genericBuilder<!>(<!NI;UNSUPPORTED_FEATURE, OI;TYPE_MISMATCH!>y<!>)
+    <!TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR{OI}!>genericBuilder<!>(<!TYPE_MISMATCH{OI}, UNSUPPORTED_FEATURE{NI}!>y<!>)
 
     unitBuilder {}
     unitBuilder { <!UNUSED_EXPRESSION!>1<!> }
@@ -44,7 +44,7 @@ fun foo() {
     val s: String = manyArgumentsBuilder({}, { "" }) { 1 }
 
     manyArgumentsBuilder<String>({}, { "" }, { 1 })
-    manyArgumentsBuilder<String>({}, { <!CONSTANT_EXPECTED_TYPE_MISMATCH, NI;CONSTANT_EXPECTED_TYPE_MISMATCH!>1<!> }, { 2 })
+    manyArgumentsBuilder<String>({}, { <!CONSTANT_EXPECTED_TYPE_MISMATCH, CONSTANT_EXPECTED_TYPE_MISMATCH{NI}!>1<!> }, { 2 })
 
     severalParamsInLambda { <!NAME_SHADOWING!>x<!>, <!NAME_SHADOWING!>y<!> ->
         x checkType { _<String>() }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt
index 17d3cb1ef20..39228ce35c4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt
@@ -19,7 +19,7 @@ class Controller {
     suspend fun yieldString(value: String) = suspendCoroutineUninterceptedOrReturn<Int> {
         it.resume(1)
         it checkType { _<Continuation<Int>>() }
-        it.<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>resume<!>(<!NI;TYPE_MISMATCH!>""<!>)
+        it.<!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>resume<!>(<!TYPE_MISMATCH{NI}!>""<!>)
 
         // We can return anything here, 'suspendCoroutineUninterceptedOrReturn' is not very type-safe
         // Also we can call resume and then return the value too, but it's still just our problem
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn_1_2.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn_1_2.kt
index 3ca0e0a7f13..35cb9f5f308 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn_1_2.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn_1_2.kt
@@ -20,7 +20,7 @@ class Controller {
     suspend fun yieldString(value: String) = suspendCoroutineUninterceptedOrReturn<Int> {
         it.resume(1)
         it checkType { _<Continuation<Int>>() }
-        it.<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>resume<!>(<!NI;TYPE_MISMATCH!>""<!>)
+        it.<!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>resume<!>(<!TYPE_MISMATCH{NI}!>""<!>)
 
         // We can return anything here, 'suspendCoroutineUninterceptedOrReturn' is not very type-safe
         // Also we can call resume and then return the value too, but it's still just our problem
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.kt
index 480695aa678..b804a66d71b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.kt
@@ -36,7 +36,7 @@ fun test() {
 
         severalParams("", 89) checkType { _<Double>() }
         // TODO: should we allow somehow to call with passing continuation explicitly?
-        severalParams("", 89, <!TOO_MANY_ARGUMENTS!>6.9<!>) checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_MISMATCH!>_<!><Unit>() }
+        severalParams("", 89, <!TOO_MANY_ARGUMENTS!>6.9<!>) checkType { <!TYPE_MISMATCH{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Unit>() }
 
         "".stringReceiver(1)
         Any().anyReceiver(1)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.fir.kt
index 7a39863d161..d0379d3dd47 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.fir.kt
@@ -1,4 +1,4 @@
-// JAVAC_SKIP
+// SKIP_JAVAC
 typealias Test1 = <!UNRESOLVED_REFERENCE!>SuspendFunction0<Unit><!>
 typealias Test2 = <!UNRESOLVED_REFERENCE!>kotlin.SuspendFunction0<Unit><!>
-typealias Test3 = kotlin.coroutines.SuspendFunction0<Unit>
\ No newline at end of file
+typealias Test3 = kotlin.coroutines.SuspendFunction0<Unit>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.kt
index 0ca30dc5602..59bd0c5fce7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctionType/suspendFunctionN.kt
@@ -1,4 +1,4 @@
-// JAVAC_SKIP
+// SKIP_JAVAC
 typealias Test1 = <!UNRESOLVED_REFERENCE!>SuspendFunction0<!><Unit>
 typealias Test2 = kotlin.<!UNRESOLVED_REFERENCE!>SuspendFunction0<!><Unit>
-typealias Test3 = kotlin.coroutines.SuspendFunction0<Unit>
\ No newline at end of file
+typealias Test3 = kotlin.coroutines.SuspendFunction0<Unit>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt
index 86402fb4a75..4b5b776aa61 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt
@@ -37,7 +37,7 @@ fun test() {
         severalParams("", 89) checkType { _<Double>() }
 
         // TODO: should we allow somehow to call with passing continuation explicitly?
-        severalParams("", 89, <!TOO_MANY_ARGUMENTS!>6.9<!>) checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Unit>() }
-        severalParams("", 89, <!TOO_MANY_ARGUMENTS!>this <!CAST_NEVER_SUCCEEDS!>as<!> Continuation<Double><!>) checkType { <!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;DEBUG_INFO_UNRESOLVED_WITH_TARGET, OI;UNRESOLVED_REFERENCE_WRONG_RECEIVER!>_<!><Unit>() }
+        severalParams("", 89, <!TOO_MANY_ARGUMENTS!>6.9<!>) checkType { <!DEBUG_INFO_UNRESOLVED_WITH_TARGET{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Unit>() }
+        severalParams("", 89, <!TOO_MANY_ARGUMENTS!>this <!CAST_NEVER_SUCCEEDS!>as<!> Continuation<Double><!>) checkType { <!DEBUG_INFO_UNRESOLVED_WITH_TARGET{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>_<!><Unit>() }
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt
index cdbc394658d..4e92e90e6b1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt
@@ -8,10 +8,10 @@ fun <T> genericBuilder(c: suspend () -> T): T = null!!
 fun foo() {
     var result = ""
     genericBuilder<String> {
-        <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>try {
+        <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>try {
             await("")
         } catch(e: Exception) {
-            <!OI;EXPECTED_TYPE_MISMATCH!>result = "fail"<!>
+            <!EXPECTED_TYPE_MISMATCH{OI}!>result = "fail"<!>
         }<!>
     }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.fir.kt
index 9c95f9f8929..646570072b9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.fir.kt
@@ -16,4 +16,4 @@ public class P {
 fun foo(c: P): MutableList<Int> {
     // Error should be here: see KT-8168 Typechecker fails for platform collection type
     return c.getList() ?: listOf()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.kt b/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.kt
index 5a339692f2f..8fcea40f606 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.kt
@@ -15,5 +15,5 @@ public class P {
 
 fun foo(c: P): MutableList<Int> {
     // Error should be here: see KT-8168 Typechecker fails for platform collection type
-    return <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>c.getList() ?: <!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH, OI;TYPE_MISMATCH!>listOf()<!><!>
-}
\ No newline at end of file
+    return <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>c.getList() ?: <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{OI}!>listOf()<!><!>
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalOnWholeModule.txt b/compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalOnWholeModule.txt
index 0a986b5f95c..5c2ed887dd5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalOnWholeModule.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalOnWholeModule.txt
@@ -12,10 +12,10 @@ package api {
     }
 }
 
-
 // -- Module: <usage> --
 package
 
 package usage {
     public fun use(): kotlin.Unit
 }
+
diff --git a/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalOnWholeModule.txt b/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalOnWholeModule.txt
index f3f4d5ae8c3..a9e0900d491 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalOnWholeModule.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/experimental/useExperimentalOnWholeModule.txt
@@ -12,10 +12,10 @@ package api {
     }
 }
 
-
 // -- Module: <usage> --
 package
 
 package usage {
     public fun use(): kotlin.Unit
 }
+
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt
index c24133ec13b..51f9e0c49da 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.fir.kt
@@ -20,17 +20,17 @@ fun takeString(s: String) {}
 fun takeInt(s: Int) {}
 
 fun test_1() {
-    val x = create { "" }
+    val x = <!AMBIGUITY!>create<!> { "" }
     takeString(x)
 }
 
 fun test_2() {
-    val x = create { 1 }
+    val x = <!AMBIGUITY!>create<!> { 1 }
     takeInt(x)
 }
 
 fun test_3() {
-    val x = create { 1.0 }
+    val x = <!AMBIGUITY!>create<!> { 1.0 }
 }
 
 @OverloadResolutionByLambdaReturnType
@@ -38,11 +38,11 @@ fun <K> create(x: K, f: (K) -> Int): Int = 1
 fun <T> create(x: T, f: (T) -> String): String = ""
 
 fun test_4() {
-    val x = create("") { "" }
+    val x = <!AMBIGUITY!>create<!>("") { "" }
     takeString(x)
 }
 
 fun test_5() {
-    val x = create("") { 1 }
+    val x = <!AMBIGUITY!>create<!>("") { 1 }
     takeInt(x)
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt
index 2e15db0c30b..aa9d33be560 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/overloadByLambdaReturnType_disabled.kt
@@ -45,4 +45,4 @@ fun test_4() {
 fun test_5() {
     val x = <!OVERLOAD_RESOLUTION_AMBIGUITY!>create<!>("") { 1 }
     takeInt(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>x<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.fir.kt
index 71bd847a1a7..86f3ab3c156 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.fir.kt
@@ -31,4 +31,4 @@ fun test3(word: String) =
             else {
                 System.out?.println(word) // Unit?
             }
-        }
\ No newline at end of file
+        }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.kt b/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.kt
index 4354adc0bc2..ac420b4dd63 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.kt
@@ -6,20 +6,20 @@ val smallWords = hashSetOf<String>()
 fun test1(word: String) =
         run {
             if (word.length > 4) {
-                <!OI;IMPLICIT_CAST_TO_ANY!>longWords++<!>
+                <!IMPLICIT_CAST_TO_ANY{OI}!>longWords++<!>
             }
             else {
-                <!OI;IMPLICIT_CAST_TO_ANY!>smallWords.add(word)<!>
+                <!IMPLICIT_CAST_TO_ANY{OI}!>smallWords.add(word)<!>
             }
         }
 
 fun test2(word: String) =
         run {
             if (word.length > 4) {
-                <!INVALID_IF_AS_EXPRESSION!>if<!> (word.startsWith("a")) <!OI;IMPLICIT_CAST_TO_ANY!>longWords++<!>
+                <!INVALID_IF_AS_EXPRESSION!>if<!> (word.startsWith("a")) <!IMPLICIT_CAST_TO_ANY{OI}!>longWords++<!>
             }
             else {
-                <!OI;IMPLICIT_CAST_TO_ANY!>smallWords.add(word)<!>
+                <!IMPLICIT_CAST_TO_ANY{OI}!>smallWords.add(word)<!>
             }
         }
 
@@ -31,4 +31,4 @@ fun test3(word: String) =
             else {
                 System.out?.println(word) // Unit?
             }
-        }
\ No newline at end of file
+        }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.fir.kt
index 8f28742410d..ea3d533660e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.fir.kt
@@ -9,4 +9,4 @@ fun test1(l: List<Number>) {
     val i: Int = l.firstTyped()
 
     val s: String = l.firstTyped()
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt
index 9d67807de36..613f83cb9cd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt
@@ -8,5 +8,5 @@ fun test1(l: List<Number>) {
 
     val i: Int = l.firstTyped()
 
-    val s: String = l.<!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>firstTyped()<!>
-}
\ No newline at end of file
+    val s: String = l.<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>firstTyped()<!>
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotationWithUpperBoundConstraint.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotationWithUpperBoundConstraint.kt
index 3a37dabbd40..032a420dbde 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotationWithUpperBoundConstraint.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotationWithUpperBoundConstraint.kt
@@ -14,4 +14,4 @@ fun test() {
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>r2<!>
 
     map.getOrDefault_Exact("y", <!TYPE_MISMATCH, TYPE_MISMATCH!>"string"<!>)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.kt
index 12be925638c..3412d85ca5e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.kt
@@ -18,6 +18,6 @@ fun <@kotlin.internal.OnlyInputTypes T : Base> fooB(a: T, b: T) {}
 
 fun usage(x: CX, y: CY) {
     <!TYPE_INFERENCE_ONLY_INPUT_TYPES!>foo<!>(x, y) // expected err, got err
-    <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>fooA<!>(x, y) // expected err, got ok
-    <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>fooB<!>(x, y) // expected err, got ok
-}
\ No newline at end of file
+    <!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>fooA<!>(x, y) // expected err, got ok
+    <!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>fooB<!>(x, y) // expected err, got ok
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.fir.kt
index 9e4250b2230..e9c32749674 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.fir.kt
@@ -29,4 +29,4 @@ fun test_5(map: Map<B, Int>, a: A) {
 
 fun test_6(map: Map<A, Int>, b: B) {
     map.get(b)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.kt
index 35efb85fc5b..d95d4862396 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.kt
@@ -4,7 +4,7 @@
 // ISSUE: KT-29307
 
 fun test_1(map: Map<String, String>) {
-    val x = <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>map[<!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!>]<!> // OK
+    val x = <!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>map[<!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>42<!>]<!> // OK
 }
 
 open class A
@@ -12,7 +12,7 @@ open class A
 class B : A()
 
 fun test_2(map: Map<A, String>) {
-    val x = <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>map[<!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>42<!>]<!>
+    val x = <!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>map[<!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>42<!>]<!>
 }
 
 fun test_3(m: Map<*, String>) {
@@ -29,4 +29,4 @@ fun test_5(map: Map<B, Int>, a: A) {
 
 fun test_6(map: Map<A, Int>, b: B) {
     map.get(b)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.kt
index 81f5d829ff4..2a1a51baed4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.kt
@@ -11,6 +11,6 @@ public fun <T> Iterable<T>.contains1(element: @kotlin.internal.NoInfer T): Boole
 
 
 fun test() {
-    val a: Boolean = listOf(1).<!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>contains1<!>(<!TYPE_MISMATCH!>""<!>)
+    val a: Boolean = listOf(1).<!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>contains1<!>(<!TYPE_MISMATCH!>""<!>)
     val b: Boolean = listOf(1).contains1(1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.fir.kt
index dc5e2fb9d17..e1de728cd58 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.fir.kt
@@ -30,4 +30,4 @@ fun <T> assertEquals1(e1: T, e2: @kotlin.internal.NoInfer T): Boolean = true
 
 fun test(s: String) {
     assertEquals1(s, 11)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt
index b46a6e56057..1b52856d113 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt
@@ -11,23 +11,23 @@ fun <T> @kotlin.internal.NoInfer T.test2(t1: T): T = t1
 fun <T> test3(t1: @kotlin.internal.NoInfer T): T = t1
 
 fun usage() {
-    <!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>test1<!>(1, <!TYPE_MISMATCH!>"312"<!>)
-    <!OI;TYPE_MISMATCH!>1<!>.<!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>test2<!>("")
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>test3<!>("")
+    <!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>test1<!>(1, <!TYPE_MISMATCH!>"312"<!>)
+    <!TYPE_MISMATCH{OI}!>1<!>.<!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>test2<!>("")
+    <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>test3<!>("")
 }
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 fun <T> List<T>.contains1(e: @kotlin.internal.NoInfer T): Boolean = true
 
 fun test(i: Int?, a: Any, l: List<Int>) {
-    l.<!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>contains1<!>(<!TYPE_MISMATCH!>a<!>)
-    l.<!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>contains1<!>(<!TYPE_MISMATCH!>""<!>)
-    l.<!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>contains1<!>(<!TYPE_MISMATCH!>i<!>)
+    l.<!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>contains1<!>(<!TYPE_MISMATCH!>a<!>)
+    l.<!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>contains1<!>(<!TYPE_MISMATCH!>""<!>)
+    l.<!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>contains1<!>(<!TYPE_MISMATCH!>i<!>)
 }
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 fun <T> assertEquals1(e1: T, e2: @kotlin.internal.NoInfer T): Boolean = true
 
 fun test(s: String) {
-    <!OI;TYPE_INFERENCE_INCORPORATION_ERROR!>assertEquals1<!>(s, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>11<!>)
-}
\ No newline at end of file
+    <!TYPE_INFERENCE_INCORPORATION_ERROR{OI}!>assertEquals1<!>(s, <!CONSTANT_EXPECTED_TYPE_MISMATCH!>11<!>)
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.kt
index 9a539acbe0e..b7ca949ae29 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.kt
@@ -19,9 +19,9 @@ public fun <K, V> Map<K, V>.get1(key: Any?): Int = null!!
 public fun <@kotlin.internal.OnlyInputTypes K, V> Map<out K, V>.get1(key: K): V? = null!!
 
 fun test(map: Map<Int, String>) {
-    val a: Int = <!NI;TYPE_MISMATCH!>listOf(1).<!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!><!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>contains1<!>("")<!><!>
+    val a: Int = <!TYPE_MISMATCH{NI}!>listOf(1).<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!><!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>contains1<!>("")<!><!>
     val b: Boolean = listOf(1).contains1(1)
 
     val c: String? = map.<!TYPE_INFERENCE_ONLY_INPUT_TYPES!>get1<!>("")
     val d: String? = map.get1(1)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.kt
index 9805dbd380a..9ac814dd9ad 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.kt
@@ -22,12 +22,12 @@ fun test(
     invOut.onlyOut(42)
     invOut.onlyOut(1L)
 
-    invOut.<!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>onlyOutUB<!>(<!NI;TYPE_MISMATCH!>"str"<!>)
-    invStar.<!NI;UNRESOLVED_REFERENCE_WRONG_RECEIVER, OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>onlyOutUB<!>(0)
+    invOut.<!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>onlyOutUB<!>(<!TYPE_MISMATCH{NI}!>"str"<!>)
+    invStar.<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}, UNRESOLVED_REFERENCE_WRONG_RECEIVER{NI}!>onlyOutUB<!>(0)
     invOut.onlyOutUB(42)
     invOut.onlyOutUB(1L)
 
-    invIn.<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>onlyIn<!>(<!NI;TYPE_MISMATCH!>"str"<!>)
+    invIn.<!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>onlyIn<!>(<!TYPE_MISMATCH{NI}!>"str"<!>)
     invIn.onlyIn(42)
     invIn.onlyIn(1L)
 }
@@ -67,8 +67,8 @@ class Test5 {
         set(value) {
             if (value != null) {
                 val a = a
-                require(a != null && <!DEBUG_INFO_SMARTCAST!>value<!> in <!OI;DEBUG_INFO_SMARTCAST!>a<!>.children)
+                require(a != null && <!DEBUG_INFO_SMARTCAST!>value<!> in <!DEBUG_INFO_SMARTCAST{OI}!>a<!>.children)
             }
             field = value
         }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.kt
index b6b5677fcae..497171ac320 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.kt
@@ -18,7 +18,7 @@ class Out<out T>
 // -------------------------------------------------------
 
 fun test_0(x: Inv2<in Number, out Number>, list: List<Inv2<Any, Int>>) {
-    list.<!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>foo<!>(x)
+    list.<!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>foo<!>(x)
 }
 
 // ------------------------- Inv -------------------------
@@ -36,11 +36,11 @@ fun test_3(x: Inv<Number>, list: List<Inv<Any>>) {
 }
 
 fun test_4(x: Inv<in Number>, list: List<Inv<Any>>) {
-    list.<!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>contains1<!>(x)
+    list.<!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>contains1<!>(x)
 }
 
 fun test_5(x: Inv<in Number>, list: List<Inv<Number>>) {
-    list.<!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>contains1<!>(x)
+    list.<!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>contains1<!>(x)
 }
 
 fun test_6(x: Inv<in Number>, list: List<Inv<Int>>) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.kt
index fab6066598d..4a26d8b6ebe 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.kt
@@ -7,7 +7,7 @@
 class Inv<T>
 class Out<out T>
 fun <T> foo(i: Inv<in T>, o: Out<T>) {
-    <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES!>bar<!>(i, o)
+    <!TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>bar<!>(i, o)
 }
 
 fun <@kotlin.internal.OnlyInputTypes K> bar(r: Inv<out K>, o: Out<K>): K = TODO()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.kt
index a8324c8a917..a66f670aeb8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.kt
@@ -23,4 +23,4 @@ public fun <@kotlin.internal.OnlyInputTypes T> expect1(expected: T, block: () ->
 
 fun test() {
     expect1(2) { byteArrayOf(1, 2, 3).indexOf(3) }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/callableReferenceOnParameter.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/callableReferenceOnParameter.kt
index ae0f37a8578..55504722547 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/callableReferenceOnParameter.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/callableReferenceOnParameter.kt
@@ -5,4 +5,4 @@ internal class Z<K> {
     inline fun compute(key: String, <!UNUSED_PARAMETER!>producer<!>: () -> String): String {
         return map.getOrPut(key, ::<!UNSUPPORTED, USAGE_IS_NOT_INLINABLE!>producer<!>)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/complexInterdependentInputOutputTypes.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/complexInterdependentInputOutputTypes.fir.kt
index f7f948f907a..c997fe35ed9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/complexInterdependentInputOutputTypes.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/complexInterdependentInputOutputTypes.fir.kt
@@ -38,4 +38,4 @@ private fun <K, V : Any, M> containsNullable(
     pairs,
     { option, key -> option.withParameterObjectNullable(createGetParameterObject(plant, key)) },
     assertionCreator
-)
\ No newline at end of file
+)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/fixIndependentVariables.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/fixIndependentVariables.fir.kt
index 404707f49d8..333ac05e169 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/fixIndependentVariables.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/completion/postponedArgumentsAnalysis/fixIndependentVariables.fir.kt
@@ -8,4 +8,4 @@ fun <T> materialize(): T = null as T
 
 fun main(x: List<String>?) {
     foo(x?.map { Foo(it) } ?: listOf(materialize<Foo<Nothing>>())) {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
index ba3299f2b20..27ada61349a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
@@ -1,4 +1,4 @@
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
-fun foo(first: Array<Any?>, second: Array<Any?>) = Pair(first.toCollection(<!NO_VALUE_FOR_PARAMETER!>)<!>, second.toCollection(<!NO_VALUE_FOR_PARAMETER!>)<!>)
\ No newline at end of file
+fun foo(first: Array<Any?>, second: Array<Any?>) = Pair(first.toCollection(<!NO_VALUE_FOR_PARAMETER!>)<!>, second.toCollection(<!NO_VALUE_FOR_PARAMETER!>)<!>)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.fir.kt
index 12ae9041270..702005d9ff0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.fir.kt
@@ -6,4 +6,4 @@ fun <T> foo(resources: List<T>) {
 
 fun <T: Any> bar(resources: List<T>) {
     resources.map { runCatching { it } }.mapNotNull { it.getOrNull() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.kt
index 3eb12f63243..dcbcf3013bf 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.kt
@@ -1,9 +1,9 @@
 // !WITH_NEW_INFERENCE
 
 fun <T> foo(resources: List<T>) {
-    resources.map { runCatching { it } }.<!OI;TYPE_INFERENCE_UPPER_BOUND_VIOLATED!>mapNotNull<!> { it.getOrNull() }
+    resources.map { runCatching { it } }.<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>mapNotNull<!> { it.getOrNull() }
 }
 
 fun <T: Any> bar(resources: List<T>) {
     resources.map { runCatching { it } }.mapNotNull { it.getOrNull() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt36249.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt36249.fir.kt
index 933682a0710..1ed52d5f5e2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt36249.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt36249.fir.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER UNUSED_VARIABLE -UNUSED_EXPRESSION
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
 
 import kotlin.reflect.KClass
 fun <T : PsiElement> select(vararg classes: KClass<out T>): T? {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt36249.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt36249.kt
index 67227acfb08..c26d666b6e5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt36249.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt36249.kt
@@ -1,4 +1,4 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER UNUSED_VARIABLE -UNUSED_EXPRESSION
+// !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
 
 import kotlin.reflect.KClass
 fun <T : PsiElement> select(vararg classes: KClass<out T>): T? {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.kt b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.kt
index 0e7c47ae0f1..899ce6b966b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.kt
@@ -29,8 +29,8 @@ fun main() {
 
     "" in (hm as Map<String, Int>)
     "" !in (hm as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>in<!> (hm as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>!in<!> (hm as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>in<!> (hm as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>!in<!> (hm as Map<String, Int>)
 
     val a = A()
     "" <!CONCURRENT_HASH_MAP_CONTAINS_OPERATOR!>in<!> a
@@ -45,8 +45,8 @@ fun main() {
 
     "" in (a as Map<String, Int>)
     "" !in (a as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>in<!> (a as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>!in<!> (a as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>in<!> (a as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>!in<!> (a as Map<String, Int>)
 
     val b = B()
     "" <!CONCURRENT_HASH_MAP_CONTAINS_OPERATOR!>in<!> b
@@ -59,8 +59,8 @@ fun main() {
 
     "" in (b as Map<String, Int>)
     "" !in (b as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>in<!> (b as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>!in<!> (b as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>in<!> (b as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>!in<!> (b as Map<String, Int>)
 
     // Actually, we could've allow calls here because the owner explicitly declared as operator, but semantics is still weird
     val c = C()
@@ -74,7 +74,7 @@ fun main() {
 
     "" in (c as Map<String, Int>)
     "" !in (c as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>in<!> (c as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>!in<!> (c as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>in<!> (c as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>!in<!> (c as Map<String, Int>)
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.kt b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.kt
index 6eb609301a1..112a5b35d2c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.kt
@@ -29,8 +29,8 @@ fun main() {
 
     "" in (hm as Map<String, Int>)
     "" !in (hm as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>in<!> (hm as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>!in<!> (hm as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>in<!> (hm as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>!in<!> (hm as Map<String, Int>)
 
     val a = A()
     "" <!CONCURRENT_HASH_MAP_CONTAINS_OPERATOR_ERROR!>in<!> a
@@ -45,8 +45,8 @@ fun main() {
 
     "" in (a as Map<String, Int>)
     "" !in (a as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>in<!> (a as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>!in<!> (a as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>in<!> (a as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>!in<!> (a as Map<String, Int>)
 
     val b = B()
     "" <!CONCURRENT_HASH_MAP_CONTAINS_OPERATOR_ERROR!>in<!> b
@@ -59,8 +59,8 @@ fun main() {
 
     "" in (b as Map<String, Int>)
     "" !in (b as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>in<!> (b as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>!in<!> (b as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>in<!> (b as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>!in<!> (b as Map<String, Int>)
 
     // Actually, we could've allow calls here because the owner explicitly declared as operator, but semantics is still weird
     val c = C()
@@ -74,7 +74,7 @@ fun main() {
 
     "" in (c as Map<String, Int>)
     "" !in (c as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>in<!> (c as Map<String, Int>)
-    1 <!NI;TYPE_INFERENCE_ONLY_INPUT_TYPES, OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>!in<!> (c as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>in<!> (c as Map<String, Int>)
+    1 <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}, TYPE_INFERENCE_ONLY_INPUT_TYPES{NI}!>!in<!> (c as Map<String, Int>)
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.fir.fail b/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.fir.fail
deleted file mode 100644
index b1cc486f92a..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.fir.fail
+++ /dev/null
@@ -1,17 +0,0 @@
-Failures detected in FirImplicitTypeBodyResolveTransformerAdapter, file: /My.kt
-Cause: java.lang.RuntimeException: While resolving call Q|Properties|.R?C|/Properties.calcVal|(<L> = calcVal@fun <implicit>.<anonymous>(): <implicit> {
-    lval y: <implicit> = x#.plus#(IntegerLiteral(1))
-    when () {
-        CMP(>, y#.compareTo#(IntegerLiteral(0))) ->  {
-            MyBase#.derivedWrapper#()
-        }
-        CMP(<, x#.compareTo#(IntegerLiteral(0))) ->  {
-            MyBase#.exoticWrapper#(x#)
-        }
-        else ->  {
-            throw java#.lang#.NullPointerException#(String())
-        }
-    }
-
-}
-)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.fir.kt
deleted file mode 100644
index 557e9ba6a6b..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.fir.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-// !WITH_NEW_INFERENCE
-// NI_EXPECTED_FILE
-// JAVAC_EXPECTED_FILE
-// FILE: Base.java
-
-public interface Base {}
-
-// FILE: Other.java
-
-public interface Other {}
-
-// FILE: Derived.java
-
-public final class Derived<T> implements Base, Other {}
-
-// FILE: Exotic.java
-
-public final class Exotic implements Base, Other {
-
-    int x;
-
-    Exotic(int x) {
-        this.x = x;
-    }
-}
-
-// FILE: Properties.java
-
-import kotlin.jvm.functions.Function0;
-
-class Val<T> {
-
-    Function0<T> initializer;
-
-    Val(Function0<T> initializer) {
-        this.initializer = initializer;
-    }
-
-    T getValue(Object instance, Object metadata) {
-        return initializer.invoke();
-    }
-}
-
-class Properties {
-    static <T> Val<T> calcVal(Function0<T> initializer) {
-        return new Val<T>(initializer);
-    }
-}
-
-// FILE: My.kt
-
-open class Wrapper<out T: Base>(val v: T)
-
-class DerivedWrapper(v: Derived<*>): Wrapper<Derived<*>>(v)
-
-class ExoticWrapper(v: Exotic): Wrapper<Exotic>(v)
-
-object MyBase {
-
-    fun derived() = Derived<String>()
-    fun exotic(x: Int) = Exotic(x)
-
-    fun derivedWrapper() = DerivedWrapper(derived())
-    fun exoticWrapper(x: Int) = ExoticWrapper(exotic(x))
-}
-
-class My(val x: Int) {
-    val wrapper/*: Wrapper<*>*/ by Properties.calcVal {
-        val y = x + 1
-        when {
-            y > 0 -> MyBase.derivedWrapper()
-            x < 0 -> MyBase.exoticWrapper(x)
-            else  -> throw java.lang.NullPointerException("")
-        }
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.kt b/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.kt
index 557e9ba6a6b..352dc1bbce9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // JAVAC_EXPECTED_FILE
@@ -28,7 +29,17 @@ public final class Exotic implements Base, Other {
 
 import kotlin.jvm.functions.Function0;
 
-class Val<T> {
+public class Properties {
+    static <T> Val<T> calcVal(Function0<T> initializer) {
+        return new Val<T>(initializer);
+    }
+}
+
+// FILE: Val.java
+
+import kotlin.jvm.functions.Function0;
+
+public class Val<T> {
 
     Function0<T> initializer;
 
@@ -41,12 +52,6 @@ class Val<T> {
     }
 }
 
-class Properties {
-    static <T> Val<T> calcVal(Function0<T> initializer) {
-        return new Val<T>(initializer);
-    }
-}
-
 // FILE: My.kt
 
 open class Wrapper<out T: Base>(val v: T)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.ni.txt b/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.ni.txt
index 96957778aa1..62354258430 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.ni.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.ni.txt
@@ -63,8 +63,8 @@ public interface Other {
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public/*package*/ open class Properties {
-    public/*package*/ constructor Properties()
+public open class Properties {
+    public constructor Properties()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -73,6 +73,15 @@ public/*package*/ open class Properties {
     public/*package*/ open fun </*0*/ T : kotlin.Any!> calcVal(/*0*/ initializer: (() -> T!)!): Val<T!>!
 }
 
+public open class Val</*0*/ T : kotlin.Any!> {
+    public/*package*/ constructor Val</*0*/ T : kotlin.Any!>(/*0*/ initializer: (() -> T!)!)
+    public/*package*/ final var initializer: (() -> T!)!
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public/*package*/ open operator fun getValue(/*0*/ instance: kotlin.Any!, /*1*/ metadata: kotlin.Any!): T!
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}
+
 public open class Wrapper</*0*/ out T : Base> {
     public constructor Wrapper</*0*/ out T : Base>(/*0*/ v: T)
     public final val v: T
@@ -80,3 +89,4 @@ public open class Wrapper</*0*/ out T : Base> {
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/testsWithStdLib/multiplatform/jvmOverloads.txt b/compiler/testData/diagnostics/testsWithStdLib/multiplatform/jvmOverloads.txt
index 2aa5ad3d363..d2a4258c3a5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/multiplatform/jvmOverloads.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/multiplatform/jvmOverloads.txt
@@ -3,8 +3,8 @@ package
 
 public expect fun foo(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Int = ...): kotlin.Unit
 
-
 // -- Module: <m2-jvm> --
 package
 
 @kotlin.jvm.JvmOverloads public actual fun foo(/*0*/ x: kotlin.String, /*1*/ y: kotlin.Int): kotlin.Unit
+
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.kt
index 62f5d79fb7e..332d36329dd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.kt
@@ -15,9 +15,9 @@ fun hashMapTest() {
     x.put(<!TYPE_MISMATCH!>bar()<!>, 1)
     x.put("", 1)
 
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[<!NI;NULL_FOR_NONNULL_TYPE!>null<!>]<!> = 1
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[<!NI;TYPE_MISMATCH!>bar()<!>]<!> = 1
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[""]<!> = <!NI;TYPE_MISMATCH!>nullableInt<!>
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[<!NULL_FOR_NONNULL_TYPE{NI}!>null<!>]<!> = 1
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[<!TYPE_MISMATCH{NI}!>bar()<!>]<!> = 1
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[""]<!> = <!TYPE_MISMATCH{NI}!>nullableInt<!>
     x[""] = 1
 
     val b1: MutableMap<String, Int?> = <!TYPE_MISMATCH!>x<!>
@@ -39,9 +39,9 @@ fun treeMapTest() {
     x.put(<!TYPE_MISMATCH!>bar()<!>, 1)
     x.put("", 1)
 
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[<!NI;NULL_FOR_NONNULL_TYPE!>null<!>]<!> = 1
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[<!NI;TYPE_MISMATCH!>bar()<!>]<!> = 1
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[""]<!> = <!NI;TYPE_MISMATCH!>nullableInt<!>
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[<!NULL_FOR_NONNULL_TYPE{NI}!>null<!>]<!> = 1
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[<!TYPE_MISMATCH{NI}!>bar()<!>]<!> = 1
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[""]<!> = <!TYPE_MISMATCH{NI}!>nullableInt<!>
     x[""] = 1
 
     val b1: MutableMap<String, Int?> = <!TYPE_MISMATCH!>x<!>
@@ -63,9 +63,9 @@ fun concurrentHashMapTest() {
     x.put(<!TYPE_MISMATCH!>bar()<!>, 1)
     x.put("", 1)
 
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[<!NI;NULL_FOR_NONNULL_TYPE!>null<!>]<!> = 1
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[<!NI;TYPE_MISMATCH!>bar()<!>]<!> = 1
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[""]<!> = <!NI;TYPE_MISMATCH!>nullableInt<!>
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[<!NULL_FOR_NONNULL_TYPE{NI}!>null<!>]<!> = 1
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[<!TYPE_MISMATCH{NI}!>bar()<!>]<!> = 1
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[""]<!> = <!TYPE_MISMATCH{NI}!>nullableInt<!>
     x[""] = 1
 
     val b1: MutableMap<String, Int?> = <!TYPE_MISMATCH!>x<!>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.kt
index 9fe410d83bd..c64c10ab4f8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.kt
@@ -16,7 +16,7 @@ fun hashMapTest() {
 
     x[null] = 1
     x[bar()] = 1
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[""]<!> = <!NI;TYPE_MISMATCH!>nullableInt<!>
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[""]<!> = <!TYPE_MISMATCH{NI}!>nullableInt<!>
     x[""] = 1
 
     val b1: MutableMap<String?, Int?> = <!TYPE_MISMATCH!>x<!>
@@ -41,7 +41,7 @@ fun treeMapTest() {
 
     x[null] = 1
     x[bar()] = 1
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[""]<!> = <!NI;TYPE_MISMATCH!>nullableInt<!>
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[""]<!> = <!TYPE_MISMATCH{NI}!>nullableInt<!>
     x[""] = 1
 
     val b1: MutableMap<String?, Int?> = <!TYPE_MISMATCH!>x<!>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.kt
index a2e5ea18187..7f2232822de 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.kt
@@ -14,8 +14,8 @@ fun hashMapTest() {
     x.put(<!TYPE_MISMATCH!>bar()<!>, 1)
     x.put("", 1)
 
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[<!NI;NULL_FOR_NONNULL_TYPE!>null<!>]<!> = 1
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[<!NI;TYPE_MISMATCH!>bar()<!>]<!> = 1
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[<!NULL_FOR_NONNULL_TYPE{NI}!>null<!>]<!> = 1
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[<!TYPE_MISMATCH{NI}!>bar()<!>]<!> = 1
     x[""] = nullableInt
     x[""] = 1
 
@@ -38,8 +38,8 @@ fun treeMapTest() {
     x.put(<!TYPE_MISMATCH!>bar()<!>, 1)
     x.put("", 1)
 
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[<!NI;NULL_FOR_NONNULL_TYPE!>null<!>]<!> = 1
-    <!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>x[<!NI;TYPE_MISMATCH!>bar()<!>]<!> = 1
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[<!NULL_FOR_NONNULL_TYPE{NI}!>null<!>]<!> = 1
+    <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>x[<!TYPE_MISMATCH{NI}!>bar()<!>]<!> = 1
     x[""] = nullableInt
     x[""] = 1
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/kt-37497.kt b/compiler/testData/diagnostics/testsWithStdLib/regression/kt-37497.kt
index e893f7af98c..8b56a5d0cbc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/regression/kt-37497.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/regression/kt-37497.kt
@@ -1,5 +1,5 @@
 // FIR_IDENTICAL
-// FULL_JDK 
+// FULL_JDK
 // Issue: KT-37497
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.kt b/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.kt
index acd58d9790b..3c5fa188739 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.kt
@@ -14,5 +14,5 @@ fun useJ(j: J) {
 }
 
 fun jj() {
-    useJ(<!TYPE_MISMATCH!>{<!NI;TYPE_MISMATCH!><!>}<!>)
+    useJ(<!TYPE_MISMATCH!>{<!TYPE_MISMATCH{NI}!><!>}<!>)
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.kt
index 0781d51bab5..4280141441d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.kt
@@ -41,4 +41,4 @@ fun test2(a: A) {
         forEach() checkType { _<String>() }
         <!OVERLOAD_RESOLUTION_AMBIGUITY!>forEach<!>(1)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/javaStaticMembers.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/javaStaticMembers.kt
index b5e670dd9a5..f1532277731 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/javaStaticMembers.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/javaStaticMembers.kt
@@ -9,4 +9,4 @@ fun ff() {
     val b = <!NO_COMPANION_OBJECT!>Test<!><!UNEXPECTED_SAFE_CALL!>?.<!>FOO
     System.out.println(a + b)
     <!NO_COMPANION_OBJECT!>System<!><!UNEXPECTED_SAFE_CALL!>?.<!>out.println(a + b)
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt
index d57a6ff4c60..0c9e380f3ab 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt
@@ -7,15 +7,15 @@ fun main() {
     val startTimeNanos = System.nanoTime()
 
     // the problem sits on the next line:
-    val pi = 4.0.toDouble() * delta <!OI;OVERLOAD_RESOLUTION_AMBIGUITY!>*<!> (1..n).<!OI;TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>reduce<!>(
+    val pi = 4.0.toDouble() * delta <!OVERLOAD_RESOLUTION_AMBIGUITY{OI}!>*<!> (1..n).<!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS{OI}!>reduce<!>(
             {t, i ->
                 val x = (i - 0.5) * delta
-                <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>t + 1.0 / (1.0 + x * x)<!>
+                <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>t + 1.0 / (1.0 + x * x)<!>
 
             })
     // !!! pi has error type here
 
     val elapseTime = (System.nanoTime() - startTimeNanos) / 1e9
 
-    println("pi_sequential_reduce $<!OI;DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>pi<!> $n $elapseTime")
+    println("pi_sequential_reduce $<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}!>pi<!> $n $elapseTime")
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.kt
index 07800865910..46db0309bb9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.kt
@@ -27,4 +27,4 @@ fun test() {
     StaticOverrides.A.foo {} checkType { _<Boolean>() }
     StaticOverrides.B.foo {} checkType { _<String>() }
     StaticOverrides.C.foo {} checkType { _<Boolean>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.kt
index 91d34f27ca1..d322cc0befb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.kt
@@ -22,4 +22,4 @@ class Foo {
 fun test() {
     Foo().foo {} checkType { _<Int>() }
     Foo().bar {} checkType { _<String>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt
index 3ec7ab2247e..1570fa4336c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt
@@ -23,4 +23,4 @@ class Foo {
 fun test() {
     Foo().foo {} checkType { _<Int>() }
     Foo().bar {} checkType { _<Int>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.kt
index 59d45e72309..f0ecaba389c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunction.kt
@@ -17,4 +17,4 @@ public class Foo {
 // FILE: 1.kt
 fun bar() {
     Foo().test {} checkType { _<String>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt
index cb05faaaac3..b012f4cfda0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt
@@ -19,4 +19,4 @@ public class Foo {
 // FILE: 1.kt
 fun bar() {
     Foo().test {} checkType { _<Int>() }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.fir.kt
index 3eb045d61d2..623169cc967 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.fir.kt
@@ -9,4 +9,4 @@ fun indexOfMax(a: IntArray): Int? {
         }
     }
     return maxI
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.kt b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.kt
index ecd067eed3b..7a349d7e040 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.kt
@@ -4,9 +4,9 @@
 fun indexOfMax(a: IntArray): Int? {
     var maxI: Int? = null
     a.forEachIndexed { i, value ->
-        if (maxI == null || value >= a[<!NI;SMARTCAST_IMPOSSIBLE, SMARTCAST_IMPOSSIBLE!>maxI<!>]) {
+        if (maxI == null || value >= a[<!SMARTCAST_IMPOSSIBLE{NI}, SMARTCAST_IMPOSSIBLE!>maxI<!>]) {
             maxI = i
         }
     }
     return maxI
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.kt b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.kt
index 779a06a60e5..6b97b352a1b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachUnsafe.kt
@@ -11,4 +11,4 @@ fun indexOfMax(a: IntArray): Int? {
         }
     }
     return maxI
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt
index 3b81ee3d9ce..ab99897f682 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt
@@ -28,7 +28,7 @@ interface A2 : List<String> {
     <!NOTHING_TO_OVERRIDE!>override<!> fun stream(): java.util.stream.Stream<String> = null!!
 }
 
-class B : <!OI;NONE_APPLICABLE!>Throwable<!>(<!NI;TOO_MANY_ARGUMENTS!>""<!>, <!NI;TOO_MANY_ARGUMENTS!>null<!>, <!NI;TOO_MANY_ARGUMENTS!>false<!>, <!NI;TOO_MANY_ARGUMENTS!>false<!>)
+class B : <!NONE_APPLICABLE{OI}!>Throwable<!>(<!TOO_MANY_ARGUMENTS{NI}!>""<!>, <!TOO_MANY_ARGUMENTS{NI}!>null<!>, <!TOO_MANY_ARGUMENTS{NI}!>false<!>, <!TOO_MANY_ARGUMENTS{NI}!>false<!>)
 
 class B1 : RuntimeException() {
     <!NOTHING_TO_OVERRIDE!>override<!> fun fillInStackTrace(): Throwable { // 'override' keyword must be prohibited, as it was in 1.0.x
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.fir.kt
index abf739ca63f..beee087680e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.fir.kt
@@ -108,4 +108,4 @@ fun test10() {
         42
     }
     x.length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt
index faf1a1e9a44..c9ebce89b95 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt
@@ -12,8 +12,8 @@ fun test2() {
     catch (e: ExcA) {
         null
     }
-    catch (e: ExcB) <!NI;TYPE_MISMATCH!>{
-        <!OI;CONSTANT_EXPECTED_TYPE_MISMATCH!>10<!>
+    catch (e: ExcB) <!TYPE_MISMATCH{NI}!>{
+        <!CONSTANT_EXPECTED_TYPE_MISMATCH{OI}!>10<!>
     }<!>
     s<!UNSAFE_CALL!>.<!>length
 }
@@ -108,4 +108,4 @@ fun test10() {
         <!UNUSED_EXPRESSION!>42<!>
     }
     x.length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.fir.kt
index 511efb38d57..cf7cd637230 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.fir.kt
@@ -17,4 +17,4 @@ fun test1(s1: String?) {
         s.length
     }
     s.length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.kt
index f516d803a08..c251e9505ca 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.kt
@@ -14,7 +14,7 @@ fun test1(s1: String?) {
         return
     }
     finally {
-        <!OI;DEBUG_INFO_SMARTCAST!>s<!><!NI;UNSAFE_CALL!>.<!>length
+        <!DEBUG_INFO_SMARTCAST{OI}!>s<!><!UNSAFE_CALL{NI}!>.<!>length
     }
     <!DEBUG_INFO_SMARTCAST!>s<!>.length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt
index 0e40b596a63..98aad3f98f6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt
@@ -105,4 +105,4 @@ fun test6(s1: String?, s2: String?) {
     s.<!INAPPLICABLE_CANDIDATE!>length<!>
     s1.<!INAPPLICABLE_CANDIDATE!>length<!>
     s2.length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt
index 709b97c9b14..96a811dbff8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt
@@ -14,15 +14,15 @@ fun test1() {
     try {
         x = null
     } catch (e: Exception) {
-        <!OI;DEBUG_INFO_SMARTCAST!>x<!><!NI;UNSAFE_CALL!>.<!>length // smartcast shouldn't be allowed (OOME could happen after `x = null`)
+        <!DEBUG_INFO_SMARTCAST{OI}!>x<!><!UNSAFE_CALL{NI}!>.<!>length // smartcast shouldn't be allowed (OOME could happen after `x = null`)
         throw e
     }
     finally {
         // smartcast shouldn't be allowed, `x = null` could've happened
-        <!OI;DEBUG_INFO_SMARTCAST!>x<!><!NI;UNSAFE_CALL!>.<!>length
+        <!DEBUG_INFO_SMARTCAST{OI}!>x<!><!UNSAFE_CALL{NI}!>.<!>length
     }
     // smartcast shouldn't be allowed, `x = null` could've happened
-    <!OI;DEBUG_INFO_SMARTCAST!>x<!><!NI;UNSAFE_CALL!>.<!>length
+    <!DEBUG_INFO_SMARTCAST{OI}!>x<!><!UNSAFE_CALL{NI}!>.<!>length
 }
 
 // With old DFA of try/catch info about unsound smartcasts after try
@@ -35,7 +35,7 @@ fun test2() {
         x = null
     } catch (e: Exception) {
         // BAD
-        <!OI;DEBUG_INFO_SMARTCAST!>x<!><!NI;UNSAFE_CALL!>.<!>length
+        <!DEBUG_INFO_SMARTCAST{OI}!>x<!><!UNSAFE_CALL{NI}!>.<!>length
     }
     finally {
         x<!UNSAFE_CALL!>.<!>length
@@ -51,7 +51,7 @@ fun test3() {
         } catch (e: Exception) {
             t2 = null
         }
-        <!OI;DEBUG_INFO_SMARTCAST!>t2<!><!NI;UNSAFE_CALL!>.<!>not() // wrong smartcast, NPE
+        <!DEBUG_INFO_SMARTCAST{OI}!>t2<!><!UNSAFE_CALL{NI}!>.<!>not() // wrong smartcast, NPE
     }
 }
 
@@ -61,7 +61,7 @@ fun test4() {
         try {
             t2 = null
         } finally { }
-        <!OI;DEBUG_INFO_SMARTCAST!>t2<!><!NI;UNSAFE_CALL!>.<!>not() // wrong smartcast, NPE
+        <!DEBUG_INFO_SMARTCAST{OI}!>t2<!><!UNSAFE_CALL{NI}!>.<!>not() // wrong smartcast, NPE
     }
 }
 
@@ -81,10 +81,10 @@ fun test5() {
         return
     }
     finally {
-        <!OI;DEBUG_INFO_SMARTCAST!>s1<!><!NI;UNSAFE_CALL!>.<!>length
-        <!OI;DEBUG_INFO_SMARTCAST!>s2<!><!NI;UNSAFE_CALL!>.<!>length
+        <!DEBUG_INFO_SMARTCAST{OI}!>s1<!><!UNSAFE_CALL{NI}!>.<!>length
+        <!DEBUG_INFO_SMARTCAST{OI}!>s2<!><!UNSAFE_CALL{NI}!>.<!>length
     }
-    <!OI;DEBUG_INFO_SMARTCAST!>s1<!><!NI;UNSAFE_CALL!>.<!>length
+    <!DEBUG_INFO_SMARTCAST{OI}!>s1<!><!UNSAFE_CALL{NI}!>.<!>length
     <!DEBUG_INFO_SMARTCAST!>s2<!>.length
 }
 
@@ -99,10 +99,10 @@ fun test6(s1: String?, s2: String?) {
         return
     }
     finally {
-        <!OI;DEBUG_INFO_SMARTCAST!>s<!><!NI;UNSAFE_CALL!>.<!>length
+        <!DEBUG_INFO_SMARTCAST{OI}!>s<!><!UNSAFE_CALL{NI}!>.<!>length
         requireNotNull(s2)
     }
-    <!OI;DEBUG_INFO_SMARTCAST!>s<!><!NI;UNSAFE_CALL!>.<!>length
-    <!NI;DEBUG_INFO_SMARTCAST!>s1<!><!OI;UNSAFE_CALL!>.<!>length
+    <!DEBUG_INFO_SMARTCAST{OI}!>s<!><!UNSAFE_CALL{NI}!>.<!>length
+    <!DEBUG_INFO_SMARTCAST{NI}!>s1<!><!UNSAFE_CALL{OI}!>.<!>length
     <!DEBUG_INFO_SMARTCAST!>s2<!>.length
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.fir.kt
index dfb2e98a923..40b7f8ad40c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.fir.kt
@@ -32,4 +32,4 @@ fun test2(): Map<Int, Int> = run {
     } catch (e: ExcA) {
         mapOf("" to "")
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt
index a1202adfcb2..238aeef76d2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt
@@ -27,9 +27,9 @@ fun test1(): Map<Int, Int> = run {
 }
 
 fun test2(): Map<Int, Int> = run {
-    <!NI;TYPE_MISMATCH, NI;TYPE_MISMATCH, NI;TYPE_MISMATCH!>try {
+    <!TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>try {
         emptyMap()
     } catch (e: ExcA) {
-        <!NI;TYPE_MISMATCH, OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>mapOf(<!NI;TYPE_MISMATCH!>"" to ""<!>)<!>
+        <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}!>mapOf(<!TYPE_MISMATCH{NI}!>"" to ""<!>)<!>
     }<!>
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.kt b/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.kt
index 12bae0c69a8..a6037015e9f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.kt
@@ -28,7 +28,7 @@ val test4: Collection<Int> =
         }
 
 val test5: Collection<Int> =
-        listOf(1, 2, 3).<!OI;TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH!>flatMapTo(<!OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>LinkedHashSet<!>()) { // TODO
+        listOf(1, 2, 3).<!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}!>flatMapTo(<!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>LinkedHashSet<!>()) { // TODO
             if (true) listOf(it) else listOf(it)
         }<!>
 
@@ -40,4 +40,4 @@ val test6: Collection<Int> =
 val test7: Collection<Int> =
         listOf(1, 2, 3).flatMapTo(LinkedHashSet()) {
             select(listOf(it), listOf(it))
-        }
\ No newline at end of file
+        }