Skip to content

Remove badmerge in the scaladoc #16752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 23, 2023
Merged

Remove badmerge in the scaladoc #16752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93592a6
Remove badmerge in the scaladoc
Kordyjan Jan 23, 2023
1b7f23d
Add the missing permissions for scaladoc cmd script
Kordyjan Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified project/scripts/cmdScaladocTests
100644 → 100755
View file
Open in desktop
Empty file.
28 changes: 0 additions & 28 deletions scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,34 +216,6 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
else renderPlain(s.head)
case _ => ""

def docPartRenderPlain(d: DocPart): String =
import dotty.tools.scaladoc.tasty.comments.wiki._
import com.vladsch.flexmark.util.ast.{Node => MdNode}
def renderPlain(wd: WikiDocElement): String =
wd match
case Paragraph(text) => renderPlain(text)
case Chain(items) => items.map(renderPlain).mkString("")
case Italic(text) => renderPlain(text)
case Bold(text) => renderPlain(text)
case Underline(text) => renderPlain(text)
case Superscript(text) => renderPlain(text)
case Subscript(text) => renderPlain(text)
case Link(link, title) => title.map(renderPlain).getOrElse(
link match
case DocLink.ToURL(url) => url
case DocLink.ToDRI(_, name) => name
case _ => ""
)
case Monospace(text) => renderPlain(text)
case Text(text) => text
case Summary(text) => renderPlain(text)
case _ => ""
d match
case s: Seq[WikiDocElement @unchecked] =>
if s.length == 0 then ""
else renderPlain(s.head)
case _ => ""

def processPage(page: Page, pageFQName: List[String]): Seq[(JSON, Seq[String])] =
val (res, pageName) = page.content match
case m: Member if m.kind != Kind.RootPackage =>
Expand Down