Add tests for extensions's signatures

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

@@ -10,19 +10,19 @@ extension [A](a: A)(using Int)
   def f1[B](b: B): (A, B)
   = ???
 
-extension [A](a: A)(using Int)
+extension [A](a: A)(using String)
   def f2(b: A): (A, A)
   = ???
 
-extension [A](a: A)(using Int)
+extension [A](a: A)(using Number)
   def f3(using String)(b: A): (A, A)
   = ???
 
 extension (a: Char)(using Int)
   def f4(using String)(b: Int): Unit
   = ???
 
-extension (a: Char)(using Int)
+extension (a: String)(using Int)
   def f5[B](using String)(b: B): Unit
   = ???
 
@@ -34,15 +34,15 @@ extension [A <: List[Char]](using String)(using Unit)(a: A)(using Int)(using Num
   def f7[B, C](b: B)(c: C): (A, B)
   = ???
 
-extension [A <: List[Char]](using String)(using Unit)(a: A)(using Int)(using Number)
+extension [A <: List[Char]](using String)(using Number)(a: A)(using Int)(using Unit)
   def f8(b: Any)(c: Any): Any
   = ???
 
-extension [A <: List[Char]](using String)(using Unit)(a: A)(using Int)(using Number)
+extension [A <: List[Char]](using Unit)(using String)(a: A)(using Int)(using Number)
   def f9[B, C](using Int)(b: B)(c: C): (A, B)
   = ???
 
-extension [A <: List[Char]](using String)(using Unit)(a: A)(using Int)(using Number)
+extension [A <: List[Char]](using Number)(using Unit)(a: A)(using Int)(using String)
   def f10(using Int)(b: Any)(c: Any): Any
    = ???
 
@@ -53,11 +53,25 @@ extension (using String)(using Unit)(a: Animal)(using Int)(using Number)
   def f11(b: Any)(c: Any): Any
   = ???
 
+extension (a: Int)
+  def f13(): Any
+  = ???
+
+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 Unit)(a: Animal)(using Int)(using Number)
-  def f13(b: Any)[T](c: T): T
+extension (using String)(using Int)(a: Animal)(using Unit)(using Number)
+  def f16(b: Any)[T](c: T): T
   = ???
-  def f14[D](b: D)[T](c: T): T
+  def f17[D](b: D)[T](c: T): T
   = ???
 
+
+

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

@@ -82,11 +82,18 @@ abstract class SignatureTest(
     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
+      kindMatch <- kinds.flatMap(k =>s"\\b$k\\b".r.findFirstMatchIn(signature)).headOption
       afterKind <- Option(kindMatch.after(0)) // to filter out nulls
-      nameMatch <- identifierRegex.findFirstMatchIn(afterKind)
+      nameMatch <- identifierRegex.findFirstMatchIn(
+        if kindMatch.group(0).contains("extension")
+        then
+          signature
+        else
+          afterKind
+        )
     yield nameMatch.group(1)
 
   private def signaturesFromSources(source: Source, kinds: Seq[String]): Seq[SignatureRes] =
@@ -110,6 +117,11 @@ 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
+      }
       val content = document.select(".documentableElement").forEach { elem =>
         val annotations = elem.select(".annotations").eachText.asScala.mkString("")
         val other = elem.select(".header .other-modifiers").eachText.asScala.mkString("")
@@ -122,13 +134,13 @@ abstract class SignatureTest(
         val all = s"$annotations$other $sigPrefix$signature".trim()
         signatures += all
       }
-
+    counter = 0
 
     IO.foreachFileIn(output, processFile)
     signatures.result
 
 object SignatureTest {
   val classlikeKinds = Seq("class",  "object", "trait", "enum") // TODO add docs for packages
-  val members = Seq("type", "def", "val", "var", "given")
+  val members = Seq("type", "def", "val", "var", "given", "extension")
   val all = classlikeKinds ++ members
 }

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)
+class ExtensionMethodSignature extends SignatureTest("extensionMethodSignatures", SignatureTest.all.filterNot(_ == "extension"))
 
 class ExtensionMethodParamsSignature extends SignatureTest("extensionParams", SignatureTest.all)