Use xhtml.Children more

spotlightpa · May 20, 2024 · 086b940 · 086b940
1 parent 5238a93
commit 086b940
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/internal/xhtml/children.go b/internal/xhtml/children.go
@@ -8,7 +8,7 @@ import (
 	"golang.org/x/net/html"
 )
 
-// Children returns a seq of the children of n.
+// Children returns a seq of the immediate children of n.
 func Children(n *html.Node) iter.Seq[*html.Node] {
 	return func(yield func(*html.Node) bool) {
 		if n == nil {

diff --git a/internal/xhtml/new.go b/internal/xhtml/new.go
@@ -47,7 +47,7 @@ func Clone(n *html.Node) *html.Node {
 		Namespace: n.Namespace,
 		Attr:      slices.Clone(n.Attr),
 	}
-	for c := n.FirstChild; c != nil; c = c.NextSibling {
+	for c := range Children(n) {
 		c2 := Clone(c)
 		new.AppendChild(c2)
 	}

diff --git a/internal/xhtml/string.go b/internal/xhtml/string.go
@@ -34,7 +34,7 @@ func InnerHTML(n *html.Node) string {
 	var buf strings.Builder
 	buf.Grow(256)
 
-	for c := n.FirstChild; c != nil; c = c.NextSibling {
+	for c := range Children(n) {
 		if err := html.Render(&buf, c); err != nil {
 			panic(err)
 		}
@@ -48,7 +48,7 @@ func InnerHTMLBlocks(n *html.Node) string {
 	var buf strings.Builder
 	buf.Grow(256)
 
-	for c := n.FirstChild; c != nil; c = c.NextSibling {
+	for c := range Children(n) {
 		if err := html.Render(&buf, c); err != nil {
 			panic(err)
 		}

diff --git a/pkg/almanack/service-gdocs.go b/pkg/almanack/service-gdocs.go
@@ -290,7 +290,7 @@ func (svc Services) ProcessGDocsDoc(ctx context.Context, dbDoc db.GDocsDoc) (err
 }
 
 func removeTail(n *html.Node) {
-	for c := n.FirstChild; c != nil; c = c.NextSibling {
+	for c := range xhtml.Children(n) {
 		if c.DataAtom == atom.Table {
 			continue
 		}