Backtestshugorun-20261013-011256#15207
panic: slice bounds out of range in contentNodeShifter.Delete when removing draft pages from a multilingual taxonomy
Our patch was judged better than the merged fix.
In this judgment, Patch B = our agent, Patch A = the merged fix.
The production code in both patches is essentially the same fix, and it addresses the root cause. The old `contentNodes` branch shrank `v` with `append(v[:i], v[i+1:]...)` while ranging over it. That produces the reported 'slice bounds out of range [5:4]' once more than one node is removed, and it also mutated the backing array shared with the tree. Both patches build a separate `remaining` slice and change the `Shifter` interface to return the updated value. Both store that value back via `tree.Insert` in `delete` and `DeleteFuncRaw`, and both apply the same fix to `DeleteFunc`. The code differences are minor. A avoids reassigning `v` in the default case, which is slightly cleaner. B preallocates `remaining` and adds a comment explaining why the input must not be mutated. Neither difference matters for correctness. The tests are where the patches differ. A's test calls the shifter directly with a stub node type. It covers multiple non-adjacent deletions, which would panic before the fix, plus the all-deleted and none-deleted cases. B's tests are broader and closer to the reported failure: - They check that the input slice is not mutated, which is the aliasing hazard. - They cover a nested `contentNodesMap` inside `contentNodes`. - Most importantly, they exercise the full `NodeShiftTree`. The test deletes the same key across several dimensions in sequence and confirms the tree holds exactly the surviving nodes after each step. That is the multilingual production-build scenario from the issue, and it also checks that the new store-back logic in `delete` is correct. - They test `DeleteFuncRaw` with adjacent deletions, which also reveals the skipped-element bug in the old `DeleteFunc`. Because B's tests verify both the panic fix and the new write-back behaviour at the tree level, B is the stronger patch overall.
The judge saw only the two patches, labelled A and B in random order, with issue links and version numbers removed. The reasoning above is shown verbatim.
Solve
1h 20m
Wall-clock time in the container
Full test suite
No new failures
2,131 passed · 93 skipped · 2,239 total
Contamination audit
Clean
No sign the agent saw the real fix
Patch size
227vs 161 merged
Changed lines, ours vs merged
The issue
View on GitHubWhat version of Hugo are you using?
Reproduced on both:
hugo v0.159.1-86c7d3afacab79dc53325602d77ef884b7570268+extended darwin/arm64
hugo v0.164.0+extended+withdeploy darwin/arm64
Does this issue reproduce with the latest release?
Yes (0.164.0).
What did you expect to see?
A production build (no -D) of a multilingual site containing draft pages completes.
What did you see instead?
panic: runtime error: slice bounds out of range [5:4]
goroutine 37 [running]:
github.com/gohugoio/hugo/hugolib.(*contentNodeShifter).Delete(0x..., {0x..., 0x...}, {0x2, 0x0, 0x0})
github.com/gohugoio/hugo/hugolib/content_map_page_contentnodeshifter.go:48 +0x5f4
github.com/gohugoio/hugo/hugolib/doctree.(*NodeShiftTree[...]).delete(0x..., {0x..., 0x35})
github.com/gohugoio/hugo/hugolib/doctree/nodeshifttree.go:165 +0x84
github.com/gohugoio/hugo/hugolib/doctree.(*NodeShiftTree[...]).Delete(...)
github.com/gohugoio/hugo/hugolib/doctree/nodeshifttree.go:107
github.com/gohugoio/hugo/hugolib.(*allPagesAssembler).createAllPages.func1-range1(...)
github.com/gohugoio/hugo/hugolib/content_map_page_assembler.go:106 +0xa4
github.com/gohugoio/hugo/hugolib.(*allPagesAssembler).createAllPages(...)
github.com/gohugoio/hugo/hugolib/content_map_page_assembler.go:138 +0x168
github.com/gohugoio/hugo/hugolib.(*HugoSites).assemble(...)
github.com/gohugoio/hugo/hugolib/hugo_sites_build.go:345 +0x41c
The 0x35 in delete(..., {…, 0x35}) is 53, exactly the byte length of the key being removed (/blog/ plus a 47-character slug).
Only on the page-removal path
hugo -D (drafts included) builds fine. The panic appears only when a page is removed from the tree, which makes it invisible in local preview and fatal only in production.
A future publishDate panics identically. Setting [_build] render = "never" / list = "never" on the same pages avoids it entirely — consistent with those pages never being added to the tree, so nothing is deleted.
What I ruled out
Site: 8 languages, ~1,490 pages per language, ~11,455 content files, categories taxonomy.
- Not a regression. 0.159.1 and 0.164.0 behave identically.
- Not the number of drafts. 96 draft pages build fine; 16 panic.
- Not slug length. The panicking key was 47 chars, but renaming an unrelated post to exactly 47 chars builds fine.
- Not the slug. Renaming the offending page does not help.
- Not byte layout. Deleting a front-matter line, or adding a blank one, still panics.
Swapping page content at a fixed path isolates it to front matter. Changing categories = ["Airport Operations"] on the offending page to any other value clears the panic — and so does moving a different page out of that same category while leaving the offending one alone. So the trigger is combinatorial: some particular set of pages being deleted from one taxonomy term corrupts the shifter, rather than any single page being malformed.
Reproducer
I have not managed to minimise it, and I want to be upfront about that. Synthetic multilingual sites (8 languages, 12 blog + 200 glossary pages sharing one taxonomy term, varying draft counts) do not reproduce, so something else in the real tree is required. The affected repository is private.
I am happy to run patches or instrumented builds against the real site and report back, which may be faster than guessing at a minimal case.
The two patches
hugolib/content_map_page_contentnodeshifter.goindex 04f632f75..58b5d6bd7 100644@@ -25,7 +25,7 @@ type contentNodeShifter struct { conf config.AllProvider // Used for logging/debugging. } -func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (contentNode, bool, bool) {+func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (contentNode, contentNode, bool, bool) { switch v := n.(type) { case contentNodesMap: deleted, wasDeleted := v[vec]@@ -33,49 +33,57 @@ func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (cont delete(v, vec) resource.MarkStale(deleted) }- return deleted, wasDeleted, len(v) == 0+ return v, deleted, wasDeleted, len(v) == 0 case contentNodeForSite: if v.siteVector() != vec {- return nil, false, false+ return v, nil, false, false } resource.MarkStale(v)- return v, true, true+ return nil, v, true, true case contentNodes: var deleted contentNodes- for i, nn := range v {- if vv, ok, _ := s.Delete(nn, vec); ok {+ // Build a new slice; never shrink v while iterating over it,+ // and never mutate the backing array shared with the tree.+ remaining := make(contentNodes, 0, len(v))+ for _, nn := range v {+ updated, vv, ok, isEmpty := s.Delete(nn, vec)+ if ok { deleted = append(deleted, vv)- v = append(v[:i], v[i+1:]...)+ }+ if !isEmpty {+ remaining = append(remaining, updated) } } if len(deleted) == 0 {- return nil, false, false+ return v, nil, false, false }- return deleted, true, len(v) == 0+ return remaining, deleted, true, len(remaining) == 0 default: v = v.(contentNodeSingle) // Ensure single node. resource.MarkStale(v)- return v, true, true+ return nil, v, true, true } } -func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) bool) bool {+func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) bool) (contentNode, bool) { switch ss := v.(type) { case contentNodeSingle: if f(ss) { resource.MarkStale(ss)- return true+ return nil, true }- return false+ return ss, false case contentNodes:- for i, n := range ss {+ remaining := make(contentNodes, 0, len(ss))+ for _, n := range ss { if f(n) { resource.MarkStale(n)- ss = append(ss[:i], ss[i+1:]...)+ continue }+ remaining = append(remaining, n) }- return len(ss) == 0+ return remaining, len(remaining) == 0 case contentNodesMap: for k, n := range ss { if f(n) {@@ -83,7 +91,7 @@ func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) boo delete(ss, k) } }- return len(ss) == 0+ return ss, len(ss) == 0 default: panic(fmt.Sprintf("DeleteFunc: unknown type %T", v)) }hugolib/content_map_page_contentnodeshifter_test.gonew file mode 100644index 000000000..21319979b@@ -0,0 +1,150 @@+// Copyright 2025 The Hugo Authors. All rights reserved.+//+// Licensed under the Apache License, Version 2.0 (the "License");+// you may not use this file except in compliance with the License.+// You may obtain a copy of the License at+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing, software+// distributed under the License is distributed on an "AS IS" BASIS,+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+// See the License for the specific language governing permissions and+// limitations under the License.++package hugolib++import (+ "testing"++ qt "github.com/frankban/quicktest"+ "github.com/gohugoio/hugo/hugolib/doctree"+ "github.com/gohugoio/hugo/hugolib/sitesmatrix"+)++func newTestResourceSourceForShifter(lang int) *resourceSource {+ return &resourceSource{sv: sitesmatrix.Vector{lang, 0, 0}}+}++// assertSameContentNodes asserts that got is a contentNodes holding exactly the nodes in want (by identity), in order.+func assertSameContentNodes(c *qt.C, got contentNode, want ...contentNode) {+ c.Helper()+ nodes, ok := got.(contentNodes)+ c.Assert(ok, qt.IsTrue, qt.Commentf("got %T", got))+ c.Assert(nodes, qt.HasLen, len(want))+ for i := range want {+ c.Assert(nodes[i], qt.Equals, want[i], qt.Commentf("index %d", i))+ }+}++func newTestContentNodeShiftTree() *doctree.NodeShiftTree[contentNode] {+ return doctree.New(doctree.Config[contentNode]{+ Shifter: &contentNodeShifter{},+ TransformerRaw: &contentNodeTransformerRaw{},+ })+}++func TestContentNodeShifterDeleteContentNodesMultipleMatches(t *testing.T) {+ c := qt.New(t)+ s := &contentNodeShifter{}++ a0, b0, c1, d0, e1 := newTestResourceSourceForShifter(0), newTestResourceSourceForShifter(0), newTestResourceSourceForShifter(1), newTestResourceSourceForShifter(0), newTestResourceSourceForShifter(1)+ nodes := contentNodes{a0, b0, c1, d0, e1}++ remaining, deleted, wasDeleted, isEmpty := s.Delete(nodes, sitesmatrix.Vector{0, 0, 0})+ c.Assert(wasDeleted, qt.IsTrue)+ c.Assert(isEmpty, qt.IsFalse)+ assertSameContentNodes(c, deleted, a0, b0, d0)+ assertSameContentNodes(c, remaining, c1, e1)+ // The input must not be mutated, it may still be referenced elsewhere.+ assertSameContentNodes(c, nodes, a0, b0, c1, d0, e1)++ remaining, deleted, wasDeleted, isEmpty = s.Delete(remaining, sitesmatrix.Vector{1, 0, 0})+ c.Assert(wasDeleted, qt.IsTrue)+ c.Assert(isEmpty, qt.IsTrue)+ assertSameContentNodes(c, deleted, c1, e1)+ c.Assert(remaining, qt.HasLen, 0)++ // No match.+ nodes = contentNodes{c1, e1}+ remaining, deleted, wasDeleted, isEmpty = s.Delete(nodes, sitesmatrix.Vector{2, 0, 0})+ c.Assert(wasDeleted, qt.IsFalse)+ c.Assert(isEmpty, qt.IsFalse)+ c.Assert(deleted, qt.IsNil)+ assertSameContentNodes(c, remaining, c1, e1)+}++func TestContentNodeShifterDeleteContentNodesWithMap(t *testing.T) {+ c := qt.New(t)+ s := &contentNodeShifter{}++ m0, m1, x1 := newTestResourceSourceForShifter(0), newTestResourceSourceForShifter(1), newTestResourceSourceForShifter(1)+ m := contentNodesMap{m0.sv: m0, m1.sv: m1}++ // Partially deleting from a nested map must keep the map (with the remaining dimensions).+ remaining, deleted, wasDeleted, isEmpty := s.Delete(contentNodes{m, x1}, sitesmatrix.Vector{0, 0, 0})+ c.Assert(wasDeleted, qt.IsTrue)+ c.Assert(isEmpty, qt.IsFalse)+ assertSameContentNodes(c, deleted, m0)+ c.Assert(remaining, qt.HasLen, 2)+ c.Assert(remaining.(contentNodeLookupContentNode).lookupContentNode(m1.sv), qt.Equals, contentNode(m1))+ c.Assert(remaining.(contentNodeLookupContentNode).lookupContentNode(m0.sv), qt.IsNil)+}++// Deleting the same key in several dimensions must not panic and must+// leave the tree holding exactly the nodes that were not deleted.+func TestContentNodeShiftTreeDeleteContentNodesInMultipleDimensions(t *testing.T) {+ c := qt.New(t)+ tree := newTestContentNodeShiftTree()++ const key = "/blog/a-post"+ x0, y0, z1, w2, v1 := newTestResourceSourceForShifter(0), newTestResourceSourceForShifter(0), newTestResourceSourceForShifter(1), newTestResourceSourceForShifter(2), newTestResourceSourceForShifter(1)+ tree.InsertRaw(key, contentNodes{x0, y0, z1, w2, v1})++ deleted, ok := tree.Shape(sitesmatrix.Vector{0, 0, 0}).Delete(key)+ c.Assert(ok, qt.IsTrue)+ assertSameContentNodes(c, deleted, x0, y0)+ n, found := tree.GetRaw(key)+ c.Assert(found, qt.IsTrue)+ assertSameContentNodes(c, n, z1, w2, v1)++ // This used to panic with "slice bounds out of range".+ deleted, ok = tree.Shape(sitesmatrix.Vector{1, 0, 0}).Delete(key)+ c.Assert(ok, qt.IsTrue)+ assertSameContentNodes(c, deleted, z1, v1)+ n, found = tree.GetRaw(key)+ c.Assert(found, qt.IsTrue)+ assertSameContentNodes(c, n, w2)++ // Deleting again in a dimension already deleted is a no-op.+ _, ok = tree.Shape(sitesmatrix.Vector{1, 0, 0}).Delete(key)+ c.Assert(ok, qt.IsFalse)++ deleted, ok = tree.Shape(sitesmatrix.Vector{2, 0, 0}).Delete(key)+ c.Assert(ok, qt.IsTrue)+ assertSameContentNodes(c, deleted, w2)+ _, found = tree.GetRaw(key)+ c.Assert(found, qt.IsFalse)+}++func TestContentNodeShiftTreeDeleteFuncRawContentNodes(t *testing.T) {+ c := qt.New(t)+ tree := newTestContentNodeShiftTree()++ const key = "/blog/a-post"+ a, b, cc, d := newTestResourceSourceForShifter(0), newTestResourceSourceForShifter(1), newTestResourceSourceForShifter(2), newTestResourceSourceForShifter(3)+ tree.InsertRaw(key, contentNodes{a, b, cc, d})++ // Delete adjacent nodes; none of them must be skipped.+ _, count := tree.DeleteFuncRaw(key, func(n contentNode) bool {+ return n == contentNode(a) || n == contentNode(b) || n == contentNode(d)+ })+ c.Assert(count, qt.Equals, 3)+ n, found := tree.GetRaw(key)+ c.Assert(found, qt.IsTrue)+ assertSameContentNodes(c, n, cc)++ _, count = tree.DeleteFuncRaw(key, func(n contentNode) bool { return true })+ c.Assert(count, qt.Equals, 1)+ _, found = tree.GetRaw(key)+ c.Assert(found, qt.IsFalse)+}hugolib/doctree/nodeshiftree_test.goindex 1d17a4129..a969b43fc 100644@@ -258,12 +258,15 @@ func (s *testShifter) Insert(old, new *testValue) (*testValue, *testValue, bool) return new, old, true } -func (s *testShifter) Delete(n *testValue, dimension sitesmatrix.Vector) (*testValue, bool, bool) {- return nil, true, true+func (s *testShifter) Delete(n *testValue, dimension sitesmatrix.Vector) (*testValue, *testValue, bool, bool) {+ return nil, n, true, true } -func (s *testShifter) DeleteFunc(v *testValue, f func(*testValue) bool) bool {- return f(v)+func (s *testShifter) DeleteFunc(v *testValue, f func(*testValue) bool) (*testValue, bool) {+ if f(v) {+ return nil, true+ }+ return v, false } func (s *testShifter) Shift(n *testValue, dimension sitesmatrix.Vector, fallback bool) (v *testValue, ok bool) {hugolib/doctree/nodeshifttree.goindex 0ccf3eba3..79bd788ab 100644@@ -49,12 +49,15 @@ type ( // and a bool indicating if an existing record is updated. Insert(old, new T) (T, T, bool) - // Delete deletes T from the given dimension and returns the deleted T and whether the dimension was deleted and if it's empty after the delete.- Delete(v T, dimension sitesmatrix.Vector) (T, bool, bool)+ // Delete deletes T from the given dimension.+ // It returns the remaining T (to be stored back in the tree if not empty), the deleted T,+ // whether the dimension was deleted and if it's empty after the delete.+ Delete(v T, dimension sitesmatrix.Vector) (T, T, bool, bool) // DeleteFunc deletes nodes in v from the tree where the given function returns true.- // It returns true if it's empty after the delete.- DeleteFunc(v T, f func(n T) bool) bool+ // It returns the remaining T (to be stored back in the tree if not empty)+ // and true if it's empty after the delete.+ DeleteFunc(v T, f func(n T) bool) (T, bool) // Shift shifts v into the given dimension, // if fallback is true, it will fall back a fallback match if found.@@ -118,7 +121,7 @@ func (r *NodeShiftTree[T]) DeleteFuncRaw(key string, f func(T) bool) (T, int) { return lastDeleted, count } - isEmpty := r.shifter.DeleteFunc(v, func(n T) bool {+ remaining, isEmpty := r.shifter.DeleteFunc(v, func(n T) bool { if f(n) { count++ lastDeleted = n@@ -129,6 +132,8 @@ func (r *NodeShiftTree[T]) DeleteFuncRaw(key string, f func(T) bool) (T, int) { if isEmpty { r.tree.Delete(key)+ } else if count > 0 {+ r.tree.Insert(key, remaining) } return lastDeleted, count@@ -161,10 +166,15 @@ func (r *NodeShiftTree[T]) delete(key string) (T, bool) { var wasDeleted bool var deleted T if v, ok := r.tree.Get(key); ok {- var isEmpty bool- deleted, wasDeleted, isEmpty = r.shifter.Delete(v, r.siteVector)+ var (+ remaining T+ isEmpty bool+ )+ remaining, deleted, wasDeleted, isEmpty = r.shifter.Delete(v, r.siteVector) if isEmpty { r.tree.Delete(key)+ } else if wasDeleted {+ r.tree.Insert(key, remaining) } } return deleted, wasDeleted
hugolib/content_map_page_contentnodeshifter.goindex 04f632f75..2d8bfa105 100644@@ -25,7 +25,7 @@ type contentNodeShifter struct { conf config.AllProvider // Used for logging/debugging. } -func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (contentNode, bool, bool) {+func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (contentNode, contentNode, bool, bool) { switch v := n.(type) { case contentNodesMap: deleted, wasDeleted := v[vec]@@ -33,49 +33,53 @@ func (s *contentNodeShifter) Delete(n contentNode, vec sitesmatrix.Vector) (cont delete(v, vec) resource.MarkStale(deleted) }- return deleted, wasDeleted, len(v) == 0+ return v, deleted, wasDeleted, len(v) == 0 case contentNodeForSite: if v.siteVector() != vec {- return nil, false, false+ return v, nil, false, false } resource.MarkStale(v)- return v, true, true+ return nil, v, true, true case contentNodes:- var deleted contentNodes- for i, nn := range v {- if vv, ok, _ := s.Delete(nn, vec); ok {+ var deleted, remaining contentNodes+ for _, nn := range v {+ updated, vv, ok, isEmpty := s.Delete(nn, vec)+ if ok { deleted = append(deleted, vv)- v = append(v[:i], v[i+1:]...)+ }+ if !isEmpty {+ remaining = append(remaining, updated) } } if len(deleted) == 0 {- return nil, false, false+ return v, nil, false, false }- return deleted, true, len(v) == 0+ return remaining, deleted, true, len(remaining) == 0 default:- v = v.(contentNodeSingle) // Ensure single node.- resource.MarkStale(v)- return v, true, true-+ vv := v.(contentNodeSingle) // Ensure single node.+ resource.MarkStale(vv)+ return nil, vv, true, true } } -func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) bool) bool {+func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) bool) (contentNode, bool) { switch ss := v.(type) { case contentNodeSingle: if f(ss) { resource.MarkStale(ss)- return true+ return nil, true }- return false+ return ss, false case contentNodes:- for i, n := range ss {+ var remaining contentNodes+ for _, n := range ss { if f(n) { resource.MarkStale(n)- ss = append(ss[:i], ss[i+1:]...)+ } else {+ remaining = append(remaining, n) } }- return len(ss) == 0+ return remaining, len(remaining) == 0 case contentNodesMap: for k, n := range ss { if f(n) {@@ -83,7 +87,7 @@ func (s *contentNodeShifter) DeleteFunc(v contentNode, f func(n contentNode) boo delete(ss, k) } }- return len(ss) == 0+ return ss, len(ss) == 0 default: panic(fmt.Sprintf("DeleteFunc: unknown type %T", v)) }hugolib/content_map_page_contentnodeshifter_test.gonew file mode 100644index 000000000..f8d2c07bc@@ -0,0 +1,79 @@+// Copyright 2025 The Hugo Authors. All rights reserved.+//+// Licensed under the Apache License, Version 2.0 (the "License");+// you may not use this file except in compliance with the License.+// You may obtain a copy of the License at+// http://www.apache.org/licenses/LICENSE-2.0+//+// Unless required by applicable law or agreed to in writing, software+// distributed under the License is distributed on an "AS IS" BASIS,+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+// See the License for the specific language governing permissions and+// limitations under the License.++package hugolib++import (+ "testing"++ qt "github.com/frankban/quicktest"+ "github.com/gohugoio/hugo/hugolib/sitesmatrix"+)++type testContentNodeForSite struct {+ vec sitesmatrix.Vector+}++func (n *testContentNodeForSite) Path() string { return "/test" }+func (n *testContentNodeForSite) nodeCategorySingle() {}+func (n *testContentNodeForSite) siteVector() sitesmatrix.Vector { return n.vec }+func (n *testContentNodeForSite) forEeachContentNode(f func(sitesmatrix.Vector, contentNode) bool) bool {+ return f(n.vec, n)+}++// See issue 15207.+func TestContentNodeShifterDeleteMultipleFromNodes(t *testing.T) {+ c := qt.New(t)++ s := &contentNodeShifter{}+ vec := sitesmatrix.Vector{2, 0, 0}+ other := sitesmatrix.Vector{1, 0, 0}++ newNodes := func() contentNodes {+ return contentNodes{+ &testContentNodeForSite{vec: other},+ &testContentNodeForSite{vec: vec},+ &testContentNodeForSite{vec: other},+ &testContentNodeForSite{vec: other},+ &testContentNodeForSite{vec: vec},+ }+ }++ updated, deleted, wasDeleted, isEmpty := s.Delete(newNodes(), vec)+ c.Assert(wasDeleted, qt.IsTrue)+ c.Assert(isEmpty, qt.IsFalse)+ c.Assert(deleted.(contentNodes), qt.HasLen, 2)+ remaining := updated.(contentNodes)+ c.Assert(remaining, qt.HasLen, 3)+ for _, n := range remaining {+ c.Assert(n.(contentNodeForSite).siteVector(), qt.Equals, other)+ }++ // Delete all.+ updated, deleted, wasDeleted, isEmpty = s.Delete(contentNodes{+ &testContentNodeForSite{vec: vec},+ &testContentNodeForSite{vec: vec},+ }, vec)+ c.Assert(wasDeleted, qt.IsTrue)+ c.Assert(isEmpty, qt.IsTrue)+ c.Assert(deleted.(contentNodes), qt.HasLen, 2)+ c.Assert(updated, qt.IsNil)++ // Delete none.+ nodes := contentNodes{&testContentNodeForSite{vec: other}}+ updated, deleted, wasDeleted, isEmpty = s.Delete(nodes, vec)+ c.Assert(wasDeleted, qt.IsFalse)+ c.Assert(isEmpty, qt.IsFalse)+ c.Assert(deleted, qt.IsNil)+ c.Assert(updated.(contentNodes), qt.HasLen, 1)+}hugolib/doctree/nodeshiftree_test.goindex 1d17a4129..a969b43fc 100644@@ -258,12 +258,15 @@ func (s *testShifter) Insert(old, new *testValue) (*testValue, *testValue, bool) return new, old, true } -func (s *testShifter) Delete(n *testValue, dimension sitesmatrix.Vector) (*testValue, bool, bool) {- return nil, true, true+func (s *testShifter) Delete(n *testValue, dimension sitesmatrix.Vector) (*testValue, *testValue, bool, bool) {+ return nil, n, true, true } -func (s *testShifter) DeleteFunc(v *testValue, f func(*testValue) bool) bool {- return f(v)+func (s *testShifter) DeleteFunc(v *testValue, f func(*testValue) bool) (*testValue, bool) {+ if f(v) {+ return nil, true+ }+ return v, false } func (s *testShifter) Shift(n *testValue, dimension sitesmatrix.Vector, fallback bool) (v *testValue, ok bool) {hugolib/doctree/nodeshifttree.goindex 0ccf3eba3..f2cec9f26 100644@@ -49,12 +49,14 @@ type ( // and a bool indicating if an existing record is updated. Insert(old, new T) (T, T, bool) - // Delete deletes T from the given dimension and returns the deleted T and whether the dimension was deleted and if it's empty after the delete.- Delete(v T, dimension sitesmatrix.Vector) (T, bool, bool)+ // Delete deletes T from the given dimension.+ // It returns the updated T, the deleted T, whether anything was deleted+ // and whether T is empty after the delete.+ Delete(v T, dimension sitesmatrix.Vector) (T, T, bool, bool) - // DeleteFunc deletes nodes in v from the tree where the given function returns true.- // It returns true if it's empty after the delete.- DeleteFunc(v T, f func(n T) bool) bool+ // DeleteFunc deletes nodes in v where the given function returns true.+ // It returns the updated T and whether it's empty after the delete.+ DeleteFunc(v T, f func(n T) bool) (T, bool) // Shift shifts v into the given dimension, // if fallback is true, it will fall back a fallback match if found.@@ -118,7 +120,7 @@ func (r *NodeShiftTree[T]) DeleteFuncRaw(key string, f func(T) bool) (T, int) { return lastDeleted, count } - isEmpty := r.shifter.DeleteFunc(v, func(n T) bool {+ updated, isEmpty := r.shifter.DeleteFunc(v, func(n T) bool { if f(n) { count++ lastDeleted = n@@ -129,6 +131,8 @@ func (r *NodeShiftTree[T]) DeleteFuncRaw(key string, f func(T) bool) (T, int) { if isEmpty { r.tree.Delete(key)+ } else if count > 0 {+ r.tree.Insert(key, updated) } return lastDeleted, count@@ -161,10 +165,15 @@ func (r *NodeShiftTree[T]) delete(key string) (T, bool) { var wasDeleted bool var deleted T if v, ok := r.tree.Get(key); ok {- var isEmpty bool- deleted, wasDeleted, isEmpty = r.shifter.Delete(v, r.siteVector)+ var (+ updated T+ isEmpty bool+ )+ updated, deleted, wasDeleted, isEmpty = r.shifter.Delete(v, r.siteVector) if isEmpty { r.tree.Delete(key)+ } else if wasDeleted {+ r.tree.Insert(key, updated) } } return deleted, wasDeleted