refactor(core): pass lane span validity to laneWidth

commit: 12f4382b95d57852235a69f997e163e146c47620
author: brice · 44h ago · 2026-10-21 08:21 UTC
parent: faf772d
signature: GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email

2 files · +6 -10

M internal/core/border.go +1 -0


@@ -133,6 +133,7 @@ func (w *Workspace) setBorder(b border, pos int) bool {
133	133		}
134	134		stamped := !w.validSpans(first, last)
135	135		if stamped {
	136	+	// Mutates spans, so it must not cache validity across this loop.
136	137		w.spanSeq++
137	138		used := 0
138	139		for i := first; i <= last; i++ {


@@ -133,6 +133,7 @@ func (w *Workspace) setBorder(b border, pos int) bool {
133	}	133		}
134	stamped := !w.validSpans(first, last)	134		stamped := !w.validSpans(first, last)
135	if stamped {	135		if stamped {
		136	+	// Mutates spans, so it must not cache validity across this loop.
136	w.spanSeq++	137		w.spanSeq++
137	used := 0	138		used := 0
138	for i := first; i <= last; i++ {	139		for i := first; i <= last; i++ {

M internal/core/cascade.go +5 -10


@@ -82,7 +82,7 @@ func (w *Workspace) cellX(i int) int {
82	82		x := w.gap()
83	83		valid := w.validSpans(first, last)
84	84		for j := first; j < i; j++ {
85		-	x += w.laneWidthWith(j, first, last, S, u, sum, valid) + w.gap()
	85	+	x += w.laneWidth(j, first, last, S, u, sum, valid) + w.gap()
86	86		}
87	87		return x
88	88		}

@@ -99,7 +99,7 @@ func (w *Workspace) cascadeBands() (n, spacing int) {
99	99		func (w *Workspace) cellWidth(i int) int {
100	100		first, last := w.laneBounds(w.laneOf(i))
101	101		S, u, sum := w.laneStats(first, last)
102		-	return w.laneWidth(i, first, last, S, u, sum)
	102	+	return w.laneWidth(i, first, last, S, u, sum, w.validSpans(first, last))
103	103		}
104	104
105	105		// laneStats measures the lane first..last: S is the sum of the cells of

@@ -143,13 +143,8 @@ func (w *Workspace) laneWeight(i, S, u int) int {
143	143		// laneWidth is the width of column i of the lane first..last with the
144	144		// stats of laneStats: the usable width after gaps, split by weight. The
145	145		// last column receives the pixel remainder, just as for stamped spans.
146		-	func (w *Workspace) laneWidth(i, first, last, S, u, sum int) int {
147		-	return w.laneWidthWith(i, first, last, S, u, sum, w.validSpans(first, last))
148		-	}
149		-
150		-	// laneWidthWith is laneWidth with the lane's validSpans given, so a loop
151		-	// over the lane checks it once.
152		-	func (w *Workspace) laneWidthWith(i, first, last, S, u, sum int, spansValid bool) int {
	146	+	// The caller passes the lane's validSpans so a loop over the lane checks it once.
	147	+	func (w *Workspace) laneWidth(i, first, last, S, u, sum int, spansValid bool) int {
153	148		if spansValid {
154	149		avail := max(w.Usable.W-w.gap()*(last-first+2), 0)
155	150		if i == last {

@@ -214,7 +209,7 @@ func (w *Workspace) cascadeRectsAt(dst []Rect, ignoreFullWidth bool, shift int)
214	209		x := g
215	210		valid := w.validSpans(first, last)
216	211		for i := first; i <= last; i++ {
217		-	cw := w.laneWidthWith(i, first, last, S, u, sum, valid)
	212	+	cw := w.laneWidth(i, first, last, S, u, sum, valid)
218	213		r := Rect{X: w.Usable.X + x, Y: w.Usable.Y + g + lanew.Usable.H - view, W: cw, H: max(w.Usable.H-2g, 0)}
219	214		if w.Columns[i].FullWidth && !ignoreFullWidth {
220	215		r.X = w.Usable.X + g

 	x := w.gap()
 	valid := w.validSpans(first, last)
 	for j := first; j < i; j++ {
-		x += w.laneWidthWith(j, first, last, S, u, sum, valid) + w.gap()
+		x += w.laneWidth(j, first, last, S, u, sum, valid) + w.gap()
 	}
 	return x
 }
 func (w *Workspace) cellWidth(i int) int {
 	first, last := w.laneBounds(w.laneOf(i))
 	S, u, sum := w.laneStats(first, last)
-	return w.laneWidth(i, first, last, S, u, sum)
+	return w.laneWidth(i, first, last, S, u, sum, w.validSpans(first, last))
 }
 // laneStats measures the lane first..last: S is the sum of the cells of
 // laneWidth is the width of column i of the lane first..last with the
 // stats of laneStats: the usable width after gaps, split by weight. The
 // last column receives the pixel remainder, just as for stamped spans.
-func (w *Workspace) laneWidth(i, first, last, S, u, sum int) int {
+// The caller passes the lane's validSpans so a loop over the lane checks it once.
-	return w.laneWidthWith(i, first, last, S, u, sum, w.validSpans(first, last))
+func (w *Workspace) laneWidth(i, first, last, S, u, sum int, spansValid bool) int {
-}
-// laneWidthWith is laneWidth with the lane's validSpans given, so a loop
-// over the lane checks it once.
-func (w *Workspace) laneWidthWith(i, first, last, S, u, sum int, spansValid bool) int {
 	if spansValid {
 		avail := max(w.Usable.W-w.gap()*(last-first+2), 0)
 		if i == last {
 		x := g
 		valid := w.validSpans(first, last)
 		for i := first; i <= last; i++ {
-			cw := w.laneWidthWith(i, first, last, S, u, sum, valid)
+			cw := w.laneWidth(i, first, last, S, u, sum, valid)
 			r := Rect{X: w.Usable.X + x, Y: w.Usable.Y + g + lane*w.Usable.H - view, W: cw, H: max(w.Usable.H-2*g, 0)}
 			if w.Columns[i].FullWidth && !ignoreFullWidth {
 				r.X = w.Usable.X + g