Add FIR_IGNORE directive to test files that must be skipped

compiler/visualizer/testData/rawBuilder/declarations/NestedOfAliasedType.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 abstract class A {
     abstract class Nested
 }

compiler/visualizer/testData/rawBuilder/declarations/complexTypes.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 package a.b
 
 class C<T, out S> {

compiler/visualizer/testData/rawBuilder/declarations/enums.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 import my.println
 
 enum class Order {

compiler/visualizer/testData/rawBuilder/declarations/enums2.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 interface Some
 
 object O1 : Some

compiler/visualizer/testData/rawBuilder/declarations/functionTypes.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 //                                      Unit
 //                                      │ fun ((T) -> Unit).invoke(T): Unit
 //                                      │ │

compiler/visualizer/testData/rawBuilder/declarations/noPrimaryConstructor.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 class NoPrimary {
 //      String
 //      │

compiler/visualizer/testData/rawBuilder/declarations/typeParameterVsNested.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 package test
 
 interface Some

compiler/visualizer/testData/rawBuilder/expressions/annotated.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 //constructor annotation/Target(vararg annotation/AnnotationTarget)
 //│     enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
 //│     │                enum entry annotation/AnnotationTarget.EXPRESSION

compiler/visualizer/testData/rawBuilder/expressions/branches.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 //                            foo.a: Int
 //                            │ fun (Int).compareTo(Int): Int
 //                            │ │ foo.b: Int

compiler/visualizer/testData/rawBuilder/expressions/callableReferences.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 class A {
     fun foo() {}
 //      Int   Int

compiler/visualizer/testData/rawBuilder/expressions/calls.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 //                                 Int
 //                                 │ distance.x: Int
 //                                 │ │ fun (Int).plus(Int): Int

compiler/visualizer/testData/rawBuilder/expressions/classReference.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 //WITH_RUNTIME
 package test
 

compiler/visualizer/testData/rawBuilder/expressions/collectionLiterals.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 annotation class Ann1(val arr: IntArray)
 
 annotation class Ann2(val arr: DoubleArray)

compiler/visualizer/testData/rawBuilder/expressions/destructuring.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 data class Some(val first: Int, val second: Double, val third: String)
 
 fun foo(some: Some) {

compiler/visualizer/testData/rawBuilder/expressions/for.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 fun foo() {
 //            Int
 //            │fun (Int).rangeTo(Int): ranges/IntRange

compiler/visualizer/testData/rawBuilder/expressions/genericCalls.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 //                          Nothing?
 //                          │ Nothing?
 //                          │ │

compiler/visualizer/testData/rawBuilder/expressions/in.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 //                         collections/Collection<Int>
 //                         │                Boolean
 //                         │                │

compiler/visualizer/testData/rawBuilder/expressions/init.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 class WithInit(x: Int) {
 //      Int
 //      │

compiler/visualizer/testData/rawBuilder/expressions/lambda.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 data class Tuple(val x: Int, val y: Int)
 
 //                                Int

compiler/visualizer/testData/rawBuilder/expressions/locals.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 fun withLocals(p: Int): Int {
     class Local(val pp: Int) {
 //                 Int

compiler/visualizer/testData/rawBuilder/expressions/modifications.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 fun simple() {
 //      Int Int
 //      │   │

compiler/visualizer/testData/rawBuilder/expressions/super.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 interface A {
     fun foo() {}
 }

compiler/visualizer/testData/rawBuilder/expressions/these.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 class Some {
 //                 Int
 //                 │ Int

compiler/visualizer/testData/rawBuilder/expressions/typeOperators.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 interface IThing
 
 //                Boolean

compiler/visualizer/testData/rawBuilder/expressions/unary.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 fun test() {
 //      Int Int
 //      │   │

compiler/visualizer/testData/rawBuilder/expressions/variables.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 fun foo() {
 //      Int Int
 //      │   │

compiler/visualizer/testData/rawBuilder/expressions/while.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 fun foo(limit: Int) {
 //      Int Int
 //      │   │

compiler/visualizer/testData/uncommonCases/resultFiles/dataClass.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 data class Vector(val x: Int, val y: Int) {
 //                                  Vector
 //                                  │ constructor Vector(Int, Int)

compiler/visualizer/testData/uncommonCases/resultFiles/delegation.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 interface Base {
     fun printMessage()
     fun printMessageLine()

compiler/visualizer/testData/uncommonCases/resultFiles/innerWith.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 package p
 
 class A {

compiler/visualizer/testData/uncommonCases/resultFiles/lists.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 package org.jetbrains.kotlin.test
 
 //  collections/List<Int>

compiler/visualizer/testData/uncommonCases/resultFiles/properties.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 package org.jetbrains.kotlin.test
 
 //  Int  Int

compiler/visualizer/testData/uncommonCases/resultFiles/superTypes.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 package org.jetbrains.kotlin.test
 
 abstract class Base<T>(var x: T) {

compiler/visualizer/testData/uncommonCases/resultFiles/variance.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 interface Source<out T> {
     fun nextT(): T
 }

compiler/visualizer/testData/uncommonCases/resultFiles/where.kt

@@ -1,3 +1,4 @@
+// FIR_IGNORE
 //                            collections/List<T>     collections/List<String>
 //                            │                       │
 fun <T> copyWhenGreater(list: List<T>, threshold: T): List<String>

compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/AbstractFirVisualizer.kt

@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.fir.resolve.transformers.FirTotalResolveTransformer
 import org.jetbrains.kotlin.fir.service
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.visualizer.AbstractVisualizer
+import org.junit.Assert
 import java.io.File
 
 abstract class AbstractFirVisualizer : AbstractVisualizer() {
@@ -55,6 +56,17 @@ abstract class AbstractFirVisualizer : AbstractVisualizer() {
         val psiRenderResult = renderer.render()
 
         val expectedPath = file.absolutePath.replace(replacement.first, replacement.second)
-        KotlinTestUtils.assertEqualsToFile(File(expectedPath), psiRenderResult)
+        val expectedText = File(expectedPath).readLines()
+        if (expectedText[0].startsWith("// FIR_IGNORE")) {
+            Assert.assertFalse(
+                "Files are identical, please delete ignore directive",
+                expectedText.filterIndexed { index, _ -> index > 0 }.joinToString("\n") == psiRenderResult
+            )
+            return
+        }
+        KotlinTestUtils.assertEqualsToFile(File(expectedPath), psiRenderResult) {
+            return@assertEqualsToFile it.replace("// FIR_IGNORE\n", "")
+        }
+
     }
 }

compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/AbstractPsiVisualizer.kt

@@ -21,6 +21,8 @@ abstract class AbstractPsiVisualizer : AbstractVisualizer() {
         val psiRenderResult = renderer.render()
 
         val expectedPath = file.absolutePath.replace(replacement.first, replacement.second)
-        KotlinTestUtils.assertEqualsToFile(File(expectedPath), psiRenderResult)
+        KotlinTestUtils.assertEqualsToFile(File(expectedPath), psiRenderResult) {
+            return@assertEqualsToFile it.replace("// FIR_IGNORE\n", "")
+        }
     }
 }