Split rendering logic into nodes and line functionality

Author: teekennedy

autolink_example_test.go

@@ -86,12 +86,12 @@ func (t *RegexpLinkTransformer) Transform(node *ast.Document, reader text.Reader
 var source = `
 Standup notes:
 - Previous day:
-    - Gave feedback on TICKET-123.
-    - Outlined presentation on syntax-aware markdown transformations.
-    - Finished my part of TICKET-456 and assigned to Emily.
+  - Gave feedback on TICKET-123.
+  - Outlined presentation on syntax-aware markdown transformations.
+  - Finished my part of TICKET-456 and assigned to Emily.
 - Today:
-    - Add integration tests for TICKET-789.
-    - Create slides for presentation.
+  - Add integration tests for TICKET-789.
+  - Create slides for presentation.
 `
 
 func Example() {
@@ -120,10 +120,10 @@ func Example() {
 	// Output:
 	// Standup notes:
 	// - Previous day:
-	//     - Gave feedback on [TICKET-123](https://example.com/TICKET?query=TICKET-123).
-	//     - Outlined presentation on syntax-aware markdown transformations.
-	//     - Finished my part of [TICKET-456](https://example.com/TICKET?query=TICKET-456) and assigned to Emily.
+	//   - Gave feedback on [TICKET-123](https://example.com/TICKET?query=TICKET-123).
+	//   - Outlined presentation on syntax-aware markdown transformations.
+	//   - Finished my part of [TICKET-456](https://example.com/TICKET?query=TICKET-456) and assigned to Emily.
 	// - Today:
-	//     - Add integration tests for [TICKET-789](https://example.com/TICKET?query=TICKET-789).
-	//     - Create slides for presentation.
+	//   - Add integration tests for [TICKET-789](https://example.com/TICKET?query=TICKET-789).
+	//   - Create slides for presentation.
 }

options.go

@@ -1,8 +1,6 @@
 package markdown
 
 import (
-	"strings"
-
 	"github.com/yuin/goldmark/renderer"
 )
 
@@ -15,15 +13,15 @@ type Config struct {
 }
 
 // NewConfig returns a new Config with defaults and the given options.
-func NewConfig(options ...Option) Config {
-	c := Config{
+func NewConfig(options ...Option) *Config {
+	c := &Config{
 		IndentStyle:         IndentStyle(IndentStyleSpaces),
 		HeadingStyle:        HeadingStyle(HeadingStyleATX),
 		ThematicBreakStyle:  ThematicBreakStyle(ThematicBreakStyleDashed),
 		ThematicBreakLength: ThematicBreakLength(ThematicBreakLengthMinimum),
 	}
 	for _, opt := range options {
-		opt.SetMarkdownOption(&c)
+		opt.SetMarkdownOption(c)
 	}
 	return c
 }
@@ -67,13 +65,8 @@ const (
 )
 
 // String returns the string representation of the indent style
-func (i IndentStyle) String() string {
-	return [...]string{"    ", "\t"}[i]
-}
-
-// Indent returns the string representation of the given indentation level
-func (i IndentStyle) Indent(level int) string {
-	return strings.Repeat(i.String(), level)
+func (i IndentStyle) Bytes() []byte {
+	return [...][]byte{[]byte("    "), []byte("\t")}[i]
 }
 
 type withIndentStyle struct {

options_test.go

@@ -1,21 +1,18 @@
 package markdown
 
 import (
-	"bytes"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/yuin/goldmark/ast"
 	"github.com/yuin/goldmark/renderer"
-	"github.com/yuin/goldmark/util"
 )
 
 // TestRendererOptions tests the methods for setting configuration options on the renderer
 func TestRendererOptions(t *testing.T) {
 	var cases = []struct {
 		name     string
 		options  []Option
-		expected Config
+		expected *Config
 	}{
 		{
 			"Defaults",
@@ -48,23 +45,19 @@ func TestRendererOptions(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			assert := assert.New(t)
 
-			// Set options by passing them directly to NewNodeRenderer
-			nodeRenderer := NewNodeRenderer(tc.options...).(*Renderer)
-			assert.Equal(tc.expected, nodeRenderer.Config)
+			// Set options by passing them directly to NewRenderer
+			r := NewRenderer(tc.options...)
+			assert.Equal(tc.expected, r.config)
 
-			// Set options by name using goldmark's renderer.AddOptions
-			nodeRenderer = NewNodeRenderer().(*Renderer)
-			r := renderer.NewRenderer(renderer.WithNodeRenderers(util.Prioritized(nodeRenderer, 1000)))
+			// Set options by name using AddOptions
+			r = NewRenderer()
 			// Convert markdown Option interface to renderer.Option interface
-			rendererOptions := make([]renderer.Option, len(tc.options))
+			options := make([]renderer.Option, len(tc.options))
 			for i, o := range tc.options {
-				rendererOptions[i] = o
+				options[i] = o
 			}
-			r.AddOptions(rendererOptions...)
-			// Must call Render() to apply options
-			err := r.Render(&bytes.Buffer{}, []byte{}, ast.NewDocument())
-			assert.NoError(err)
-			assert.Equal(tc.expected, nodeRenderer.Config)
+			r.AddOptions(options...)
+			assert.Equal(tc.expected, r.config)
 		})
 	}
 }