fix default (non-conflict) inline syntax

Author: wxiaoguang

modules/markup/markdown/markdown_math_test.go

@@ -257,6 +257,9 @@ func TestMathRenderOptions(t *testing.T) {
 		assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(string(res)), "input: %s", input)
 	}
 
+	// default (non-conflict) inline syntax
+	test(t, `<p><code class="language-math">a</code></p>`, "$`a`$")
+
 	// ParseInlineDollar
 	test(t, `<p>$a$</p>`, `$a$`)
 	setting.Markdown.MathCodeBlockOptions.ParseInlineDollar = true

modules/markup/markdown/math/inline_parser.go

@@ -16,16 +16,16 @@ type inlineParser struct {
 	endBytesSingleDollar []byte
 	endBytesDoubleDollar []byte
 	endBytesParentheses  []byte
+	enableInlineDollar   bool
 }
 
-var defaultInlineDollarParser = &inlineParser{
-	trigger:              []byte{'$'},
-	endBytesSingleDollar: []byte{'$'},
-	endBytesDoubleDollar: []byte{'$', '$'},
-}
-
-func NewInlineDollarParser() parser.InlineParser {
-	return defaultInlineDollarParser
+func NewInlineDollarParser(enableInlineDollar bool) parser.InlineParser {
+	return &inlineParser{
+		trigger:              []byte{'$'},
+		endBytesSingleDollar: []byte{'$'},
+		endBytesDoubleDollar: []byte{'$', '$'},
+		enableInlineDollar:   enableInlineDollar,
+	}
 }
 
 var defaultInlineParenthesesParser = &inlineParser{
@@ -89,6 +89,10 @@ func (parser *inlineParser) Parse(parent ast.Node, block text.Reader, pc parser.
 		stopMark = parser.endBytesParentheses
 	}
 
+	if line[0] == '$' && !parser.enableInlineDollar && (len(line) == 1 || line[1] != '`') {
+		return nil
+	}
+
 	if checkSurrounding {
 		precedingCharacter := block.PrecendingCharacter()
 		if precedingCharacter < 256 && (isAlphanumeric(byte(precedingCharacter)) || isPunctuation(byte(precedingCharacter))) {

modules/markup/markdown/math/math.go

@@ -47,9 +47,8 @@ func (e *Extension) Extend(m goldmark.Markdown) {
 	if e.options.ParseInlineParentheses {
 		inlines = append(inlines, util.Prioritized(NewInlineParenthesesParser(), 501))
 	}
-	if e.options.ParseInlineDollar {
-		inlines = append(inlines, util.Prioritized(NewInlineDollarParser(), 502))
-	}
+	inlines = append(inlines, util.Prioritized(NewInlineDollarParser(e.options.ParseInlineDollar), 502))
+
 	m.Parser().AddOptions(parser.WithInlineParsers(inlines...))
 	m.Parser().AddOptions(parser.WithBlockParsers(
 		util.Prioritized(NewBlockParser(e.options.ParseBlockDollar, e.options.ParseBlockSquareBrackets), 701),