Corrections

- Change SocialLinks and do a match case
- Rephrase ScaladocSetting for custom

Author: Dedelweiss

scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala

@@ -56,8 +56,7 @@ class ScaladocSettings extends SettingGroup with AllScalaSettings:
 
   val socialLinks: Setting[List[String]] =
     MultiStringSetting("-social-links", "social-links",
-      "Links to social sites. '[github|twitter|gitter|discord]::link' syntax is used." +
-        "'custom::link::white_icon_name::black_icon_name' is also allowed, in this case icons must be present in 'images/'' directory.")
+      "Links to social sites. '[github|twitter|gitter|discord]::link' or 'custom::link::light_icon_file_name[::dark_icon_file_name]' syntax is used. For custom links, the icons must be present in '_assets/images/'")
 
   val deprecatedSkipPackages: Setting[List[String]] =
     MultiStringSetting("-skip-packages", "packages", "Deprecated, please use `-skip-by-id` or `-skip-by-regex`")

scaladoc/src/dotty/tools/scaladoc/SocialLinks.scala

@@ -4,12 +4,12 @@ import java.nio.file.Path
 import java.nio.file.Paths
 import dotty.tools.dotc.core.Contexts.Context
 
-enum SocialLinks(val url: String, val whiteIcon: String, val darkIcon: String, val className: String):
-  case Github(ghUrl: String) extends SocialLinks(ghUrl, "", "", "gh")
-  case Twitter(tUrl: String) extends SocialLinks(tUrl, "", "", "twitter")
-  case Gitter(gUrl: String) extends SocialLinks(gUrl, "", "", "gitter")
-  case Discord(dUrl: String) extends SocialLinks(dUrl, "", "", "discord")
-  case Custom(cUrl: String, firstIcon: String, secondIcon: String) extends SocialLinks(cUrl, firstIcon, secondIcon, "custom")
+enum SocialLinks(val url: String, val className: String):
+  case Github(ghUrl: String) extends SocialLinks(ghUrl, "gh")
+  case Twitter(tUrl: String) extends SocialLinks(tUrl, "twitter")
+  case Gitter(gUrl: String) extends SocialLinks(gUrl, "gitter")
+  case Discord(dUrl: String) extends SocialLinks(dUrl, "discord")
+  case Custom(cUrl: String, lightIcon: String, darkIcon: String) extends SocialLinks(cUrl, "custom")
 
 object SocialLinks:
   def parse(s: String): Either[String, SocialLinks] =

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

@@ -175,13 +175,14 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
     def icon(link: SocialLinks) = link.className
     args.socialLinks.map { link =>
       a(href := link.url) (
-        if icon(link) == "custom" then
-          Seq(
-            img(cls := s"icon-button ${icon(link)}", src := s"../../../../images/${link.whiteIcon}"),
-            img(cls := s"icon-button ${icon(link)}-dark", src := s"../../../../images/${link.darkIcon}")
-          )
-        else
-          button(cls := s"icon-button ${icon(link)}")
+        link match
+          case SocialLinks.Custom(_, lightIcon, darkIcon) => 
+            Seq(
+              img(cls := s"icon-button ${icon(link)}", src := s"../../../../images/$lightIcon"),
+              img(cls := s"icon-button ${icon(link)}-dark", src := s"../../../images/$darkIcon")
+            )
+          case _ =>
+            button(cls := s"icon-button ${icon(link)}")
       )
     }