Removed Edge and Vertex abstraction to simplify graph

Author: BarkingBad

scala3doc/src/dotty/dokka/model/api/api.scala

@@ -98,28 +98,15 @@ extension (s: Signature):
   def join(a: Signature): Signature = s ++ a
 
 case class LinkToType(signature: Signature, dri: DRI, kind: Kind)
-
-case class Vertex(id: Int, body: LinkToType)
-case class Edge(from: Vertex, to: Vertex)
-case class HierarchyGraph private (edges: Seq[Edge], private val nextId: Int):
-  def vertecies = edges.flatMap(edge => Seq(edge.from, edge.to)).distinct
-  def +(edge: (LinkToType, LinkToType)) = 
-    val from = vertecies.find(_.body == edge._1).getOrElse(Vertex(nextId, edge._1))
-    val to = vertecies.find(_.body == edge._2).getOrElse {
-      val id = if from.id == nextId then nextId + 1 else nextId
-      Vertex(id, edge._2)
-    }
-    val higherId = List(from.id, to.id).max
-    val newNextId = if higherId >= nextId then higherId + 1 else nextId 
-    HierarchyGraph(edges ++ Seq(Edge(from, to)), newNextId)
-
-  def ++(edges: Seq[(LinkToType, LinkToType)]) = edges.foldLeft(this) {
+case class HierarchyGraph(edges: Seq[(LinkToType, LinkToType)]):
+  def vertecies: Seq[LinkToType] = edges.flatten((a, b) => Seq(a, b)).distinct
+  val verteciesWithId: Map[LinkToType, Int] = vertecies.zipWithIndex.toMap
+  def +(edge: (LinkToType, LinkToType)): HierarchyGraph = HierarchyGraph((edges :+ edge).distinct)
+  def ++(edges: Seq[(LinkToType, LinkToType)]): HierarchyGraph = edges.foldLeft(this) {
     case (acc, edge) => acc + edge
   }
-
 object HierarchyGraph:
-  def empty = HierarchyGraph(Seq.empty, 0)
-  def withEdge(edge: (LinkToType, LinkToType)) = HierarchyGraph.empty + edge
+  def empty = HierarchyGraph(Seq.empty)
   def withEdges(edges: Seq[(LinkToType, LinkToType)]) = HierarchyGraph.empty ++ edges
 
 

scala3doc/src/dotty/dokka/tasty/ClassLikeSupport.scala

@@ -55,7 +55,7 @@ trait ClassLikeSupport:
       }
       val selfSiangture: DSignature = typeForClass(classDef).dokkaType.asSignature
 
-      val graph = HierarchyGraph.empty ++ getSupertypesGraph(classDef, LinkToType(selfSiangture, classDef.symbol.dri, kindForClasslike(classDef.symbol)))
+      val graph = HierarchyGraph.withEdges(getSupertypesGraph(classDef, LinkToType(selfSiangture, classDef.symbol.dri, kindForClasslike(classDef.symbol))))
       val baseExtra = PropertyContainer.Companion.empty()
             .plus(ClasslikeExtension(classDef.getConstructorMethod, classDef.getCompanion))
             .plus(MemberExtension(

scala3doc/src/dotty/dokka/translators/ScalaPageCreator.scala

@@ -430,14 +430,14 @@ class ScalaPageCreator(
                         }
                     }
 
-            graph.fold(withSubtypes) { g =>
-                if g.edges.size == 0 then withSubtypes else
+            graph.fold(withSubtypes) { graph =>
+                if graph.edges.isEmpty then withSubtypes else
                     withSubtypes.header(2, "Type hierarchy")().group(
                         kind = ContentKind.Comment,
                         styles = Set(ContentStyle.WithExtraAttributes), 
                         extra = PropertyContainer.Companion.empty plus SimpleAttr.Companion.header("Type hierarchy")
                     ) { _.group(kind = ContentKind.Symbol, styles = Set(TextStyle.Monospace)) { 
-                            _.dotDiagram(g)
+                            _.dotDiagram(graph)
                         }
                     }
             }

scala3doc/src/dotty/renderers/DotDiagramBuilder.scala

@@ -11,12 +11,13 @@ import dotty.dokka.model.api._
 
 object DotDiagramBuilder:
     def build(diagram: HierarchyGraph, renderer: SignatureRenderer): String = 
-        val vertecies = diagram.edges.flatMap(edge => Seq(edge.from, edge.to)).distinct.map { vertex =>
-            s"""node${vertex.id} [label="${getHtmlLabel(vertex, renderer)}", style="${getStyle(vertex)}"];\n"""
+        val vWithId = diagram.verteciesWithId
+        val vertecies = vWithId.map { (vertex, id) =>
+            s"""node${id} [label="${getHtmlLabel(vertex, renderer)}", style="${getStyle(vertex)}"];\n"""
         }.mkString
 
-        val edges = diagram.edges.map { edge =>
-            s"""node${edge.from.id} -> node${edge.to.id};\n"""
+        val edges = diagram.edges.map { (from, to) =>
+            s"""node${vWithId(from)} -> node${vWithId(to)};\n"""
         }.mkString
 
         s""" digraph g {
@@ -27,7 +28,7 @@ object DotDiagramBuilder:
         |""".stripMargin
 
 
-    private def getStyle(vertex: Vertex) = vertex.body.kind match
+    private def getStyle(vertex: LinkToType) = vertex.kind match 
         case Kind.Class => "fill: #45AD7D;"
         case Kind.Object => "fill: #285577;"
         case Kind.Trait => "fill: #1CAACF;"
@@ -36,9 +37,9 @@ object DotDiagramBuilder:
         case other => sys.error(s"unexpected value: $other")
 
 
-    private def getHtmlLabel(vertex: Vertex, renderer: SignatureRenderer): String =
+    private def getHtmlLabel(vertex: LinkToType, renderer: SignatureRenderer): String =
         span(style := "color: #FFFFFF;")(
-            vertex.body.kind.name,
+            vertex.kind.name,
             " ",
-            vertex.body.signature.map(renderer.renderElementWith(_))
+            vertex.signature.map(renderer.renderElementWith(_))
         ).toString.replace("\"", "\\\"")