Backtestshugorun-20261005-133023#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 make the same core fix. Each `Delete`/`DeleteFunc` call now builds a fresh slice instead of shrinking the `contentNodes` slice in place inside a `range` loop. That in-place mutation was the root cause: elements get skipped, the stale tail is duplicated, and `v[i+1:]` goes out of bounds once several entries are removed. Both patches also change the shifter interface to return the updated value, and `NodeShiftTree.delete`/`DeleteFuncRaw` re-insert it when the node is not empty. That fixes a second latent bug: the stored slice in the tree was never actually updated. The production code is almost the same in the two patches: - Patch A keeps `updated` whenever `!isEmpty`, which relies on every non-deleting branch returning the original node. - Patch B keeps the original `nn` explicitly when nothing was deleted and keeps `updated` only on deletion. This is slightly more robust and easier to read, and it pre-sizes the slice. The real difference is in the tests: - Patch A tests only `contentNodeShifter.Delete` directly. Its non-adjacent case does exercise the original panic, and it covers the delete-all and delete-none cases. - Patch B tests through the actual `NodeShiftTree` via `Shape(...).Delete` and `DeleteFuncRaw`. This checks that the stored tree value is correct after each deletion, which is the second half of the fix. Its tests cover: - adjacent deletions that were previously skipped; - non-adjacent deletions that reproduce the panic; - nested `contentNodesMap` retention; - successive deletions until the key is removed; - the `DeleteFunc` path, which Patch A leaves untested. Correctness and scope are effectively equal. Patch B wins on test thoroughness and slightly on craft.
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 38m
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
287vs 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..9de597147 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,60 @@ 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+ kept = make(contentNodes, 0, len(v))+ )+ // Note that we build a new slice here, as v may be stored+ // elsewhere and it's not safe to shrink it in place while ranging over it.+ 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 {+ kept = append(kept, updated)+ }+ } else {+ kept = append(kept, nn) } } if len(deleted) == 0 {- return nil, false, false+ return v, nil, false, false }- return deleted, true, len(v) == 0+ return kept, deleted, true, len(kept) == 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 {+ kept := make(contentNodes, 0, len(ss))+ for _, n := range ss { if f(n) { resource.MarkStale(n)- ss = append(ss[:i], ss[i+1:]...)+ } else {+ kept = append(kept, n) } }- return len(ss) == 0+ return kept, len(kept) == 0 case contentNodesMap: for k, n := range ss { if f(n) {@@ -83,7 +94,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..2268da468@@ -0,0 +1,206 @@+// 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"+)++var _ contentNodeForSite = (*testContentNodeForSite)(nil)++type testContentNodeForSite struct {+ id string+ vec sitesmatrix.Vector+}++func (n *testContentNodeForSite) Path() string {+ return "/p1"+}++func (n *testContentNodeForSite) forEeachContentNode(f func(sitesmatrix.Vector, contentNode) bool) bool {+ return f(n.vec, n)+}++func (n *testContentNodeForSite) siteVector() sitesmatrix.Vector {+ return n.vec+}++func (n *testContentNodeForSite) nodeCategorySingle() {}++func newTestContentNodeShiftTree(c *qt.C, key string, nodes ...*testContentNodeForSite) *doctree.NodeShiftTree[contentNode] {+ tree := doctree.New(doctree.Config[contentNode]{Shifter: &contentNodeShifter{}})+ for _, n := range nodes {+ tree.Insert(key, n)+ }+ v, ok := tree.GetRaw(key)+ c.Assert(ok, qt.IsTrue)+ c.Assert(v, qt.HasLen, len(nodes))+ return tree+}++func testContentNodeIDs(c *qt.C, tree *doctree.NodeShiftTree[contentNode], key string) []string {+ v, ok := tree.GetRaw(key)+ if !ok {+ return nil+ }+ var ids []string+ switch vv := v.(type) {+ case contentNodes:+ for _, n := range vv {+ ids = append(ids, n.(*testContentNodeForSite).id)+ }+ case *testContentNodeForSite:+ ids = append(ids, vv.id)+ default:+ c.Fatalf("unexpected type %T", v)+ }+ return ids+}++func TestContentNodeShifterDeleteContentNodes(t *testing.T) {+ t.Parallel()+ c := qt.New(t)++ var (+ v0 = sitesmatrix.Vector{0, 0, 0}+ v1 = sitesmatrix.Vector{1, 0, 0}+ v2 = sitesmatrix.Vector{2, 0, 0}+ )++ const key = "/blog/p1"++ tree := newTestContentNodeShiftTree(c, key,+ &testContentNodeForSite{id: "a0", vec: v0},+ &testContentNodeForSite{id: "b0", vec: v0},+ &testContentNodeForSite{id: "c1", vec: v1},+ &testContentNodeForSite{id: "d2", vec: v2},+ )++ // Delete both nodes in v0. This used to skip b0 and leave+ // a duplicated tail element in the stored slice.+ deleted, ok := tree.Shape(v0).Delete(key)+ c.Assert(ok, qt.IsTrue)+ c.Assert(deleted, qt.HasLen, 2)+ c.Assert(testContentNodeIDs(c, tree, key), qt.DeepEquals, []string{"c1", "d2"})++ deleted, ok = tree.Shape(v1).Delete(key)+ c.Assert(ok, qt.IsTrue)+ c.Assert(deleted, qt.HasLen, 1)+ c.Assert(testContentNodeIDs(c, tree, key), qt.DeepEquals, []string{"d2"})++ // Nothing to delete in v0 anymore.+ _, ok = tree.Shape(v0).Delete(key)+ c.Assert(ok, qt.IsFalse)+ c.Assert(testContentNodeIDs(c, tree, key), qt.DeepEquals, []string{"d2"})++ _, ok = tree.Shape(v2).Delete(key)+ c.Assert(ok, qt.IsTrue)+ _, found := tree.GetRaw(key)+ c.Assert(found, qt.IsFalse)+}++func TestContentNodeShifterDeleteContentNodesNonAdjacent(t *testing.T) {+ t.Parallel()+ c := qt.New(t)++ var (+ v0 = sitesmatrix.Vector{0, 0, 0}+ v1 = sitesmatrix.Vector{1, 0, 0}+ )++ const key = "/blog/p1"++ tree := newTestContentNodeShiftTree(c, key,+ &testContentNodeForSite{id: "a0", vec: v0},+ &testContentNodeForSite{id: "b1", vec: v1},+ &testContentNodeForSite{id: "c0", vec: v0},+ &testContentNodeForSite{id: "d0", vec: v0},+ )++ // This used to panic with slice bounds out of range.+ deleted, ok := tree.Shape(v0).Delete(key)+ c.Assert(ok, qt.IsTrue)+ c.Assert(deleted, qt.HasLen, 3)+ c.Assert(testContentNodeIDs(c, tree, key), qt.DeepEquals, []string{"b1"})+}++func TestContentNodeShifterDeleteNestedContentNodesMap(t *testing.T) {+ t.Parallel()+ c := qt.New(t)++ var (+ v0 = sitesmatrix.Vector{0, 0, 0}+ v1 = sitesmatrix.Vector{1, 0, 0}+ )++ s := &contentNodeShifter{}+ a1 := &testContentNodeForSite{id: "a1", vec: v1}+ m := contentNodesMap{+ v0: &testContentNodeForSite{id: "a0", vec: v0},+ v1: a1,+ }+ n := contentNodes{m, &testContentNodeForSite{id: "b0", vec: v0}}++ updated, deleted, ok, isEmpty := s.Delete(n, v0)+ c.Assert(ok, qt.IsTrue)+ c.Assert(isEmpty, qt.IsFalse)+ c.Assert(deleted, qt.HasLen, 2)+ // The nested map still holds v1 and must be kept.+ c.Assert(updated, qt.HasLen, 1)+ mm, isMap := updated.(contentNodes)[0].(contentNodesMap)+ c.Assert(isMap, qt.IsTrue)+ c.Assert(mm, qt.HasLen, 1)+ c.Assert(mm[v1] == contentNode(a1), qt.IsTrue)+}++func TestContentNodeShifterDeleteFuncContentNodes(t *testing.T) {+ t.Parallel()+ c := qt.New(t)++ var (+ v0 = sitesmatrix.Vector{0, 0, 0}+ v1 = sitesmatrix.Vector{1, 0, 0}+ )++ const key = "/blog/p1"++ tree := newTestContentNodeShiftTree(c, key,+ &testContentNodeForSite{id: "a0", vec: v0},+ &testContentNodeForSite{id: "b0", vec: v0},+ &testContentNodeForSite{id: "c1", vec: v1},+ &testContentNodeForSite{id: "d1", vec: v1},+ )++ isV0 := func(n contentNode) bool {+ return n.(*testContentNodeForSite).vec == v0+ }++ // Adjacent matches used to be skipped and the stored slice left with stale elements.+ _, count := tree.DeleteFuncRaw(key, isV0)+ c.Assert(count, qt.Equals, 2)+ c.Assert(testContentNodeIDs(c, tree, key), qt.DeepEquals, []string{"c1", "d1"})++ _, count = tree.DeleteFuncRaw(key, isV0)+ c.Assert(count, qt.Equals, 0)+ c.Assert(testContentNodeIDs(c, tree, key), qt.DeepEquals, []string{"c1", "d1"})++ _, 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..b2c754e18 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 (to be stored in the tree in place of v), 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 in place of v) 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 +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
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