Constructor companion gets privateWithin

Author: som-snytt

compiler/src/dotty/tools/dotc/core/NamerOps.scala

@@ -183,8 +183,9 @@ object NamerOps:
         cls.owner, cls.name.toTermName,
         flags, flags,
         constructorCompanionCompleter(cls),
-        coord = cls.coord,
-        compUnitInfo = cls.compUnitInfo)
+        cls.privateWithin,
+        cls.coord,
+        cls.compUnitInfo)
     companion.moduleClass.registerCompanion(cls)
     cls.registerCompanion(companion.moduleClass)
     companion

tests/neg/i22560b.scala

@@ -12,7 +12,9 @@ package p:
   private[p] class C(i: Int) // ctor proxy gets privateWithin of class
   private[p] class D(i: Int)
   object D
+  private class E(i: Int)
 
 package q:
   def f() = p.C(42) // error
   def g() = p.D(42) // error
+  def h() = p.E(42) // error

tests/neg/i22560c/client_2.scala

@@ -0,0 +1,11 @@
+
+package i22560:
+  val alpha = C.D() // error
+
+  class Test extends Enumeration:
+    val Hearts = Val(27) // error
+    val Diamonds = Val() // error
+
+package q:
+  def f() = p.C(42) // error
+  def g() = p.D(42) // error

tests/neg/i22560c/lib_1.scala

@@ -0,0 +1,16 @@
+
+package i22560:
+
+  object C:
+    protected class D
+
+  class Enumeration:
+    protected class Val(i: Int):
+      def this() = this(42)
+    object Val
+
+package p:
+  private[p] class C(i: Int) // companion gets privateWithin of class
+  private[p] class D(i: Int) // ctor proxy gets privateWithin of class
+  object D
+

tests/pos/i22560.scala

@@ -20,3 +20,13 @@ package companioned:
   class Test extends Enumeration:
     val Hearts = Val(27)
     val Diamonds = Val()
+
+package p:
+
+  package internal:
+
+    protected[p] class P(i : Int)
+    private[p] class Q(i : Int)
+
+  def f = internal.P(42)
+  def g = internal.Q(42)

tests/pos/i22560b/client_2.scala

@@ -0,0 +1,17 @@
+
+package companionless:
+
+  class Test extends Enumeration:
+    val Hearts = Val(27)
+    val Diamonds = Val()
+
+
+package companioned:
+
+  class Test extends Enumeration:
+    val Hearts = Val(27)
+    val Diamonds = Val()
+
+package p:
+
+  def f = internal.P(42)

tests/pos/i22560b/lib_1.scala

@@ -0,0 +1,19 @@
+
+package companionless:
+
+  class Enumeration:
+    protected class Val(i: Int):
+      def this() = this(42)
+
+package companioned:
+
+  class Enumeration:
+    protected class Val(i: Int):
+      def this() = this(42)
+    protected object Val
+
+package p:
+
+  package internal:
+
+    protected[p] class P(i : Int)