From a9972913a6e993b1ae4a4884c1d69ce18d76e0c8 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 21 Sep 2020 16:19:54 +0300 Subject: [PATCH] [FIR TEST] Add some FIR_IDENTICAL to fix recently changed tests --- .../everythingInOneScope_after.fir.kt | 15 ----- .../everythingInOneScope_after.kt | 1 + .../withCompanion/noMembers_after.fir.kt | 15 ----- .../withCompanion/noMembers_after.kt | 1 + .../withCompanion/onlyInterfaces_after.fir.kt | 18 ------ .../withCompanion/onlyInterfaces_after.kt | 1 + .../withCompanion/typeIsLowEnough.fir.kt | 20 ------- .../withCompanion/typeIsLowEnough.kt | 1 + .../withIrrelevantInterface_after.fir.kt | 20 ------- .../withIrrelevantInterface_after.kt | 1 + .../withCompanion/withMembers_after.fir.kt | 58 ------------------- .../withCompanion/withMembers_after.kt | 1 + .../withCompanion/withoutTypeReference.fir.kt | 17 ------ .../withCompanion/withoutTypeReference.kt | 1 + 14 files changed, 7 insertions(+), 163 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.fir.kt delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.fir.kt delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.fir.kt delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/typeIsLowEnough.fir.kt delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.fir.kt delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.fir.kt delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withoutTypeReference.fir.kt diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.fir.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.fir.kt deleted file mode 100644 index 971fc966757..00000000000 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.fir.kt +++ /dev/null @@ -1,15 +0,0 @@ -// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion -// see https://youtrack.jetbrains.com/issue/KT-21515 - -open class Container { - open class Base { - open fun m() {} - } - - // note that Base() supertype will be resolved in scope that was created on recursion - abstract class DerivedAbstract : Base() - - companion object : DerivedAbstract() { - override fun m() {} - } -} diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.kt index 971fc966757..1e2f47ed59b 100644 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.kt +++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion // see https://youtrack.jetbrains.com/issue/KT-21515 diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.fir.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.fir.kt deleted file mode 100644 index cfa5ffa10b9..00000000000 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.fir.kt +++ /dev/null @@ -1,15 +0,0 @@ -// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion -// see https://youtrack.jetbrains.com/issue/KT-21515 - -abstract class DerivedAbstract : C.Base() { - open class Data -} - -public class C { - - open class Base () - - class Foo : Data() - - companion object : DerivedAbstract() -} diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.kt index 5cf15f3455d..63dd40066b1 100644 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.kt +++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion // see https://youtrack.jetbrains.com/issue/KT-21515 diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.fir.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.fir.kt deleted file mode 100644 index 350e095af2c..00000000000 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.fir.kt +++ /dev/null @@ -1,18 +0,0 @@ -// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion -// see https://youtrack.jetbrains.com/issue/KT-21515 - -open class Container { - // Note that here we also have errors and diagnostics, even though there are actually no loops. - // (this is case because we can't know if there are any loops without resolving, but resolving - // itself provokes loops) - - interface Base { - open fun m() {} - } - - interface DerivedAbstract : Base - - companion object : DerivedAbstract { - override fun m() {} - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.kt index 350e095af2c..644ecc3224e 100644 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.kt +++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion // see https://youtrack.jetbrains.com/issue/KT-21515 diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/typeIsLowEnough.fir.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/typeIsLowEnough.fir.kt deleted file mode 100644 index e7d57338d70..00000000000 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/typeIsLowEnough.fir.kt +++ /dev/null @@ -1,20 +0,0 @@ -// see https://youtrack.jetbrains.com/issue/KT-21515 - -abstract class DerivedAbstract : C.Base() { - override abstract fun m() -} - -public class C { - class Data - - open class Base () { - open fun m() {} - } - - // Note that Data is resolved successfully here because we don't step on error-scope - val data: Data = Data() - - companion object : DerivedAbstract() { - override fun m() {} - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/typeIsLowEnough.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/typeIsLowEnough.kt index e7d57338d70..ce287591a40 100644 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/typeIsLowEnough.kt +++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/typeIsLowEnough.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // see https://youtrack.jetbrains.com/issue/KT-21515 abstract class DerivedAbstract : C.Base() { diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.fir.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.fir.kt deleted file mode 100644 index b402ba85820..00000000000 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.fir.kt +++ /dev/null @@ -1,20 +0,0 @@ -// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion -// see https://youtrack.jetbrains.com/issue/KT-21515 - -interface SomeIrrelevantInterface - -// note that C.Base() supertype will be resolved in normal scope -abstract class DerivedAbstract : C.Base() - -class Data - -public class C { - - val data: Data = Data() - - // Note that any supertype of Base will be resolved in error-scope, even if it absolutely irrelevant - // to the types in cycle. - open class Base() : SomeIrrelevantInterface - - companion object : DerivedAbstract() -} diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.kt index b402ba85820..0d352ff7f81 100644 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.kt +++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion // see https://youtrack.jetbrains.com/issue/KT-21515 diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.fir.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.fir.kt deleted file mode 100644 index 4826e4a9fe1..00000000000 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.fir.kt +++ /dev/null @@ -1,58 +0,0 @@ -// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion -// see https://youtrack.jetbrains.com/issue/KT-21515 - -object WithFunctionInBase { - abstract class DerivedAbstract : C.Base() - - class Data - - public class C { - val data: Data = Data() - - open class Base() { - fun foo(): Int = 42 - } - - companion object : DerivedAbstract() - } -} - -object WithPropertyInBase { - // This case is very similar to previous one, but there are subtle differences from POV of implementation - - abstract class DerivedAbstract : C.Base() - - class Data - - public class C { - - open class Base() { - val foo: Int = 42 - } - - val data: Data = Data() - - companion object : DerivedAbstract() - } -} - -object WithPropertyInBaseDifferentOrder { - // This case is very similar to previous one, but there are subtle differences from POV of implementation - // Note how position of property in file affected order of resolve, and, consequently, its results and - // diagnostics. - - abstract class DerivedAbstract : C.Base() - - class Data - - public class C { - val data: Data = Data() - - open class Base() { - val foo: Int = 42 - - } - - companion object : DerivedAbstract() - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.kt index 4826e4a9fe1..045565d4992 100644 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.kt +++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion // see https://youtrack.jetbrains.com/issue/KT-21515 diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withoutTypeReference.fir.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withoutTypeReference.fir.kt deleted file mode 100644 index b624ea1f79a..00000000000 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withoutTypeReference.fir.kt +++ /dev/null @@ -1,17 +0,0 @@ -// see https://youtrack.jetbrains.com/issue/KT-21515 - -abstract class DerivedAbstract : C.Base() - -class Data - -open class C { - open class Base { - open fun m() {} - } - - val field = Data() - - companion object : DerivedAbstract() { - override fun m() {} - } -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withoutTypeReference.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withoutTypeReference.kt index b624ea1f79a..5a95044ad48 100644 --- a/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withoutTypeReference.kt +++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withoutTypeReference.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // see https://youtrack.jetbrains.com/issue/KT-21515 abstract class DerivedAbstract : C.Base()