AbstractFirPsiCheckerTest: do partial error diagnostic comparison for some cases

idea/testData/checker/Casts.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun <T> checkSubtype(t: T) = t
 
 fun test() : Unit {

idea/testData/checker/FunctionOnlyOneTypeParametersList.kt

@@ -1 +1,3 @@
+// FIR_COMPARISON
+
 fun <T> foo<error><SOME_TYPE></error> () {}

idea/testData/checker/MainWithWarningOnUnusedParam.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 // LANGUAGE_VERSION: 1.4
 
 fun main(<warning descr="[UNUSED_PARAMETER] Parameter 'args' is never used">args</warning>: Array<String>) {

idea/testData/checker/MainWithoutWarningOnUnusedParam.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 // LANGUAGE_VERSION: 1.3
 
 fun main(args: Array<String>) {

idea/testData/checker/MultipleModality.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 sealed <warning descr="[REDUNDANT_MODIFIER] Modifier 'abstract' is redundant because 'sealed' is present">abstract</warning> class First
 
 <warning descr="[REDUNDANT_MODIFIER] Modifier 'abstract' is redundant because 'sealed' is present">abstract</warning> sealed class Second

idea/testData/checker/PackageQualified.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 package a
 
     import java.*

idea/testData/checker/Unused.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun test(<warning textAttributesKey="NOT_USED_ELEMENT_ATTRIBUTES">unusedParam</warning>: Int) { // UNUSED_PARAMETER
   val str = ":)"
   str <warning textAttributesKey="NOT_USED_ELEMENT_ATTRIBUTES">as String</warning> // USELESS_CAST

idea/testData/checker/WhenInEnumInExtensionProperty.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 // KT-3750 When without else
 
 enum class A {

idea/testData/checker/duplicateJvmSignature/functionAndProperty/ambiguous.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 package a.b
 
 class String

idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 class C {
     <error>val x</error> = 1
     <error>fun getX()</error> = 1

idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 class C {
     companion object {
         <error>val x</error> = 1

idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun foo() {
     class C {
         <error>val x</error> = 1

idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 class B {
     class C {
         <error>val x</error> = 1

idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 object C {
     <error>val x</error> = 1
     <error>fun getX()</error> = 1

idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun foo() =
     object {
         <error>val x</error> = 1

idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt

@@ -1,2 +1,4 @@
+// FIR_COMPARISON
+
 <error>val x</error> = 1
 <error>fun getX()</error> = 1

idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevelMultifileRuntime.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 // RUNTIME
 @file:JvmName("TopLevelMultifile")
 @file:JvmMultifileClass

idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 interface T {
     <error descr="[CONFLICTING_JVM_DECLARATIONS] Platform declaration clash: The following declarations have the same JVM signature (foo(Ljava/util/List;)V):
     fun foo(l: List<Int>): Unit defined in T

idea/testData/checker/infos/SmartCastOnIf.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun baz(s: String?): Int {
     return if (s == null) {
         ""

idea/testData/checker/infos/SmartCastOnWhen.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 // COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 
 fun baz(s: String?): Int {

idea/testData/checker/infos/SmartCastTarget.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 // See KT-15901
 
 <info>enum</info> class En { A }

idea/testData/checker/infos/SmartCastToEnum.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 package test2
 
 <info descr="null">enum</info> class En { A, B, С }

idea/testData/checker/infos/SmartCastsWithSafeAccess.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 interface A {
     fun foo()
 }

idea/testData/checker/infos/WrapIntoRef.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun refs() {
     var <warning>a</warning> = 1
     val <warning>v</warning> = {

idea/testData/checker/infos/multipleResolvedCalls.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 interface I1
 interface I2
 interface I3

idea/testData/checker/infos/smartCastOnElvis.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 // COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 
 fun foo(s: String) = s.length

idea/testData/checker/regression/AssignmentsUnderOperators.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun test() {
   var a : Any? = null
   if (a is Any) else a = null;

idea/testData/checker/regression/BadParseForClass.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun main(args: Array<String>) {
     String.class<EOLError descr="Name expected"></EOLError>
 }

idea/testData/checker/regression/ClassDeclarationAfterDot.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 class A
 
 fun f() {

idea/testData/checker/regression/ClassDeclarationAfterDot2.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 class A
 
 fun f() {

idea/testData/checker/regression/ClassDeclarationAsExpression.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 val p = 1 < <error>class A {
     fun f() {
         f()

idea/testData/checker/regression/ClassDeclarationAsExpression2.kt

@@ -1 +1,3 @@
+// FIR_COMPARISON
+
 fun g() = 1 < <error>class A</error>

idea/testData/checker/regression/ClassDeclarationAsExpression3.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun f(<warning>i</warning>: Int = 3 < <error>class A {
     fun f() {
         f()

idea/testData/checker/regression/DestructuringDeclarationInLambda.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 data class XY(val x: Int, val y: Int)
 
 fun convert(xy: XY, f: (XY) -> Int) = f(xy)

idea/testData/checker/regression/DollarsInName.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 class `A$B` {
     class `$$$` {
         class `$`

idea/testData/checker/regression/FunctionTypes.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun <K, V> intercept(<warning>block</warning>: (key: K, next: (K) -> V, K) -> V) {
 }
 

idea/testData/checker/regression/Jet124.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun foo1() :  (Int) -> Int = { x: Int -> x }
 
 fun foo() {

idea/testData/checker/regression/Jet169.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun set(<warning>key</warning> : String, <warning>value</warning> : String) {
   val a : String? = ""
   when (a) {

idea/testData/checker/regression/Jet183-1.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 enum class ProtocolState {
   WAITING {
     override fun signal() = ProtocolState.TALKING

idea/testData/checker/regression/Jet183.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 enum class ProtocolState {
   WAITING {
     override fun signal() = ProtocolState.TALKING

idea/testData/checker/regression/Jet53.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 import java.util.Collections
 
 fun <T> checkSubtype(t: T) = t

idea/testData/checker/regression/Jet67.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 abstract class XXX {
   abstract val a : Int get
 

idea/testData/checker/regression/Jet68.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 class Foo()
 
 fun test() {

idea/testData/checker/regression/Jet69.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 class Command() {}
 
 fun parse(<warning>cmd</warning>: String): Command? { return null  }

idea/testData/checker/regression/Jet72.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 // JET-72 Type inference doesn't work when iterating over ArrayList
 
 import java.util.ArrayList

idea/testData/checker/regression/OverrideResolution.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun box() {
     val a : C = C()
     a.foo()

idea/testData/checker/regression/ScopeForSecondaryConstructors.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun <T> checkSubtype(t: T) = t
 
 class Foo(var bar : Int, var barr : Int, var barrr : Int) {

idea/testData/checker/regression/SpecififcityByReceiver.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 fun Any.<warning>equals</warning>(<warning>other</warning> : Any?) : Boolean = true
 
 fun main(args: Array<String>) {

idea/testData/checker/regression/extensionMemberInClassObject.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 interface Bar {
     fun <T> T.bar() {}
 }

idea/testData/checker/regression/objectLiteralInSupertypeList.kt

@@ -1,3 +1,5 @@
+// FIR_COMPARISON
+
 interface A
 
 open class B(<warning>i</warning>: Int, <warning>a</warning>: A)

idea/tests/org/jetbrains/kotlin/checkers/AbstractFirPsiCheckerTest.kt

@@ -9,6 +9,8 @@ import com.intellij.rt.execution.junit.FileComparisonFailure
 import org.jetbrains.kotlin.idea.fir.FirResolution
 import org.jetbrains.kotlin.idea.test.configureCompilerOptions
 import org.jetbrains.kotlin.idea.test.rollbackCompilerOptions
+import org.jetbrains.kotlin.test.InTextDirectivesUtils
+import java.io.File
 
 abstract class AbstractFirPsiCheckerTest : AbstractPsiCheckerTest() {
     override fun setUp() {
@@ -28,11 +30,17 @@ abstract class AbstractFirPsiCheckerTest : AbstractPsiCheckerTest() {
     ): Long {
         val file = file
         val configured = configureCompilerOptions(file.text, project, module)
+        val doComparison = InTextDirectivesUtils.isDirectiveDefined(myFixture.file.text, "FIR_COMPARISON")
         return try {
             myFixture.checkHighlighting(checkWarnings, checkInfos, checkWeakWarnings)
         } catch (e: FileComparisonFailure) {
-            // NB: yet we do not actually compare highlighting
+            if (doComparison) {
-            0
+                // Even this is very partial check (only error compatibility, no warnings / infos)
+                throw FileComparisonFailure(e.message, e.expected, e.actual, File(e.filePath).absolutePath)
+            } else {
+                // Here we just check that we haven't crashed due to exception
+                0
+            }
         } finally {
             if (configured) {
                 rollbackCompilerOptions(project, module)