Merge pull request #8393 from dotty-staging/i8368

Fix #8368: Don't generate forwarders for excluded exports

Author: anatoliykmetyuk

compiler/src/dotty/tools/dotc/typer/Namer.scala

@@ -1135,7 +1135,8 @@ class Namer { typer: Typer =>
             if sel.isWildcard then
               addWildcardForwarders(seen, sel.span)
             else
-              addForwardersNamed(sel.name, sel.rename, sel.span)
+              if sel.rename != nme.WILDCARD then
+                addForwardersNamed(sel.name, sel.rename, sel.span)
               addForwarders(sels1, sel.name :: seen)
           case _ =>
 

tests/neg/exports.check

@@ -7,17 +7,13 @@
    |                     ^^^^^^^^^^^^^^
    |                     no eligible member scanAll at this.scanUnit
    |                     this.scanUnit.scanAll cannot be exported because it is not accessible
--- Error: tests/neg/exports.scala:23:27 --------------------------------------------------------------------------------
-23 |    export printUnit.{stat => _, _} // error: double definition // error: double definition
-   |                      ^^^^^^^^^
-   |                      no eligible member stat at this.printUnit
 -- Error: tests/neg/exports.scala:25:21 --------------------------------------------------------------------------------
 25 |    export printUnit.bitmap         // error: no eligible member
    |                     ^
    |                     non-private method bitmap in class Copier refers to private value printUnit
    |                     in its type signature => Copier.this.printUnit.bitmap.type
 -- [E120] Duplicate Symbol Error: tests/neg/exports.scala:23:33 --------------------------------------------------------
-23 |    export printUnit.{stat => _, _} // error: double definition // error: double definition
+23 |    export printUnit.{stat => _, _} // error: double definition
    |                                 ^
    |                                 Double definition:
    |                                 def status: => List[String] in class Copier at line 28 and

tests/neg/exports.scala

@@ -20,7 +20,7 @@
 
     export scanUnit.scanIt          // error: no eligible member
     export scanUnit.{scanAll => foo} // error: no eligible member
-    export printUnit.{stat => _, _} // error: double definition // error: double definition
+    export printUnit.{stat => _, _} // error: double definition
     export scanUnit._               // error: double definition
     export printUnit.bitmap         // error: no eligible member
     export printUnit.status         // error: double definition

tests/neg/i8368.scala

@@ -0,0 +1,11 @@
+trait Foo {
+  def a = 1
+  def b = 1
+  def c = 1
+}
+
+class Bar(foo: Foo) {
+  export foo.{a => _, b => _, _}
+  val x1 = a // error
+  val x2 = b // error
+}

tests/pos/i8368.scala

@@ -0,0 +1,10 @@
+trait Foo {
+  def a = 1
+  def b = 1
+  def c = 1
+}
+
+class Bar(foo: Foo) {
+  export foo.{a => _, b => _, _}
+  val x1 = c
+}