refactor(render): remove display context inspection api

Author: idursun

internal/ui/bookmarks/bookmarks_test.go

@@ -1,8 +1,8 @@
 package bookmarks
 
 import (
-	"fmt"
 	"slices"
+	"strings"
 	"testing"
 
 	tea "charm.land/bubbletea/v2"
@@ -71,16 +71,11 @@ func TestBookmarks_ZIndex_RendersAboveMainContent(t *testing.T) {
 
 	dl := render.NewDisplayContext()
 	box := layout.Box{R: layout.Rect(0, 0, 100, 40)}
+	dl.AddDraw(box.R, strings.Repeat("x", box.R.Dx()*box.R.Dy()), render.ZBase)
 	op.ViewRect(dl, box)
 
-	draws := dl.DrawList()
-
-	for i, draw := range draws {
-		msg := fmt.Sprintf("Draw operation %d has z-index %d, expected >= %d. "+
-			"Bookmarks overlay must render above main content.",
-			i, draw.Z, render.ZMenuBorder)
-		assert.GreaterOrEqual(t, draw.Z, render.ZMenuBorder, msg)
-	}
+	rendered := dl.RenderToString(box.R.Dx(), box.R.Dy())
+	assert.Contains(t, rendered, "Remotes:", "bookmarks overlay should remain visible above base content")
 }
 
 func Test_FilterIntentPressedTwice_ExecutesShortcut(t *testing.T) {

internal/ui/commandhistory/model_test.go

@@ -2,7 +2,6 @@ package commandhistory
 
 import (
 	"fmt"
-	"strings"
 	"testing"
 
 	"github.com/idursun/jjui/internal/ui/common"
@@ -85,14 +84,9 @@ func TestCommandHistory_ViewOnlyShowsSelectedOutput(t *testing.T) {
 	history.Update(intents.CommandHistoryNavigate{Delta: 1}) // select older
 
 	dl := render.NewDisplayContext()
-	history.ViewRect(dl, layout.NewBox(layout.Rect(0, 0, 60, 12)))
-
-	var out strings.Builder
-	for _, view := range dl.DrawList() {
-		out.WriteString(view.Content)
-		out.WriteByte('\n')
-	}
-	rendered := out.String()
+	box := layout.NewBox(layout.Rect(0, 0, 60, 12))
+	history.ViewRect(dl, box)
+	rendered := dl.RenderToString(box.R.Dx(), box.R.Dy())
 	assert.Contains(t, rendered, "jj older")
 	assert.Contains(t, rendered, "older-output")
 	assert.Contains(t, rendered, "jj newer")

internal/ui/confirmation/confirmation_test.go

@@ -1,6 +1,7 @@
 package confirmation
 
 import (
+	"strings"
 	"testing"
 
 	"charm.land/bubbles/v2/key"
@@ -121,29 +122,23 @@ func TestViewRect_DefaultRendersAtZBase(t *testing.T) {
 
 	dl := render.NewDisplayContext()
 	box := layout.Box{R: layout.Rect(0, 0, 50, 20)}
+	dl.AddDraw(box.R, strings.Repeat("x", box.R.Dx()*box.R.Dy()), render.ZPreview)
 	model.ViewRect(dl, box)
 
-	draws := dl.DrawList()
-	assert.NotEmpty(t, draws, "Expected confirmation to produce draw operations")
-
-	for _, draw := range draws {
-		assert.Less(t, draw.Z, render.ZPreview,
-			"Default confirmation should render below preview (ZBase level)")
-	}
+	rendered := dl.RenderToString(box.R.Dx(), box.R.Dy())
+	assert.NotContains(t, rendered, "Test message",
+		"default confirmation should render below preview content")
 }
 
 func TestWithZIndex_RendersAtSpecifiedZIndex(t *testing.T) {
 	model := New([]string{"Test message"}, WithZIndex(render.ZDialogs))
 
 	dl := render.NewDisplayContext()
 	box := layout.Box{R: layout.Rect(0, 0, 50, 20)}
+	dl.AddDraw(box.R, strings.Repeat("x", box.R.Dx()*box.R.Dy()), render.ZPreview)
 	model.ViewRect(dl, box)
 
-	draws := dl.DrawList()
-	assert.NotEmpty(t, draws, "Expected confirmation to produce draw operations")
-
-	for _, draw := range draws {
-		assert.GreaterOrEqual(t, draw.Z, render.ZDialogs,
-			"Confirmation with WithZIndex(ZDialogs) should render above preview")
-	}
+	rendered := dl.RenderToString(box.R.Dx(), box.R.Dy())
+	assert.Contains(t, rendered, "Test message",
+		"confirmation with WithZIndex(ZDialogs) should render above preview")
 }

internal/ui/flash/flash_test.go

@@ -2,6 +2,7 @@ package flash
 
 import (
 	"errors"
+	"strings"
 	"testing"
 
 	"github.com/idursun/jjui/internal/ui/common"
@@ -67,15 +68,23 @@ func TestView_StacksFromBottomRight(t *testing.T) {
 	m.add("de", nil)
 
 	dl := render.NewDisplayContext()
-	m.ViewRect(dl, layout.NewBox(layout.Rect(0, 0, 30, 12)))
-	views := dl.DrawList()
-
-	if assert.Len(t, views, 2) {
-		assert.Contains(t, views[0].Content, "abc")
-		assert.Contains(t, views[1].Content, "de")
-		assert.GreaterOrEqual(t, views[0].Rect.Min.X, 0)
-		assert.GreaterOrEqual(t, views[1].Rect.Min.X, 0)
-		assert.Greater(t, views[0].Rect.Min.Y, views[1].Rect.Min.Y)
+	box := layout.NewBox(layout.Rect(0, 0, 30, 12))
+	m.ViewRect(dl, box)
+	rendered := strings.Split(dl.RenderToString(box.R.Dx(), box.R.Dy()), "\n")
+
+	abcY := -1
+	deY := -1
+	for i, line := range rendered {
+		if strings.Contains(line, "abc") {
+			abcY = i
+		}
+		if strings.Contains(line, "de") {
+			deY = i
+		}
+	}
+
+	if assert.NotEqual(t, -1, abcY) && assert.NotEqual(t, -1, deY) {
+		assert.Greater(t, abcY, deY, "newer flash messages should stack lower on screen")
 	}
 }
 

internal/ui/git/git_test.go

@@ -1,7 +1,7 @@
 package git
 
 import (
-	"fmt"
+	"strings"
 	"testing"
 
 	tea "charm.land/bubbletea/v2"
@@ -114,15 +114,9 @@ func TestGit_ZIndex_RendersAboveMainContent(t *testing.T) {
 
 	dl := render.NewDisplayContext()
 	box := layout.Box{R: layout.Rect(0, 0, 100, 40)}
+	dl.AddDraw(box.R, strings.Repeat("x", box.R.Dx()*box.R.Dy()), render.ZBase)
 	op.ViewRect(dl, box)
 
-	draws := dl.DrawList()
-	assert.NotEqual(t, 0, len(draws), "Expected git overlay to produce draw operations")
-
-	for i, draw := range draws {
-		msg := fmt.Sprintf("Draw operation %d has z-index %d, expected >= %d. "+
-			"Git overlay must render above main content.",
-			i, draw.Z, render.ZMenuBorder)
-		assert.GreaterOrEqual(t, draw.Z, render.ZMenuBorder, msg)
-	}
+	rendered := dl.RenderToString(box.R.Dx(), box.R.Dy())
+	assert.Contains(t, rendered, "Remotes:", "git overlay should remain visible above base content")
 }

internal/ui/render/display_context.go

@@ -114,15 +114,6 @@ func (dl *DisplayContext) AddInteractionFn(rect layout.Rectangle, fn func(tea.Mo
 	})
 }
 
-// Clear removes all operations from the display context.
-// Useful for reusing a DisplayContext across frames.
-func (dl *DisplayContext) Clear() {
-	dl.draws = dl.draws[:0]
-	dl.effects = dl.effects[:0]
-	dl.interactions = dl.interactions[:0]
-	dl.orderCounter = 0
-}
-
 // Render executes all operations in the display context to the given screen.
 // Order of execution:
 // 1. Draw sorted by Z-index (low to high)
@@ -173,71 +164,6 @@ func (dl *DisplayContext) RenderToString(width, height int) string {
 	return buf.Render()
 }
 
-// DrawList returns a copy of all Draw calls (useful for debugging/inspection)
-func (dl *DisplayContext) DrawList() []Draw {
-	result := make([]Draw, len(dl.draws))
-	for i, op := range dl.draws {
-		result[i] = op.Draw
-	}
-	return result
-}
-
-// EffectsList returns a copy of all Effects (useful for debugging/inspection)
-func (dl *DisplayContext) EffectsList() []Effect {
-	result := make([]Effect, len(dl.effects))
-	for i, op := range dl.effects {
-		result[i] = op.effect
-	}
-	return result
-}
-
-// InteractionsList returns all interactions sorted by Z-index (highest first for priority).
-func (dl *DisplayContext) InteractionsList() []InteractionOp {
-	sorted := make([]interactionOp, len(dl.interactions))
-	copy(sorted, dl.interactions)
-	sort.SliceStable(sorted, func(i, j int) bool {
-		if sorted[i].Z != sorted[j].Z {
-			return sorted[i].Z > sorted[j].Z
-		}
-		return sorted[i].order < sorted[j].order
-	})
-	result := make([]InteractionOp, len(sorted))
-	for i, op := range sorted {
-		result[i] = op.InteractionOp
-	}
-	return result
-}
-
-// Merge adds all operations from another DisplayContext into this one.
-func (dl *DisplayContext) Merge(other *DisplayContext) {
-	for _, op := range other.draws {
-		dl.draws = append(dl.draws, drawOp{
-			Draw:  op.Draw,
-			order: dl.nextOrder(),
-		})
-	}
-
-	for _, op := range other.effects {
-		dl.effects = append(dl.effects, effectOp{
-			effect: op.effect,
-			order:  dl.nextOrder(),
-			z:      op.z,
-		})
-	}
-
-	for _, op := range other.interactions {
-		dl.interactions = append(dl.interactions, interactionOp{
-			InteractionOp: op.InteractionOp,
-			order:         dl.nextOrder(),
-		})
-	}
-}
-
-// Len returns the total number of operations in the display context
-func (dl *DisplayContext) Len() int {
-	return len(dl.draws) + len(dl.effects) + len(dl.interactions)
-}
-
 type drawOp struct {
 	Draw
 	order int

internal/ui/render/display_context_test.go

@@ -193,25 +193,3 @@ func TestEmptyDisplayContext(t *testing.T) {
 	// Empty buffer output may be empty or whitespace, both are valid
 	_ = buf.Render()
 }
-
-func TestDisplayContext_Reuse(t *testing.T) {
-	dl := NewDisplayContext()
-
-	// First frame
-	dl.AddDraw(layout.Rect(0, 0, 5, 1), "Frame1", 0)
-	if dl.Len() != 1 {
-		t.Errorf("Expected 1 op, got %d", dl.Len())
-	}
-
-	// Clear and reuse
-	dl.Clear()
-	if dl.Len() != 0 {
-		t.Errorf("Expected 0 ops after clear, got %d", dl.Len())
-	}
-
-	// Second frame
-	dl.AddDraw(layout.Rect(0, 0, 5, 1), "Frame2", 0)
-	if dl.Len() != 1 {
-		t.Errorf("Expected 1 op after reuse, got %d", dl.Len())
-	}
-}

internal/ui/render/text_builder_test.go

@@ -19,7 +19,10 @@ func TestTextBuilder_Write(t *testing.T) {
 		Write("Hello").
 		Done()
 
-	draws := dl.DrawList()
+	draws := make([]Draw, len(dl.draws))
+	for i, op := range dl.draws {
+		draws[i] = op.Draw
+	}
 	if len(draws) != 1 {
 		t.Fatalf("expected 1 draw, got %d", len(draws))
 	}
@@ -37,7 +40,10 @@ func TestTextBuilder_Styled(t *testing.T) {
 		Styled("Bold", style).
 		Done()
 
-	draws := dl.DrawList()
+	draws := make([]Draw, len(dl.draws))
+	for i, op := range dl.draws {
+		draws[i] = op.Draw
+	}
 	if len(draws) != 1 {
 		t.Fatalf("expected 1 draw, got %d", len(draws))
 	}
@@ -55,12 +61,18 @@ func TestTextBuilder_Clickable(t *testing.T) {
 		Clickable("Click", lipgloss.Style{}, testClickMsg{ID: 1}).
 		Done()
 
-	draws := dl.DrawList()
+	draws := make([]Draw, len(dl.draws))
+	for i, op := range dl.draws {
+		draws[i] = op.Draw
+	}
 	if len(draws) != 1 {
 		t.Fatalf("expected 1 draw, got %d", len(draws))
 	}
 
-	interactions := dl.InteractionsList()
+	interactions := make([]InteractionOp, len(dl.interactions))
+	for i, op := range dl.interactions {
+		interactions[i] = op.InteractionOp
+	}
 	if len(interactions) != 1 {
 		t.Fatalf("expected 1 interaction, got %d", len(interactions))
 	}
@@ -87,7 +99,10 @@ func TestTextBuilder_MultipleSegments(t *testing.T) {
 		Write("C").
 		Done()
 
-	draws := dl.DrawList()
+	draws := make([]Draw, len(dl.draws))
+	for i, op := range dl.draws {
+		draws[i] = op.Draw
+	}
 	if len(draws) != 3 {
 		t.Fatalf("expected 3 draws, got %d", len(draws))
 	}
@@ -104,7 +119,10 @@ func TestTextBuilder_MultipleSegments(t *testing.T) {
 	}
 
 	// Check only one interaction (for "B")
-	interactions := dl.InteractionsList()
+	interactions := make([]InteractionOp, len(dl.interactions))
+	for i, op := range dl.interactions {
+		interactions[i] = op.InteractionOp
+	}
 	if len(interactions) != 1 {
 		t.Fatalf("expected 1 interaction, got %d", len(interactions))
 	}
@@ -151,7 +169,10 @@ func TestTextBuilder_EmptyText(t *testing.T) {
 		Write("Hello").
 		Done()
 
-	draws := dl.DrawList()
+	draws := make([]Draw, len(dl.draws))
+	for i, op := range dl.draws {
+		draws[i] = op.Draw
+	}
 	// Empty string should be skipped
 	if len(draws) != 1 {
 		t.Fatalf("expected 1 draw (empty skipped), got %d", len(draws))
@@ -176,7 +197,10 @@ func TestTextBuilder_NewLineAndMeasure(t *testing.T) {
 	}
 
 	tb.Done()
-	draws := dl.DrawList()
+	draws := make([]Draw, len(dl.draws))
+	for i, op := range dl.draws {
+		draws[i] = op.Draw
+	}
 	if len(draws) != 2 {
 		t.Fatalf("expected 2 draws, got %d", len(draws))
 	}
@@ -198,7 +222,10 @@ func TestTextBuilder_Space(t *testing.T) {
 		Write("B").
 		Done()
 
-	draws := dl.DrawList()
+	draws := make([]Draw, len(dl.draws))
+	for i, op := range dl.draws {
+		draws[i] = op.Draw
+	}
 	if len(draws) != 3 {
 		t.Fatalf("expected 3 draws, got %d", len(draws))
 	}