passthrough: Upgrade goldmark and fix upstream regression

* passthrough: Upgrade goldmark and fix upstream regression

Goldmark v1.7.5 changed the default behaviour of the BaseBlock.Text() function, breaking the block transformer for block math. Later, in Goldmark v1.7.8, the whole Text() function was deprecated. This commit also deprecates PassthroughInline.Text() and removes all calls for Node.Text(), fixing the regression.

* passthrough: Add regression test

Author: AlexVasiluta

passthrough/go.mod

@@ -9,5 +9,5 @@ require (
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/yuin/goldmark v1.7.2
+	github.com/yuin/goldmark v1.7.8
 )

passthrough/go.sum

@@ -12,5 +12,5 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
-github.com/yuin/goldmark v1.7.2 h1:NjGd7lO7zrUn/A7eKwn5PEOt4ONYGqpxSEeZuduvgxc=
-github.com/yuin/goldmark v1.7.2/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
+github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
+github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=

passthrough/passthrough.go

@@ -46,6 +46,7 @@ func newPassthroughInline(segment text.Segment, delimiters *Delimiters) *Passthr
 }
 
 // Text implements Node.Text.
+// Deprecated: Goldmark v1.7.8 deprecates Node.Text
 func (n *PassthroughInline) Text(source []byte) []byte {
 	return n.Segment.Value(source)
 }
@@ -55,7 +56,7 @@ func (n *PassthroughInline) Dump(source []byte, level int) {
 	indent := strings.Repeat("    ", level)
 	fmt.Printf("%sPassthroughInline {\n", indent)
 	indent2 := strings.Repeat("    ", level+1)
-	fmt.Printf("%sSegment: \"%s\"\n", indent2, n.Text(source))
+	fmt.Printf("%sSegment: \"%s\"\n", indent2, n.Segment.Value(source))
 	fmt.Printf("%s}\n", indent)
 }
 
@@ -188,7 +189,11 @@ type passthroughInlineRenderer struct{}
 
 func (r *passthroughInlineRenderer) renderRawInline(w util.BufWriter, source []byte, n ast.Node, entering bool) (ast.WalkStatus, error) {
 	if entering {
-		w.WriteString(string(n.Text(source)))
+		n, ok := n.(*PassthroughInline)
+		if !ok {
+			return ast.WalkContinue, nil
+		}
+		w.WriteString(string(n.Segment.Value(source)))
 	}
 	return ast.WalkContinue, nil
 }
@@ -315,7 +320,7 @@ func (p *passthroughInlineTransformer) Transform(
 
 				newBlock := newPassthroughBlock(inline.Delimiters)
 				newBlock.Lines().Append(inline.Segment)
-				if len(currentParagraph.Text(reader.Source())) > 0 {
+				if currentParagraph.ChildCount() > 0 {
 					parent.InsertAfter(parent, insertionPoint, currentParagraph)
 					// Since we're not removing the original paragraph, we need to ensure
 					// that this paragraph is not re-processed as the walk continues

passthrough/passthrough_test.go

@@ -567,6 +567,24 @@ $$a^*=x-b^*$$
 	c.Assert(actual, qt.Equals, expected)
 }
 
+func TestIssue32(t *testing.T) {
+	input := `line one
+$$ a^n + b^n = c^n $$
+line two`
+
+	// The mid-paragraph new lines are undesirable, but this is how it worked
+	// with Goldmark v1.7.4.
+	expected := `<p>line one
+</p>
+$$ a^n + b^n = c^n $$
+<p>
+line two</p>`
+	actual := Parse(t, input)
+
+	c := qt.New(t)
+	c.Assert(actual, qt.Equals, expected)
+}
+
 func TestNodeDelimiter(t *testing.T) {
 	input := `
 Block $$a^*=x-b^*$$ equation