Skip to content

Commit af059e1

Browse files
committed
fix snippet rendering
1 parent f873bbd commit af059e1

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

scaladoc/resources/dotty_res/styles/theme/color-tokens.css

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
--code-syntax-highlighting-subst: var(--yellow11);
6161
--code-syntax-highlighting-meta: var(--yellow11);
6262
--code-syntax-highlighting-string: var(--lime9);
63-
--code-syntax-highlighting-deletion: var(--purple9);
63+
--code-syntax-highlighting-addition: var(--grass9);
64+
--code-syntax-highlighting-deletion: var(--crimson11);
6465
--code-syntax-highlighting-variable: var(--purple9);
6566

6667
--code-method-highlighting-type: var(--purple9);
@@ -137,7 +138,8 @@
137138
--code-syntax-highlighting-subst: var(--yellow11);
138139
--code-syntax-highlighting-meta: var(--yellow11);
139140
--code-syntax-highlighting-string: var(--lime9);
140-
--code-syntax-highlighting-deletion: var(--purple9);
141+
--code-syntax-highlighting-addition: var(--grass9);
142+
--code-syntax-highlighting-deletion: var(--crimson11);
141143
--code-syntax-highlighting-variable: var(--purple9);
142144

143145
--code-method-highlighting-type: var(--purple9);

scaladoc/resources/dotty_res/styles/theme/components/code-snippet.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@
158158
color: var(--code-syntax-highlighting-deletion);
159159
}
160160

161+
.hljs-addition {
162+
color: var(--code-syntax-highlighting-addition);
163+
}
164+
161165
.hljs-variable {
162166
color: var(--code-syntax-highlighting-variable);
163167
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class DocRender(signatureRenderer: SignatureRenderer)(using DocContext):
6464
case 5 => h5(cls := "h50")(content)
6565
case 6 => h6(cls := "h50")(content)
6666
case Paragraph(text) => p(renderElement(text))
67-
case Code(data: String) => raw(SnippetRenderer.renderWikiSnippet(data))
67+
case Code(data: String) => raw(SnippetRenderer.renderSnippet(data))
6868
case HorizontalRule => hr
6969
case Table(header, columns, rows) =>
7070
table(

scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ object SnippetRenderer:
156156
node.compilationResult.fold(false)(_.isSuccessful)
157157
)
158158

159-
def renderWikiSnippet(content: String): String =
159+
def renderSnippet(content: String, language: Option[String] = None): String =
160160
val codeLines = content.split("\n").map(_ + "\n").toSeq
161161
div(cls := "snippet mono-small-block")(
162162
pre(
163-
code(
163+
code(language.fold(Nil)(l => Seq(cls := s"language-$l")))(
164164
raw(wrapCodeLines(codeLines).map(_.toHTML).mkString)
165165
)
166166
),

scaladoc/src/dotty/tools/scaladoc/tasty/comments/markdown/SnippetRenderingExtension.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ object SnippetRenderingExtension extends HtmlRenderer.HtmlRendererExtension:
2929

3030
object FencedCodeBlockHandler extends CustomNodeRenderer[FencedCodeBlock]:
3131
override def render(node: FencedCodeBlock, c: NodeRendererContext, html: HtmlWriter): Unit =
32-
html.raw("""<div class="snippet">""")
33-
c.delegateRender()
34-
html.raw("""</div>""")
32+
html.raw(SnippetRenderer.renderSnippet(node.getContentChars.toString, node.getInfo.toString.split(" ").headOption))
3533

3634
object Render extends NodeRenderer:
3735
override def getNodeRenderingHandlers: JSet[NodeRenderingHandler[_]] =

0 commit comments

Comments
 (0)