templates: Fix handling of multiple defers in the same template

Fixes #13236
This commit is contained in:
Bjørn Erik Pedersen 2025-01-09 04:09:25 +01:00
parent b13d0a68e6
commit 61d3d20129
2 changed files with 28 additions and 0 deletions

View file

@ -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

View file

@ -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.")
}