Migrate hybrid tests

Author: liufengyun

compiler/src/dotty/tools/dotc/transform/init/Checking.scala

@@ -206,7 +206,7 @@ object Checking {
 
             case Warm(cls, outer) =>
               theCtx.warning(
-                "Leaking of warm value " + eff.source.show +
+                "Leaking of value under initialization: " + pot.source.show +
                 ". Calling trace:\n" + state.trace,
                 eff.source.sourcePos
               )

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -302,7 +302,6 @@ class CompilationTests extends ParallelTesting {
     aggregateTests(
       compileFilesInDir("tests/init/neg/", options),
       compileFilesInDir("tests/init/neg/misc", options),
-      compileFilesInDir("tests/init/neg/hybrid", options),
       compileFilesInDir("tests/init/neg/crash", options),
     )
   }.checkExpectedErrors()

tests/init/neg/hybrid/hybrid2.scala

@@ -2,14 +2,14 @@ trait A {
   def g: Int
 }
 
-class X(_y: Y) {
-  class B extends A {
-    def g = _y.n
+class Y {
+  class X {
+    class B extends A {
+      def g = n
+    }
   }
-}
 
-class Y {
-  val x = new X(this)
+  val x = new X
 
   class C extends x.B {
     g

tests/init/neg/hybrid/hybrid5.scala

@@ -0,0 +1,19 @@
+trait A {
+  def g: Int
+}
+
+class Y {
+
+  class X {
+    class B extends A {
+      def g = n
+    }
+
+    val b = new B
+  }
+
+  val x = new X
+  x.b.g               // error
+
+  val n = 10
+}

tests/init/neg/hybrid/hybrid6.scala

@@ -3,10 +3,10 @@ class Foo {
     val len = list.size
   }
 
-  val bar: Bar = new Bar(this)
+  class Bar {
+    val inner = new Inner
+  }
+
+  val bar: Bar = new Bar
   val list = List(1, 2, 3)       // error
 }
-
-class Bar(val _foo: Foo) {
-  val inner = new _foo.Inner
-}

tests/init/neg/hybrid/hybrid1.scala renamed to tests/init/neg/hybrid1.scala

@@ -0,0 +1,19 @@
+class Foo {
+  val bar = new Bar
+  var x: bar.Inner = new bar.Inner
+
+  class Inner {
+    val len = list.size
+  }
+
+  class Bar {
+    class Inner {
+      val x  = g
+      val len: Int = x.len
+    }
+
+    def g = new Foo.this.Inner
+  }
+
+  val list = List(1, 2, 3)  // error
+}

tests/init/neg/hybrid2.scala

@@ -0,0 +1,15 @@
+class Foo {
+  val bar = new Bar
+  var x: bar.Inner = new bar.Inner
+
+  class Bar {
+    class Inner {
+      val x = g
+      val len = x.size
+    }
+
+    def g = list
+  }
+
+  val list = List(1, 2, 3)    // error
+}