Fix language features in tests for gradual migration to 1.3 (part 2)

In 1.3, due to changes in language, testdata for some tests can be
different from 1.2

We want to simlultaneously test both versions, so instead of fixing
language version in such tests, we split them into two: one with fixed
1.2, another with fixed 1.3

compiler/testData/diagnostics/tests/cyclicHierarchy/withCompanion/everythingInOneScope_after.kt

@@ -0,0 +1,15 @@
+// !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
+// see https://youtrack.jetbrains.com/issue/KT-21515
+
+open class Container {
+    open class <!CYCLIC_SCOPES_WITH_COMPANION!>Base<!> {
+        open fun m() {}
+    }
+
+    // note that Base() supertype will be resolved in scope that was created on recursion
+    abstract class <!CYCLIC_SCOPES_WITH_COMPANION!>DerivedAbstract<!> : Base()
+
+    companion <!CYCLIC_SCOPES_WITH_COMPANION!>object<!> : DerivedAbstract() {
+        override fun m() {}
+    }
+}