Fix exports test in Scaladoc

Author: pikinier20

scaladoc-testcases/src/tests/exports1.scala renamed to scaladoc-testcases/src/tests/exports.scala

@@ -1,5 +1,5 @@
 package tests
-package exports1
+package exports
 
 class A: //unexpected
   def aDefInt: Int
@@ -42,4 +42,12 @@ object X: //unexpected
   var xVarInt: Int
    = 1
   var xVar1: 1
-   = 1
+   = 1
+
+class B: //unexpected
+  val a: A
+   = new A
+  export a.{Object => Obj, _}
+  export X._
+  def obj: Obj.type
+   = Obj

scaladoc-testcases/src/tests/exports2.scala

@@ -31,9 +31,11 @@ abstract class SignatureTest(
       .map { file => Source.fromFile(s"${BuildInfo.test_testcasesSourceRoot}/tests/$file.scala") }
       .flatMap(signaturesFromSources(_, signatureKinds))
       .toList
+
     val expectedFromSources: Map[String, List[String]] = allSignaturesFromSources
       .collect { case e: Expected => e }
       .groupMap(_.name)(_.signature)
+
     val unexpectedFromSources: Set[String] = allSignaturesFromSources.collect { case Unexpected(name) => name }.toSet
 
     val actualSignatures: Map[String, Seq[String]] =
@@ -84,7 +86,7 @@ abstract class SignatureTest(
 
   private def findName(signature: String, kinds: Seq[String]): Option[String] =
     for
-      kindMatch <- kinds.flatMap(k => s"\\b$k\\b".r.findFirstMatchIn(signature)).headOption
+      kindMatch <- kinds.flatMap(k => s"\\b$k\\b".r.findFirstMatchIn(signature)).minByOption(_.start)
       afterKind <- Option(kindMatch.after(0)) // to filter out nulls
       nameMatch <- identifierRegex.findFirstMatchIn(afterKind)
     yield nameMatch.group(1)
@@ -96,7 +98,8 @@ abstract class SignatureTest(
       .toSeq
       .flatMap {
         case unexpectedRegex(signature) => findName(signature, kinds).map(Unexpected(_))
-        case expectedRegex(signature) => findName(signature, kinds).map(Expected(_, signature))
+        case expectedRegex(signature) =>
+          findName(signature, kinds).map(Expected(_, signature))
         case signature =>
           findName(signature, kinds).map(
             Expected(_, commentRegex.replaceAllIn(signature, "")

scaladoc/test/dotty/tools/scaladoc/signatures/SignatureTest.scala

@@ -91,7 +91,7 @@ class ContextBounds extends SignatureTest("contextBounds", SignatureTest.all)
 
 class FBoundedTypeParameters extends SignatureTest("fboundedTypeParameters", SignatureTest.all)
 
-class Exports extends SignatureTest("exports2", SignatureTest.all, sourceFiles = List("exports1", "exports2"))
+class Exports extends SignatureTest("exports", SignatureTest.all, filterFunc = _.toString.endsWith("B.html"))
 
 class ContextFunctions extends SignatureTest("contextfunctions", SignatureTest.all)