Added some corrections

- Correct typo in SignatureTest file
- Correct from the feedback

Author: Dedelweiss

project/Build.scala

@@ -361,7 +361,7 @@ object Build {
   // Settings used when compiling dotty with a non-bootstrapped dotty
   lazy val commonBootstrappedSettings = commonDottySettings ++ NoBloopExport.settings ++ Seq(
     // To enable support of scaladoc and language-server projects you need to change this to true and use sbt as your build server
-    // bspEnabled := false,
+    bspEnabled := false,
     (Compile / unmanagedSourceDirectories) += baseDirectory.value / "src-bootstrapped",
 
     version := dottyVersion,

scaladoc-testcases/src/tests/extensionParams.scala

@@ -61,10 +61,6 @@ extension (using Unit)(a: Int)
   def f14(): Any
   = ???
 
-extension (a: Int)(using Unit)
-  def f15(): Any
-  = ???
-
 import scala.language.experimental.clauseInterleaving
 
 extension (using String)(using Int)(a: Animal)(using Unit)(using Number)

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

@@ -43,7 +43,7 @@ abstract class SignatureTest(
 
     val unexpected = unexpectedFromSources.flatMap(actualSignatures.get).flatten
     val expectedButNotFound = expectedFromSources.flatMap {
-      case (k, v) => findMissingSingatures(v, actualSignatures.getOrElse(k, Nil))
+      case (k, v) => findMissingSignatures(v, actualSignatures.getOrElse(k, Nil))
     }
 
     val missingReport = Option.when(!ignoreMissingSignatures && !expectedButNotFound.isEmpty)
@@ -75,26 +75,19 @@ abstract class SignatureTest(
   private val unexpectedRegex = raw"(.+)//unexpected".r
   private val identifierRegex = raw"^\s*(`.*`|(?:\w+)(?:_[^\[\(\s]+)|\w+|[^\[\(\s]+)".r
 
-  private def findMissingSingatures(expected: Seq[String], actual: Seq[String]): Set[String] =
+  private def findMissingSignatures(expected: Seq[String], actual: Seq[String]): Set[String] =
     expected.toSet &~ actual.toSet
 
   extension (s: String)
     private def startWithAnyOfThese(c: String*) = c.exists(s.startsWith)
     private def compactWhitespaces = whitespaceRegex.replaceAllIn(s, " ")
 
-  private var counter = 0
   private def findName(signature: String, kinds: Seq[String]): Option[String] =
     for
       kindMatch <- kinds.flatMap(k =>s"\\b$k\\b".r.findFirstMatchIn(signature)).headOption
       afterKind <- Option(kindMatch.after(0)) // to filter out nulls
-      nameMatch <- identifierRegex.findFirstMatchIn(
-        if kindMatch.group(0).contains("extension")
-        then
-          signature
-        else
-          afterKind
-        )
-    yield nameMatch.group(1)
+      nameMatch <- identifierRegex.findFirstMatchIn( afterKind )
+    yield if kindMatch.group(0).contains("extension") then signature else nameMatch.group(1) // The name of an extension will always be the signature itself
 
   private def signaturesFromSources(source: Source, kinds: Seq[String]): Seq[SignatureRes] =
     source.getLines.map(_.trim)
@@ -118,9 +111,7 @@ abstract class SignatureTest(
     def processFile(path: Path): Unit = if filterFunc(path) then
       val document = Jsoup.parse(IO.read(path))
       val documentable = document.select(".groupHeader").forEach { element =>
-        val signature = element.select(".groupHeader").eachText.asScala.mkString("")
-        val all = s"$signature"
-        signatures += all
+        signatures += element.text
       }
       val content = document.select(".documentableElement").forEach { elem =>
         val annotations = elem.select(".annotations").eachText.asScala.mkString("")
@@ -134,7 +125,6 @@ abstract class SignatureTest(
         val all = s"$annotations$other $sigPrefix$signature".trim()
         signatures += all
       }
-    counter = 0
 
     IO.foreachFileIn(output, processFile)
     signatures.result

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

@@ -39,7 +39,7 @@ class PackageObjectSymbolSignatures extends SignatureTest("packageObjectSymbolSi
 class MergedPackageSignatures extends SignatureTest("mergedPackage", SignatureTest.all.filterNot(_ == "object"),
   sourceFiles = List("mergedPackage1", "mergedPackage2", "mergedPackage3"))
 
-class ExtensionMethodSignature extends SignatureTest("extensionMethodSignatures", SignatureTest.all.filterNot(_ == "extension"))
+class ExtensionMethodSignature extends SignatureTest("extensionMethodSignatures", SignatureTest.all)
 
 class ExtensionMethodParamsSignature extends SignatureTest("extensionParams", SignatureTest.all)