From 13ef126d4c007400517f789eaf9ca2d34f0e1da6 Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Sat, 20 Feb 2021 17:01:20 +0300
Subject: [PATCH] [VISUALIZER] Remove ignore directive from correct test files

---
 .../org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt | 4 ++--
 .../testData/rawBuilder/declarations/NestedOfAliasedType.kt   | 1 -
 .../testData/rawBuilder/declarations/constructorInObject.kt   | 1 -
 .../testData/rawBuilder/declarations/derivedClass.kt          | 1 -
 .../testData/rawBuilder/declarations/emptyAnonymousObject.kt  | 1 -
 compiler/visualizer/testData/rawBuilder/declarations/enums.kt | 1 -
 .../visualizer/testData/rawBuilder/declarations/enums2.kt     | 1 -
 .../testData/rawBuilder/declarations/functionTypes.kt         | 1 -
 .../testData/rawBuilder/declarations/noPrimaryConstructor.kt  | 1 -
 .../visualizer/testData/rawBuilder/expressions/annotated.kt   | 1 -
 compiler/visualizer/testData/rawBuilder/expressions/calls.kt  | 1 -
 .../testData/rawBuilder/expressions/classReference.kt         | 1 -
 .../testData/rawBuilder/expressions/collectionLiterals.kt     | 1 -
 .../testData/rawBuilder/expressions/destructuring.kt          | 1 -
 compiler/visualizer/testData/rawBuilder/expressions/for.kt    | 1 -
 .../testData/rawBuilder/expressions/genericCalls.kt           | 1 -
 compiler/visualizer/testData/rawBuilder/expressions/init.kt   | 1 -
 .../testData/rawBuilder/expressions/modifications.kt          | 1 -
 .../rawBuilder/expressions/qualifierWithTypeArguments.kt      | 1 -
 compiler/visualizer/testData/rawBuilder/expressions/super.kt  | 1 -
 compiler/visualizer/testData/rawBuilder/expressions/these.kt  | 1 -
 .../visualizer/testData/rawBuilder/expressions/variables.kt   | 1 -
 compiler/visualizer/testData/rawBuilder/expressions/while.kt  | 1 -
 .../testData/uncommonCases/resultFiles/delegation.kt          | 1 -
 .../testData/uncommonCases/resultFiles/innerWith.kt           | 1 -
 .../testData/uncommonCases/resultFiles/properties.kt          | 1 -
 .../visualizer/testData/uncommonCases/resultFiles/variance.kt | 1 -
 .../jetbrains/kotlin/visualizer/fir/AbstractFirVisualizer.kt  | 4 ++--
 .../jetbrains/kotlin/visualizer/psi/AbstractPsiVisualizer.kt  | 2 +-
 29 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt b/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt
index 0bb39ce6c31..ac81da4c40e 100644
--- a/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt
+++ b/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt
@@ -254,8 +254,8 @@ class FirVisualizer(private val firFile: FirFile) : BaseRenderer() {
             expression.children.filter { it.node.elementType != KtNodeTypes.REFERENCE_EXPRESSION }.forEach { psi ->
                 when (psi) {
                     is KtLambdaArgument -> {
-                        val firLambda = psi.firstOfType<FirLambdaArgumentExpression>()?.expression as FirAnonymousFunction
-                        firLambda.receiverTypeRef?.let {
+                        val firLambda = psi.firstOfType<FirLambdaArgumentExpression>()?.expression as? FirAnonymousFunction
+                        firLambda?.receiverTypeRef?.let {
                             lastCallWithLambda = psi.getLambdaExpression()?.firstOfType<FirLabel>()?.name
                             implicitReceivers += it
                             psi.accept(this)
diff --git a/compiler/visualizer/testData/rawBuilder/declarations/NestedOfAliasedType.kt b/compiler/visualizer/testData/rawBuilder/declarations/NestedOfAliasedType.kt
index 283d4c9a091..893bccbcd6f 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/NestedOfAliasedType.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/NestedOfAliasedType.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 abstract class A {
     abstract class Nested
 }
diff --git a/compiler/visualizer/testData/rawBuilder/declarations/constructorInObject.kt b/compiler/visualizer/testData/rawBuilder/declarations/constructorInObject.kt
index bf72ddf2559..3e7c2800f67 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/constructorInObject.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/constructorInObject.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 object A {
     constructor()
     init {}
diff --git a/compiler/visualizer/testData/rawBuilder/declarations/derivedClass.kt b/compiler/visualizer/testData/rawBuilder/declarations/derivedClass.kt
index e9a3a95fbd8..cd67ecf9e8b 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/derivedClass.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/derivedClass.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 open class Base<T>(val x: T)
 
 //                             constructor Base<T>(T)
diff --git a/compiler/visualizer/testData/rawBuilder/declarations/emptyAnonymousObject.kt b/compiler/visualizer/testData/rawBuilder/declarations/emptyAnonymousObject.kt
index 9281fa911b6..560b3ccd42c 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/emptyAnonymousObject.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/emptyAnonymousObject.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 fun test() {
 //      <anonymous>
 //      │
diff --git a/compiler/visualizer/testData/rawBuilder/declarations/enums.kt b/compiler/visualizer/testData/rawBuilder/declarations/enums.kt
index 0c682e94744..3e0897c3f6a 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/enums.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/enums.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 import my.println
 
 enum class Order {
diff --git a/compiler/visualizer/testData/rawBuilder/declarations/enums2.kt b/compiler/visualizer/testData/rawBuilder/declarations/enums2.kt
index a9718037dce..7c0c5c29432 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/enums2.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/enums2.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 interface Some
 
 object O1 : Some
diff --git a/compiler/visualizer/testData/rawBuilder/declarations/functionTypes.kt b/compiler/visualizer/testData/rawBuilder/declarations/functionTypes.kt
index 689c05978e3..be648389b48 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/functionTypes.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/functionTypes.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 //                               T fun (() -> T).invoke(): T
 //                               │ │
 fun <T> simpleRun(f: () -> T): T = f()
diff --git a/compiler/visualizer/testData/rawBuilder/declarations/noPrimaryConstructor.kt b/compiler/visualizer/testData/rawBuilder/declarations/noPrimaryConstructor.kt
index 466c23da8ff..5a2d35e9013 100644
--- a/compiler/visualizer/testData/rawBuilder/declarations/noPrimaryConstructor.kt
+++ b/compiler/visualizer/testData/rawBuilder/declarations/noPrimaryConstructor.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 class NoPrimary {
 //      String
 //      │
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/annotated.kt b/compiler/visualizer/testData/rawBuilder/expressions/annotated.kt
index 6a186055090..db38fac6d69 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/annotated.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/annotated.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 //constructor annotation/Target(vararg annotation/AnnotationTarget)
 //│     enum class annotation/AnnotationTarget: Enum<annotation/AnnotationTarget>
 //│     │                enum entry annotation/AnnotationTarget.EXPRESSION
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/calls.kt b/compiler/visualizer/testData/rawBuilder/expressions/calls.kt
index 7386ee668cc..22d4f026530 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/calls.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/calls.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 // WITH_RUNTIME
 //                                    fun (Int).plus(Int): Int
 //                             Int    │ distance.y: Int
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/classReference.kt b/compiler/visualizer/testData/rawBuilder/expressions/classReference.kt
index 3a29da0c46a..3a9a8a4808b 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/classReference.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/classReference.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 //WITH_RUNTIME
 package test
 
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/collectionLiterals.kt b/compiler/visualizer/testData/rawBuilder/expressions/collectionLiterals.kt
index 30380b4dbe5..36409ef9de0 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/collectionLiterals.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/collectionLiterals.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 annotation class Ann1(val arr: IntArray)
 
 annotation class Ann2(val arr: DoubleArray)
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/destructuring.kt b/compiler/visualizer/testData/rawBuilder/expressions/destructuring.kt
index a74f94b24a5..736a6a34b16 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/destructuring.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/destructuring.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 data class Some(val first: Int, val second: Double, val third: String)
 
 fun foo(some: Some) {
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/for.kt b/compiler/visualizer/testData/rawBuilder/expressions/for.kt
index da6e9f54ccd..313314af5cc 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/for.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/for.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 fun foo() {
 //            Int
 //            │fun (Int).rangeTo(Int): ranges/IntRange
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/genericCalls.kt b/compiler/visualizer/testData/rawBuilder/expressions/genericCalls.kt
index f0886fccdcb..34ab7f12045 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/genericCalls.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/genericCalls.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 //                          Nothing?
 //                          │ Nothing?
 //                          │ │
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/init.kt b/compiler/visualizer/testData/rawBuilder/expressions/init.kt
index 20c850b4b6e..9129d0df8ca 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/init.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/init.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 class WithInit(x: Int) {
 //      Int
 //      │
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/modifications.kt b/compiler/visualizer/testData/rawBuilder/expressions/modifications.kt
index 215e4f8f64d..60916b109a4 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/modifications.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/modifications.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 // WITH_RUNTIME
 fun simple() {
 //      Int Int
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/qualifierWithTypeArguments.kt b/compiler/visualizer/testData/rawBuilder/expressions/qualifierWithTypeArguments.kt
index 2e48ae0bd38..68849bf4d42 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/qualifierWithTypeArguments.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/qualifierWithTypeArguments.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 fun test() {
 //  class Array<T>: Any, Cloneable, java/io/Serializable
 //  │
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/super.kt b/compiler/visualizer/testData/rawBuilder/expressions/super.kt
index bfbc3ba3c4d..899888f7792 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/super.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/super.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 interface A {
     fun foo() {}
 }
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/these.kt b/compiler/visualizer/testData/rawBuilder/expressions/these.kt
index 83e2386f8e2..e38203d6326 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/these.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/these.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 class Some {
 //                 Int
 //                 │ Int
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/variables.kt b/compiler/visualizer/testData/rawBuilder/expressions/variables.kt
index cbe6d1557ed..8598d4ce3e6 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/variables.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/variables.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 fun foo() {
 //      Int Int
 //      │   │
diff --git a/compiler/visualizer/testData/rawBuilder/expressions/while.kt b/compiler/visualizer/testData/rawBuilder/expressions/while.kt
index 08fdd9d19d6..ec30454c9a6 100644
--- a/compiler/visualizer/testData/rawBuilder/expressions/while.kt
+++ b/compiler/visualizer/testData/rawBuilder/expressions/while.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 // WITH_RUNTIME
 fun foo(limit: Int) {
 //      Int Int
diff --git a/compiler/visualizer/testData/uncommonCases/resultFiles/delegation.kt b/compiler/visualizer/testData/uncommonCases/resultFiles/delegation.kt
index aef546c1e85..b9e3ca590ae 100644
--- a/compiler/visualizer/testData/uncommonCases/resultFiles/delegation.kt
+++ b/compiler/visualizer/testData/uncommonCases/resultFiles/delegation.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 interface Base {
     fun printMessage()
     fun printMessageLine()
diff --git a/compiler/visualizer/testData/uncommonCases/resultFiles/innerWith.kt b/compiler/visualizer/testData/uncommonCases/resultFiles/innerWith.kt
index 2b354fdce70..88c46445da2 100644
--- a/compiler/visualizer/testData/uncommonCases/resultFiles/innerWith.kt
+++ b/compiler/visualizer/testData/uncommonCases/resultFiles/innerWith.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 package p
 
 class A {
diff --git a/compiler/visualizer/testData/uncommonCases/resultFiles/properties.kt b/compiler/visualizer/testData/uncommonCases/resultFiles/properties.kt
index 018c0dadf28..f7ef9a8f922 100644
--- a/compiler/visualizer/testData/uncommonCases/resultFiles/properties.kt
+++ b/compiler/visualizer/testData/uncommonCases/resultFiles/properties.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 package org.jetbrains.kotlin.test
 
 //  Int  Int
diff --git a/compiler/visualizer/testData/uncommonCases/resultFiles/variance.kt b/compiler/visualizer/testData/uncommonCases/resultFiles/variance.kt
index 89fecb1e9f9..2009bb5aea2 100644
--- a/compiler/visualizer/testData/uncommonCases/resultFiles/variance.kt
+++ b/compiler/visualizer/testData/uncommonCases/resultFiles/variance.kt
@@ -1,4 +1,3 @@
-// FIR_IGNORE
 interface Source<out T> {
     fun nextT(): T
 }
diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/AbstractFirVisualizer.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/AbstractFirVisualizer.kt
index be4fa40f55c..d4c35caf6df 100644
--- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/AbstractFirVisualizer.kt
+++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/fir/AbstractFirVisualizer.kt
@@ -20,7 +20,7 @@ import java.io.File
 
 abstract class AbstractFirVisualizer : AbstractVisualizer() {
     override val frontendKind: FrontendKind<*> = FrontendKinds.FIR
-    override val frontendFacade: Constructor<FrontendFacade<*>> = { FirFrontendFacade(it) }
+    override val frontendFacade: Constructor<FrontendFacade<*>> = ::FirFrontendFacade
 
     override val handler: Constructor<FrontendOutputHandler<*>> = {
         object : FirAnalysisHandler(it) {
@@ -35,7 +35,7 @@ abstract class AbstractFirVisualizer : AbstractVisualizer() {
                 if (expectedText[0].startsWith("// FIR_IGNORE")) {
                     Assert.assertFalse(
                         "Files are identical, please delete ignore directive",
-                        expectedText.filterIndexed { index, _ -> index > 0 }.joinToString("\n") == firRenderResult
+                        expectedText.drop(1).joinToString("\n") == firRenderResult.trim()
                     )
                     return
                 }
diff --git a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/AbstractPsiVisualizer.kt b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/AbstractPsiVisualizer.kt
index 08554cde603..69212a0c9a3 100644
--- a/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/AbstractPsiVisualizer.kt
+++ b/compiler/visualizer/tests/org/jetbrains/kotlin/visualizer/psi/AbstractPsiVisualizer.kt
@@ -19,7 +19,7 @@ import java.io.File
 
 abstract class AbstractPsiVisualizer : AbstractVisualizer() {
     override val frontendKind: FrontendKind<*> = FrontendKinds.ClassicFrontend
-    override val frontendFacade: Constructor<FrontendFacade<*>> = { ClassicFrontendFacade(it) }
+    override val frontendFacade: Constructor<FrontendFacade<*>> = ::ClassicFrontendFacade
 
     override val handler: Constructor<FrontendOutputHandler<*>> = {
         object : ClassicFrontendAnalysisHandler(it) {