Fix live reload when editing inline partials

Fixes #13723

Author: bep

hugolib/rebuild_test.go

@@ -1766,6 +1766,60 @@ MyTemplate: {{ partial "MyTemplate.html" . }}|
 	b.AssertFileContent("public/index.html", "MyTemplate: MyTemplate Edited")
 }
 
+func TestRebuildEditInlinePartial13723(t *testing.T) {
+	t.Parallel()
+
+	files := `
+-- hugo.toml --
+baseURL = "https://example.com"
+disableLiveReload = true
+title = "Foo"
+-- layouts/baseof.html --
+{{ block "main" . }}Main.{{ end }}
+{{ partial "myinlinepartialinbaseof.html" . }}|
+ {{- define "_partials/myinlinepartialinbaseof.html" }}
+ My inline partial in baseof.
+ {{ end }}
+-- layouts/_partials/mypartial.html --
+Mypartial.
+{{ partial "myinlinepartial.html" . }}|
+{{- define "_partials/myinlinepartial.html" }}
+Mypartial Inline.|{{ .Title }}|
+{{ end }}
+-- layouts/_partials/myotherpartial.html --
+Myotherpartial.
+{{ partial "myotherinlinepartial.html" . }}|
+{{- define "_partials/myotherinlinepartial.html" }}
+Myotherpartial Inline.|{{ .Title }}|
+{{ return "myotherinlinepartial" }}
+{{ end }}
+-- layouts/all.html --
+{{ define "main" }}
+{{ partial "mypartial.html" . }}|
+{{ partial "myotherpartial.html" . }}|
+  {{ partial "myinlinepartialinall.html" . }}|
+{{ end }}
+ {{- define "_partials/myinlinepartialinall.html" }}
+ My inline partial in all.
+ {{ end }}
+
+`
+	b := TestRunning(t, files)
+	b.AssertFileContent("public/index.html", "Mypartial.", "Mypartial Inline.|Foo")
+
+	// Edit inline partial in partial.
+	b.EditFileReplaceAll("layouts/_partials/mypartial.html", "Mypartial Inline.", "Mypartial Inline Edited.").Build()
+	b.AssertFileContent("public/index.html", "Mypartial Inline Edited.|Foo")
+
+	// Edit inline partial in baseof.
+	b.EditFileReplaceAll("layouts/baseof.html", "My inline partial in baseof.", "My inline partial in baseof Edited.").Build()
+	b.AssertFileContent("public/index.html", "My inline partial in baseof Edited.")
+
+	// Edit inline partial in all.
+	b.EditFileReplaceAll("layouts/all.html", "My inline partial in all.", "My inline partial in all Edited.").Build()
+	b.AssertFileContent("public/index.html", "My inline partial in all Edited.")
+}
+
 func TestRebuildEditAsciidocContentFile(t *testing.T) {
 	if !asciidocext.Supports() {
 		t.Skip("skip asciidoc")

tpl/internal/go_templates/htmltemplate/hugo_template.go

@@ -15,6 +15,7 @@ package template
 
 import (
 	"fmt"
+	"iter"
 
 	"github.com/gohugoio/hugo/common/types"
 	template "github.com/gohugoio/hugo/tpl/internal/go_templates/texttemplate"
@@ -38,6 +39,19 @@ func (t *Template) Prepare() (*template.Template, error) {
 	return t.text, nil
 }
 
+func (t *Template) All() iter.Seq[*Template] {
+	return func(yield func(t *Template) bool) {
+		ns := t.nameSpace
+		ns.mu.Lock()
+		defer ns.mu.Unlock()
+		for _, v := range ns.set {
+			if !yield(v) {
+				return
+			}
+		}
+	}
+}
+
 // See https://github.com/golang/go/issues/5884
 func StripTags(html string) string {
 	return stripTags(html)

tpl/internal/go_templates/texttemplate/hugo_template.go

@@ -17,6 +17,7 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"iter"
 	"reflect"
 
 	"github.com/gohugoio/hugo/common/herrors"
@@ -433,3 +434,18 @@ func (s *state) evalCall(dot, fun reflect.Value, isBuiltin bool, node parse.Node
 func isTrue(val reflect.Value) (truth, ok bool) {
 	return hreflect.IsTruthfulValue(val), true
 }
+
+func (t *Template) All() iter.Seq[*Template] {
+	return func(yield func(t *Template) bool) {
+		if t.common == nil {
+			return
+		}
+		t.muTmpl.RLock()
+		defer t.muTmpl.RUnlock()
+		for _, v := range t.tmpl {
+			if !yield(v) {
+				return
+			}
+		}
+	}
+}

tpl/internal/go_templates/texttemplate/parse/parse.go

@@ -533,7 +533,7 @@ func (t *Tree) parseControl(context string) (pos Pos, line int, pipe *PipeNode,
 		t.rangeDepth--
 	}
 	switch next.Type() {
-	case nodeEnd: //done
+	case nodeEnd: // done
 	case nodeElse:
 		// Special case for "else if" and "else with".
 		// If the "else" is followed immediately by an "if" or "with",

tpl/tplimpl/templates.go

@@ -2,6 +2,7 @@ package tplimpl
 
 import (
 	"io"
+	"iter"
 	"regexp"
 	"strconv"
 	"strings"
@@ -44,16 +45,15 @@ var embeddedTemplatesAliases = map[string][]string{
 	"_shortcodes/twitter.html": {"_shortcodes/tweet.html"},
 }
 
-func (s *TemplateStore) parseTemplate(ti *TemplInfo) error {
-	err := s.tns.doParseTemplate(ti)
+func (s *TemplateStore) parseTemplate(ti *TemplInfo, replace bool) error {
+	err := s.tns.doParseTemplate(ti, replace)
 	if err != nil {
 		return s.addFileContext(ti, "parse of template failed", err)
 	}
-
 	return err
 }
 
-func (t *templateNamespace) doParseTemplate(ti *TemplInfo) error {
+func (t *templateNamespace) doParseTemplate(ti *TemplInfo, replace bool) error {
 	if !ti.noBaseOf || ti.category == CategoryBaseof {
 		// Delay parsing until we have the base template.
 		return nil
@@ -68,7 +68,7 @@ func (t *templateNamespace) doParseTemplate(ti *TemplInfo) error {
 
 	if ti.D.IsPlainText {
 		prototype := t.parseText
-		if prototype.Lookup(name) != nil {
+		if !replace && prototype.Lookup(name) != nil {
 			name += "-" + strconv.FormatUint(t.nameCounter.Add(1), 10)
 		}
 		templ, err = prototype.New(name).Parse(ti.content)
@@ -77,7 +77,7 @@ func (t *templateNamespace) doParseTemplate(ti *TemplInfo) error {
 		}
 	} else {
 		prototype := t.parseHTML
-		if prototype.Lookup(name) != nil {
+		if !replace && prototype.Lookup(name) != nil {
 			name += "-" + strconv.FormatUint(t.nameCounter.Add(1), 10)
 		}
 		templ, err = prototype.New(name).Parse(ti.content)
@@ -181,19 +181,24 @@ func (t *templateNamespace) applyBaseTemplate(overlay *TemplInfo, base keyTempla
 	return nil
 }
 
-func (t *templateNamespace) templatesIn(in tpl.Template) []tpl.Template {
-	var templs []tpl.Template
-	if textt, ok := in.(*texttemplate.Template); ok {
-		for _, t := range textt.Templates() {
-			templs = append(templs, t)
-		}
-	}
-	if htmlt, ok := in.(*htmltemplate.Template); ok {
-		for _, t := range htmlt.Templates() {
-			templs = append(templs, t)
+func (t *templateNamespace) templatesIn(in tpl.Template) iter.Seq[tpl.Template] {
+	return func(yield func(t tpl.Template) bool) {
+		switch in := in.(type) {
+		case *htmltemplate.Template:
+			for t := range in.All() {
+				if !yield(t) {
+					return
+				}
+			}
+
+		case *texttemplate.Template:
+			for t := range in.All() {
+				if !yield(t) {
+					return
+				}
+			}
 		}
 	}
-	return templs
 }
 
 /*
@@ -337,8 +342,6 @@ func (t *templateNamespace) createPrototypes(init bool) error {
 		t.prototypeHTML = htmltemplate.Must(t.parseHTML.Clone())
 		t.prototypeText = texttemplate.Must(t.parseText.Clone())
 	}
-	// t.execHTML = htmltemplate.Must(t.parseHTML.Clone())
-	// t.execText = texttemplate.Must(t.parseText.Clone())
 
 	return nil
 }
@@ -350,3 +353,14 @@ func newTemplateNamespace(funcs map[string]any) *templateNamespace {
 		standaloneText: texttemplate.New("").Funcs(funcs),
 	}
 }
+
+func isText(t tpl.Template) bool {
+	switch t.(type) {
+	case *texttemplate.Template:
+		return true
+	case *htmltemplate.Template:
+		return false
+	default:
+		panic("unknown template type")
+	}
+}