Backtestshugorun-20261007-020926#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.
Both patches fix the root cause the same way. The panic comes from removing elements while ranging over a `contentNodes` slice with `append(v[:i], v[i+1:]...)`: indices shift, and when multiple entries match, the slice goes out of bounds. Both rebuild a fresh `remaining` slice instead. Both also change the `Delete`/`DeleteFunc` shifter interface to return the updated node, and update `NodeShiftTree.delete` and `DeleteFuncRaw` to store it back in the tree after a partial delete. The original code's local reassignment never reached the tree, a second latent bug that both patches fix. The logic is nearly identical. Patch A keeps a child whenever `!isEmpty`, using the returned updated value. Patch B keeps the original node when nothing was deleted and the updated node when something was deleted but the child is still non-empty. These behave the same in practice; B's branching states the intent a little more explicitly. The real difference is the tests. Patch A tests only `contentNodeShifter.Delete` on a flat slice, using an ad-hoc fake node type. It covers multiple matches, delete-all and delete-none, but not `DeleteFunc`, the nested-map case, or tree write-back. Patch B uses real `resourceSource` nodes and covers more: - multiple matches, including the last element, checked by node identity; - that the original slice is not mutated in place; - sequential deletes down to empty; - a nested `contentNodesMap` that is partially emptied and must be kept; - `DeleteFunc` with adjacent deletions, including the last element; - a tree-level test confirming that `Shape(...).Delete` and `DeleteFuncRaw` write the updated node back and remove the key once it is empty. That last test checks the second half of the fix, which A leaves untested. Scope and craft are comparable; B adds brief explanatory comments. B wins on test quality.
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
46m 2s
Wall-clock time in the container
Full test suite
No new failures
3,700 passed · 99 skipped · 3,808 total
Contamination audit
Clean
No sign the agent saw the real fix
Patch size
236vs 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..8adb808ed 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,63 @@ 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 contentNodes+ // Build a new slice; the old one may be shared with others,+ // and removing elements while ranging over it shifts the indices.+ remaining = make(contentNodes, 0, len(v))+ )+ for _, nn := range v {+ if updated, vv, ok, isEmpty := s.Delete(nn, vec); ok { deleted = append(deleted, vv)- v = append(v[:i], v[i+1:]...)+ if !isEmpty {+ // E.g. a contentNodesMap with nodes for other sites left.+ remaining = append(remaining, updated)+ }+ } else {+ remaining = append(remaining, nn) } } 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 {+ // Build a new slice; the old one may be shared with others,+ // and removing elements while ranging over it shifts the indices.+ remaining := make(contentNodes, 0, len(ss))+ 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 +97,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..f092da2e0@@ -0,0 +1,153 @@+// 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"+ "github.com/google/go-cmp/cmp"+)++// sameNodes compares content nodes by identity.+var sameNodes = qt.CmpEquals(cmp.Comparer(func(a, b *resourceSource) bool { return a == b }))++func newTestResourceSourceForShifter(lang int) *resourceSource {+ return &resourceSource{sv: sitesmatrix.Vector{lang, 0, 0}}+}++// Issue: panic: slice bounds out of range in contentNodeShifter.Delete.+func TestContentNodeShifterDeleteContentNodesMultipleMatches(t *testing.T) {+ c := qt.New(t)+ s := &contentNodeShifter{}++ vec := sitesmatrix.Vector{2, 0, 0}+ a := newTestResourceSourceForShifter(0)+ b := newTestResourceSourceForShifter(1)+ m1 := newTestResourceSourceForShifter(2)+ d := newTestResourceSourceForShifter(3)+ m2 := newTestResourceSourceForShifter(2) // Last element matches, too.++ original := contentNodes{a, b, m1, d, m2}+ updated, deleted, wasDeleted, isEmpty := s.Delete(original, vec)+ c.Assert(wasDeleted, qt.IsTrue)+ c.Assert(isEmpty, qt.IsFalse)+ c.Assert(deleted, sameNodes, contentNodes{m1, m2})+ c.Assert(updated, sameNodes, contentNodes{a, b, d})+ // The original slice must not be modified in place.+ c.Assert(original, sameNodes, contentNodes{a, b, m1, d, m2})++ // Delete the remaining nodes one by one.+ for i, n := range []*resourceSource{a, b, d} {+ var ok bool+ updated, deleted, ok, isEmpty = s.Delete(updated, n.sv)+ c.Assert(ok, qt.IsTrue)+ c.Assert(deleted, sameNodes, contentNodes{n})+ c.Assert(isEmpty, qt.Equals, i == 2)+ }++ // No match.+ nodes := contentNodes{a, b}+ 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, sameNodes, nodes)+}++func TestContentNodeShifterDeleteContentNodesNestedMap(t *testing.T) {+ c := qt.New(t)+ s := &contentNodeShifter{}++ a := newTestResourceSourceForShifter(0)+ b := newTestResourceSourceForShifter(1)+ x := newTestResourceSourceForShifter(2)+ m := contentNodesMap{a.sv: a, b.sv: b}++ updated, deleted, wasDeleted, isEmpty := s.Delete(contentNodes{m, x}, a.sv)+ c.Assert(wasDeleted, qt.IsTrue)+ c.Assert(isEmpty, qt.IsFalse)+ c.Assert(deleted, sameNodes, contentNodes{a})+ // The map still holds b, so it must be kept.+ c.Assert(updated, sameNodes, contentNodes{contentNodesMap{b.sv: b}, x})+}++func TestContentNodeShifterDeleteFuncContentNodes(t *testing.T) {+ c := qt.New(t)+ s := &contentNodeShifter{}++ nodes := make(contentNodes, 5)+ for i := range nodes {+ nodes[i] = newTestResourceSourceForShifter(i)+ }+ original := append(contentNodes(nil), nodes...)++ // Delete adjacent nodes, including the last one.+ del := map[contentNode]bool{nodes[1]: true, nodes[3]: true, nodes[4]: true}+ updated, isEmpty := s.DeleteFunc(nodes, func(n contentNode) bool { return del[n] })+ c.Assert(isEmpty, qt.IsFalse)+ c.Assert(updated, sameNodes, contentNodes{original[0], original[2]})+ c.Assert(nodes, sameNodes, original)++ updated, isEmpty = s.DeleteFunc(updated, func(n contentNode) bool { return true })+ c.Assert(isEmpty, qt.IsTrue)+ c.Assert(updated, sameNodes, contentNodes{})+}++// Verify that the tree stores the updated node after a partial delete.+func TestContentNodeShifterDeleteUpdatesTree(t *testing.T) {+ c := qt.New(t)++ newTree := func() *doctree.NodeShiftTree[contentNode] {+ return doctree.New(doctree.Config[contentNode]{Shifter: &contentNodeShifter{}})+ }++ a := newTestResourceSourceForShifter(0)+ b := newTestResourceSourceForShifter(1)+ x1 := newTestResourceSourceForShifter(2)+ x2 := newTestResourceSourceForShifter(2)+ const key = "/blog/p1"++ tree := newTree()+ tree.InsertRaw(key, contentNodes{a, x1, b, x2})+ deleted, ok := tree.Shape(x1.sv).Delete(key)+ c.Assert(ok, qt.IsTrue)+ c.Assert(deleted, sameNodes, contentNodes{x1, x2})+ v, found := tree.GetRaw(key)+ c.Assert(found, qt.IsTrue)+ c.Assert(v, sameNodes, contentNodes{a, b})++ // Delete the rest; the key should be removed.+ tree.Shape(a.sv).Delete(key)+ v, _ = tree.GetRaw(key)+ c.Assert(v, sameNodes, contentNodes{b})+ tree.Shape(b.sv).Delete(key)+ _, found = tree.GetRaw(key)+ c.Assert(found, qt.IsFalse)++ // DeleteFuncRaw.+ tree = newTree()+ tree.InsertRaw(key, contentNodes{a, x1, b, x2})+ _, count := tree.DeleteFuncRaw(key, func(n contentNode) bool { return n == x1 || n == x2 })+ c.Assert(count, qt.Equals, 2)+ v, found = tree.GetRaw(key)+ c.Assert(found, qt.IsTrue)+ c.Assert(v, sameNodes, contentNodes{a, b})+ _, count = tree.DeleteFuncRaw(key, func(n contentNode) bool { return true })+ c.Assert(count, qt.Equals, 2)+ _, 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..c3c97ef64 100644@@ -49,12 +49,13 @@ 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 and returns the updated T (to be stored in the tree),+ // 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 updated T (to be stored in the tree) 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 +119,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 +130,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 +164,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
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