Refactor examples tests

Author: antonmedv

test/examples/examples_test.go

@@ -1,55 +1,32 @@
 package main
 
 import (
-	"flag"
 	"os"
-	"strings"
 	"testing"
 
 	"github.com/expr-lang/expr"
 	"github.com/expr-lang/expr/internal/testify/require"
 )
 
-func TestExamples(t *testing.T) {
-	flag.Parse()
+var examples []CodeBlock
 
+func init() {
 	b, err := os.ReadFile("../../testdata/examples.md")
-	require.NoError(t, err)
-	examples := extractCodeBlocks(string(b))
+	if err != nil {
+		panic(err)
+	}
+	examples = extractCodeBlocksWithTitle(string(b))
+}
 
-	for _, line := range examples {
-		line := line
-		t.Run(line, func(t *testing.T) {
-			program, err := expr.Compile(line, expr.Env(nil))
+func TestExamples(t *testing.T) {
+	for _, code := range examples {
+		code := code
+		t.Run(code.Title, func(t *testing.T) {
+			program, err := expr.Compile(code.Content, expr.Env(nil))
 			require.NoError(t, err)
 
 			_, err = expr.Run(program, nil)
 			require.NoError(t, err)
 		})
 	}
 }
-
-func extractCodeBlocks(markdown string) []string {
-	var blocks []string
-	var currentBlock []string
-	inBlock := false
-
-	lines := strings.Split(markdown, "\n")
-	for _, line := range lines {
-		trimmed := strings.TrimSpace(line)
-		if strings.HasPrefix(trimmed, "```") {
-			if inBlock {
-				blocks = append(blocks, strings.Join(currentBlock, "\n"))
-				currentBlock = nil
-				inBlock = false
-			} else {
-				inBlock = true
-			}
-			continue
-		}
-		if inBlock {
-			currentBlock = append(currentBlock, line)
-		}
-	}
-	return blocks
-}

test/examples/markdown.go

@@ -0,0 +1,59 @@
+package main
+
+import (
+	"strings"
+)
+
+// CodeBlock holds the optional title and content of a code block.
+type CodeBlock struct {
+	Title   string
+	Content string
+}
+
+func extractCodeBlocksWithTitle(markdown string) []CodeBlock {
+	var blocks []CodeBlock
+	var currentBlock []string
+	var currentTitle string
+	inBlock := false
+
+	// Split the markdown into lines.
+	lines := strings.Split(markdown, "\n")
+	for i, line := range lines {
+		trimmed := strings.TrimSpace(line)
+		// Check if the line starts with a code block fence.
+		if strings.HasPrefix(trimmed, "```") {
+			// If already inside a code block, this marks its end.
+			if inBlock {
+				blocks = append(blocks, CodeBlock{
+					Title:   currentTitle,
+					Content: strings.Join(currentBlock, "\n"),
+				})
+				currentBlock = nil
+				inBlock = false
+				currentTitle = ""
+			} else {
+				// Not in a block: starting a new code block.
+				// Look backwards for the closest non-empty line that is not a code fence.
+				title := ""
+				for j := i - 1; j >= 0; j-- {
+					prev := strings.TrimSpace(lines[j])
+					if prev == "" || strings.HasPrefix(prev, "```") {
+						continue
+					}
+					title = prev
+					break
+				}
+				currentTitle = title
+				inBlock = true
+			}
+			// Skip the fence line.
+			continue
+		}
+
+		// If inside a code block, add the line.
+		if inBlock {
+			currentBlock = append(currentBlock, line)
+		}
+	}
+	return blocks
+}