Simplify rendering inline block of HTML code blocks.

Author: charles7668

modules/markup/markdown/markdown_test.go

@@ -557,11 +557,11 @@ func TestMathBlock(t *testing.T) {
 		},
 		{
 			"$$a$$ test",
-			`<p></p><pre class="code-block is-loading"><code class="chroma language-math display">a</code></pre> test<p></p>` + nl,
+			`<p><code class="language-math display is-loading">a</code> test</p>` + nl,
 		},
 		{
 			"test $$a$$",
-			`<p>test </p><pre class="code-block is-loading"><code class="chroma language-math display">a</code></pre><p></p>` + nl,
+			`<p>test <code class="language-math display is-loading">a</code></p>` + nl,
 		},
 	}
 

modules/markup/markdown/math/inline_parser.go

@@ -97,7 +97,11 @@ func (parser *inlineParser) Parse(parent ast.Node, block text.Reader, pc parser.
 			break
 		}
 		suceedingCharacter := line[pos]
-		if !isPunctuation(suceedingCharacter) && !(suceedingCharacter == ' ') && !isBracket(suceedingCharacter) {
+		// check valid ending character
+		if !isPunctuation(suceedingCharacter) &&
+			!(suceedingCharacter == ' ') &&
+			!(suceedingCharacter == '\n') &&
+			!isBracket(suceedingCharacter) {
 			return nil
 		}
 		if line[ender-1] != '\\' {

modules/markup/markdown/math/inline_renderer.go

@@ -5,7 +5,6 @@ package math
 
 import (
 	"bytes"
-
 	"github.com/yuin/goldmark/ast"
 	"github.com/yuin/goldmark/renderer"
 	"github.com/yuin/goldmark/util"
@@ -21,11 +20,11 @@ func NewInlineRenderer() renderer.NodeRenderer {
 
 func (r *InlineRenderer) renderInline(w util.BufWriter, source []byte, n ast.Node, entering bool) (ast.WalkStatus, error) {
 	if entering {
+		extraClass := ""
 		if _, ok := n.(*InlineBlock); ok {
-			_, _ = w.WriteString(`<pre class="code-block is-loading"><code class="chroma language-math display">`)
-		} else {
-			_, _ = w.WriteString(`<code class="language-math is-loading">`)
+			extraClass = "display "
 		}
+		_, _ = w.WriteString(`<code class="language-math ` + extraClass + `is-loading">`)
 		for c := n.FirstChild(); c != nil; c = c.NextSibling() {
 			segment := c.(*ast.Text).Segment
 			value := util.EscapeHTML(segment.Value(source))
@@ -40,11 +39,7 @@ func (r *InlineRenderer) renderInline(w util.BufWriter, source []byte, n ast.Nod
 		}
 		return ast.WalkSkipChildren, nil
 	}
-	if _, ok := n.(*InlineBlock); ok {
-		_, _ = w.WriteString(`</code></pre>`)
-	} else {
-		_, _ = w.WriteString(`</code>`)
-	}
+	_, _ = w.WriteString(`</code>`)
 	return ast.WalkContinue, nil
 }
 

modules/markup/markdown/math/math.go

@@ -96,8 +96,8 @@ func (e *Extension) Extend(m goldmark.Markdown) {
 		util.Prioritized(NewInlineBracketParser(), 501),
 	}
 	if e.parseDollarInline {
-		inlines = append(inlines, util.Prioritized(NewInlineDualDollarParser(), 501),
-			util.Prioritized(NewInlineDollarParser(), 502))
+		inlines = append(inlines, util.Prioritized(NewInlineDollarParser(), 503),
+			util.Prioritized(NewInlineDualDollarParser(), 502))
 	}
 	m.Parser().AddOptions(parser.WithInlineParsers(inlines...))