Fix displaying multi-line signatures

Author: KacperFKorban

scaladoc-testcases/src/tests/hugetype.scala

@@ -0,0 +1,39 @@
+package tests.hugetype
+
+import compiletime._
+import compiletime.ops.int._
+import scala.annotation.experimental
+
+/**
+ * type
+ * noun
+ *
+ * a particular group of people or things that share similar characteristics and form a smaller division of a larger set:
+ * - There were so many different types of bread that I didn't know which to buy.
+ * - What type of clothes does she wear?
+ * - It was dark so I didn't notice what type of car it was.
+ * - He's the type of man you could take home to your mother.
+ * - He's very attractive, if you like the blond, athletic type.
+ * - They sell dried flowers and baskets and that type of thing.
+ * - We have a range of moisturizers for all different skin types.
+ * - She was young and she was wearing student-type clothes, so I assumed she was studying here.
+ * - He took me to a bar full of actor types trying to get noticed.
+ *
+ */
+type Take[T <: Tuple, N <: Int] <: Tuple = N match {
+  case 0 => EmptyTuple
+  case S[n1] => T match {
+    case EmptyTuple => EmptyTuple
+    case x *: xs => x *: Take[xs, n1]
+  }
+}
+
+/**
+ * Some important information :o
+ *
+ * @param a any value of type forall a. a
+ * @return Nothing, because I haven't implemented it yet ^^
+ */
+@experimental
+@deprecated
+implicit transparent inline def same[A](a: A): A = ???

scaladoc/resources/dotty_res/styles/scalastyle.css

@@ -602,15 +602,15 @@ footer .mode {
 }
 
 .kind {
-  margin-left: 0.5em;
+  font-weight: bold;
 }
 
 .other-modifiers a, .other-modifiers a:visited, .other-modifiers span[data-unresolved-link] {
   color: var(--link-sig-fg);
 }
 
 .documentableElement.expand .modifiers {
-  display: inline-table;
+  display: table-cell;
   min-width: 7em;
 }
 
@@ -629,7 +629,7 @@ footer .mode {
 }
 
 .expand .signature {
-  display: inline;
+  display: table-cell;
 }
 
 .documentableElement {
@@ -653,9 +653,7 @@ footer .mode {
 }
 
 .expand.documentableElement>div.header {
-  display: block;
-  padding-left: 4.5em;
-  text-indent: -4.5em;
+  display: inline-table;
 }
 
 .documentableElement>div .cover {

scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala

@@ -134,16 +134,17 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
 
     val rawBuilder = ScalaSignatureProvider.rawSignature(member, InlineSignatureBuilder())
     val inlineBuilder = rawBuilder.asInstanceOf[InlineSignatureBuilder]
-    if inlineBuilder.preName.isEmpty then println(member)
     val kind :: modifiersRevered = inlineBuilder.preName
     val signature = inlineBuilder.names.reverse
     Seq(
       span(cls := "modifiers")(
         span(cls := "other-modifiers")(modifiersRevered.reverse.map(renderElement)),
+      ),
+      div(cls := "signature")(
         span(cls := "kind")(renderElement(kind)),
+        renderLink(member.name, member.dri, nameClasses),
+        span(signature.map(renderElement))
       ),
-      renderLink(member.name, member.dri, nameClasses),
-      span(cls := "signature")(signature.map(renderElement)),
     )
 
   def memberIcon(member: Member) = member.kind match {

scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala

@@ -603,20 +603,20 @@ trait ClassLikeSupport:
     graph: HierarchyGraph = HierarchyGraph.empty,
     deprecated: Option[Annotation] = None,
   ) = Member(
-      name = symbol.normalizedName,
-      dri = symbol.dri,
-      kind = kind,
-      visibility = symbol.getVisibility(),
-      modifiers = modifiers,
-      annotations = symbol.getAnnotations(),
-      signature = signature,
-      sources = symbol.source,
-      origin = origin,
-      inheritedFrom = inheritedFrom,
-      graph = graph,
-      docs = symbol.documentation,
-      deprecated = deprecated
-    )
+    name = symbol.normalizedName,
+    dri = symbol.dri,
+    kind = kind,
+    visibility = symbol.getVisibility(),
+    modifiers = modifiers,
+    annotations = symbol.getAnnotations(),
+    signature = signature,
+    sources = symbol.source,
+    origin = origin,
+    inheritedFrom = inheritedFrom,
+    graph = graph,
+    docs = symbol.documentation,
+    deprecated = deprecated
+  )
 
   object EvidenceOnlyParameterList
   type RegularParameterList = Map[String, TypeRepr]

scaladoc/src/dotty/tools/scaladoc/tasty/TypesSupport.scala

@@ -80,7 +80,7 @@ trait TypesSupport:
       case _ => false
 
   // TODO #23 add support for all types signatures that makes sense
-  private def inner(using Quotes)(tp: reflect.TypeRepr): DocSignature =
+  private def inner(using Quotes)(tp: reflect.TypeRepr)(using indent: Int = 0): DocSignature =
     import reflect._
     def noSupported(name: String): DocSignature =
       println(s"WARN: Unsupported type: $name: ${tp.show}")
@@ -251,13 +251,15 @@ trait TypesSupport:
       case NoPrefix() => Nil
 
       case MatchType(bond, sc, cases) =>
+        val caseSpaces = " " * (indent + 2)
+        val spaces = " " * (indent)
         val casesTexts = cases.flatMap {
           case MatchCase(from, to) =>
-            texts("  case ") ++ inner(from) ++ texts(" => ") ++ inner(to) ++ texts("\n")
+            texts(caseSpaces + "case ") ++ inner(from) ++ texts(" => ") ++ inner(to)(using indent = indent + 2) ++ texts("\n")
           case TypeLambda(_, _, MatchCase(from, to)) =>
-            texts("  case ") ++ inner(from) ++ texts(" => ") ++ inner(to) ++ texts("\n")
+            texts(caseSpaces + "case ") ++ inner(from) ++ texts(" => ") ++ inner(to)(using indent = indent + 2) ++ texts("\n")
         }
-        inner(sc) ++ texts(" match {\n") ++ casesTexts ++ texts("}")
+        inner(sc) ++ texts(" match {\n") ++ casesTexts ++ texts(spaces + "}")
 
       case ParamRef(TypeLambda(names, _, _), i) => texts(names.apply(i))