templates: Fix handling of multiple defers in the same template

Fixes #13236

diff --git a/hugolib/hugo_sites_build.go b/hugolib/hugo_sites_build.go
index 60fb8ecc02f9c610de839a8a2917c5203d853e06..1518e2db848eeb9e26c83b63ba5e943dceb76986 100644 (file)
--- a/hugolib/hugo_sites_build.go
+++ b/hugolib/hugo_sites_build.go
@@ -508,6 +508,7 @@ func (s *Site) executeDeferredTemplates(de *deps.DeferredExecutions) error {
                                }
 
                                content = append(content[:low], append([]byte(deferred.Result), content[high:]...)...)
+                               forward = len(deferred.Result)
                                changed = true
 
                                return nil

diff --git a/tpl/templates/defer_integration_test.go b/tpl/templates/defer_integration_test.go
index 8b06e7722422e61aa8f371f0471a48899762023a..77be91cee84b8049c83bfd828e10844e7dd3efd5 100644 (file)
--- a/tpl/templates/defer_integration_test.go
+++ b/tpl/templates/defer_integration_test.go
@@ -220,3 +220,30 @@ Home
        b.Assert(err, qt.Not(qt.IsNil))
        b.Assert(err.Error(), qt.Contains, "resources.PostProcess cannot be used in a deferred template")
 }
+
+// Issue #13236.
+func TestDeferMultipleInSameTemplate(t *testing.T) {
+       t.Parallel()
+
+       files := `
+-- hugo.toml --
+-- layouts/index.html --
+Home.
+...
+{{ with (templates.Defer (dict "data" (dict "a" "b") )) }}
+ Defer 1
+{{ end }}
+...
+{{ with (templates.Defer (dict "data" (dict "a" "c") )) }}
+Defer 2
+{{ end }}
+{{ with (templates.Defer (dict "data" (dict "a" "d") )) }}
+Defer 3
+{{ end }}{{ with (templates.Defer (dict "data" (dict "a" "d") )) }}{{ end }}
+End.
+`
+
+       b := hugolib.Test(t, files)
+
+       b.AssertFileContent("public/index.html", "Home.", "Defer 1", "Defer 2", "Defer 3", "End.")
+}