From 4691607586f8c15f54ee2bc34a90e7a829bd01cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Fri, 12 Mar 2021 13:50:52 +0100 Subject: [PATCH] Add source links to dotty library. Add icons to givens --- project/Build.scala | 6 ++++++ .../src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 250936f9466d..8a6629313547 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1611,6 +1611,11 @@ object Build { val stdLibRoot = projectRoot.relativize(managedSources.toPath.normalize()) val docRootFile = stdLibRoot.resolve("rootdoc.txt") + val dottyManagesSources = + (`stdlib-bootstrapped`/Compile/sourceManaged).value / "dotty-library-src" + + val dottyLibRoot = projectRoot.relativize(dottyManagesSources.toPath.normalize()) + if (dottyJars.isEmpty) Def.task { streams.value.log.error("Dotty lib wasn't found") } else Def.task{ IO.write(dest / "versions" / "latest-nightly-base", majorVersion) @@ -1638,6 +1643,7 @@ object Build { "gitter::https://gitter.im/scala/scala," + "twitter::https://twitter.com/scala_lang", s"-source-links:" + + s"$dottyLibRoot=github://lampepfl/dotty/master#library/src," + s"$stdLibRoot=github://scala/scala/v${stdlibVersion(Bootstrapped)}#src/library," + s"docs=github://lampepfl/dotty/master#docs", "-doc-root-content", docRootFile.toString diff --git a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala index 9497126e4134..aeb1948373b7 100644 --- a/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala +++ b/scaladoc/src/dotty/tools/scaladoc/renderers/HtmlRenderer.scala @@ -141,8 +141,8 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx ) private def buildNavigation(pageLink: Link): AppliedTag = - def navigationIcon(member: Member) = member.kind match { - case m if m.isInstanceOf[Classlike] => Seq(span(cls := s"micon ${member.kind.name.head}")) + def navigationIcon(member: Member) = member match { + case m if m.needsOwnPage => Seq(span(cls := s"micon ${member.kind.name.head}")) case _ => Nil }