Skip to content

Commit c5261b8

Browse files
committed
Remove the duplicate logo
- I added an orElse to the snippet
1 parent 5c2efc5 commit c5261b8

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ object Build {
361361
// Settings used when compiling dotty with a non-bootstrapped dotty
362362
lazy val commonBootstrappedSettings = commonDottySettings ++ NoBloopExport.settings ++ Seq(
363363
// To enable support of scaladoc and language-server projects you need to change this to true and use sbt as your build server
364-
bspEnabled := false,
364+
//bspEnabled := false,
365365
(Compile / unmanagedSourceDirectories) += baseDirectory.value / "src-bootstrapped",
366366

367367
version := dottyVersion,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,11 @@ class HtmlRenderer(rootPackage: Member, members: Map[DRI, Member])(using ctx: Do
207207
}
208208

209209
val darkProjectLogoElem =
210-
darkProjectLogo.flatMap {
210+
darkProjectLogo.orElse(projectLogo).flatMap {
211211
case Resource.File(path, _) =>
212212
Some(span(id := "dark-project-logo", cls := "project-logo")(img(src := resolveRoot(link.dri, path))))
213213
case _ => None
214-
}.orElse(projectLogoElem)
214+
}
215215

216216
val parentsHtml =
217217
val innerTags = parents.flatMap[TagArg](b => Seq(

scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ abstract class MarkupConversion[T](val repr: Repr)(using dctx: DocContext) {
106106
val msg = s"Unable to parse query: ${err.getMessage}"
107107
DocLink.UnresolvedDRI(queryStr, msg)
108108
case Right(query) =>
109+
println(s"Looking up $queryStr")
110+
println(s"Owner: $owner")
111+
println(MemberLookup.lookup(using qctx)(query, owner))
109112
MemberLookup.lookup(using qctx)(query, owner) match
110113
case Some((sym, targetText, inheritingParent)) =>
111114
var dri = inheritingParent match

0 commit comments

Comments
 (0)