azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR TEST] Add some FIR_IDENTICAL to fix recently changed tests

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-09-21 16:19:54 +03:00
parent c9054e7a04
commit a9972913a6
14 changed files with 7 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.fir.kt
Vendored
-15
View File
@@ -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() {}
}
}
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// see https://youtrack.jetbrains.com/issue/KT-21515
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.fir.kt
Vendored
-15
View File
@@ -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 : <!UNRESOLVED_REFERENCE!>Data<!>()
companion object : DerivedAbstract()
}
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/noMembers_after.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// see https://youtrack.jetbrains.com/issue/KT-21515
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.fir.kt
Vendored
-18
View File
@@ -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() {}
}
}
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/onlyInterfaces_after.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// see https://youtrack.jetbrains.com/issue/KT-21515
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/typeIsLowEnough.fir.kt
Vendored
-20
View File
@@ -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() {}
}
}
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/typeIsLowEnough.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// see https://youtrack.jetbrains.com/issue/KT-21515
abstract class DerivedAbstract : C.Base() {
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.fir.kt
Vendored
-20
View File
@@ -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()
}
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withIrrelevantInterface_after.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// see https://youtrack.jetbrains.com/issue/KT-21515
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.fir.kt
Vendored
-58
View File
@@ -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()
}
}
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withMembers_after.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
// see https://youtrack.jetbrains.com/issue/KT-21515
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withoutTypeReference.fir.kt
Vendored
-17
View File
@@ -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() {}
}
}
compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/withoutTypeReference.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// see https://youtrack.jetbrains.com/issue/KT-21515
abstract class DerivedAbstract : C.Base()