refactor: optimize loop constructs and improve code readability

Author: blacktop

OPC/ratatui-image

@@ -0,0 +1 @@
+Subproject commit 8d0fff0ee3ee579ed442ac4fa2ba5c3b4f8e6d62

detect_test.go

@@ -2,6 +2,7 @@ package termimg
 
 import (
 	"os"
+	"slices"
 	"testing"
 	"time"
 
@@ -187,13 +188,7 @@ func TestDetermineProtocols(t *testing.T) {
 	assert.NotEmpty(t, protocols, "Should return at least one protocol")
 
 	// Should always include halfblocks as fallback
-	found := false
-	for _, p := range protocols {
-		if p == Halfblocks {
-			found = true
-			break
-		}
-	}
+	found := slices.Contains(protocols, Halfblocks)
 	assert.True(t, found, "Should include halfblocks as fallback")
 }
 
@@ -316,7 +311,7 @@ func TestConcurrentDetection(t *testing.T) {
 	// Test concurrent access to detection functions
 	done := make(chan bool, 10)
 
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		go func() {
 			_ = DetectProtocol()
 			_ = QueryTerminalFeatures()
@@ -325,7 +320,7 @@ func TestConcurrentDetection(t *testing.T) {
 	}
 
 	// Wait for all goroutines
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		select {
 		case <-done:
 			// Success

kitty_test.go

@@ -26,8 +26,8 @@ func TestKittyZlibCompression(t *testing.T) {
 	t.Log(output)
 
 	// Handle tmux wrapping if present
-	if strings.HasPrefix(output, "\x1bPtmux;\x1b") {
-		unwrapped := strings.TrimPrefix(output, "\x1bPtmux;\x1b")
+	if after, ok := strings.CutPrefix(output, "\x1bPtmux;\x1b"); ok {
+		unwrapped := after
 		unwrapped = strings.TrimSuffix(unwrapped, "\x1b\\")
 		output = strings.ReplaceAll(unwrapped, "\x1b\x1b", "\x1b")
 	}

renderers_test.go

@@ -13,8 +13,8 @@ import (
 func createRendererTestImage(width, height int) image.Image {
 	img := image.NewRGBA(image.Rect(0, 0, width, height))
 	// Create a simple gradient pattern
-	for y := 0; y < height; y++ {
-		for x := 0; x < width; x++ {
+	for y := range height {
+		for x := range width {
 			img.Set(x, y, color.RGBA{
 				R: uint8((x * 255) / width),
 				G: uint8((y * 255) / height),

resize_test.go

@@ -14,8 +14,8 @@ import (
 func createTestImage(width, height int) image.Image {
 	img := image.NewRGBA(image.Rect(0, 0, width, height))
 	// Fill with a simple pattern for visual verification
-	for y := 0; y < height; y++ {
-		for x := 0; x < width; x++ {
+	for y := range height {
+		for x := range width {
 			img.Set(x, y, color.RGBA{
 				R: uint8((x * 255) / width),
 				G: uint8((y * 255) / height),
@@ -245,11 +245,11 @@ func TestResizeConcurrency(t *testing.T) {
 	results := make(chan image.Image, numGoroutines*numOperations)
 
 	// Launch multiple goroutines doing resize operations
-	for i := 0; i < numGoroutines; i++ {
+	for i := range numGoroutines {
 		wg.Add(1)
 		go func(id int) {
 			defer wg.Done()
-			for j := 0; j < numOperations; j++ {
+			for j := range numOperations {
 				size := uint(20 + (id+j)%30) // Vary sizes
 				result := ResizeImage(img, size, size, fmt.Sprintf("concurrent_%d_%d", id, j))
 				results <- result
@@ -331,8 +331,8 @@ func TestImageProcessingQuality(t *testing.T) {
 	img := image.NewRGBA(image.Rect(0, 0, 4, 4))
 
 	// Create a checkerboard pattern
-	for y := 0; y < 4; y++ {
-		for x := 0; x < 4; x++ {
+	for y := range 4 {
+		for x := range 4 {
 			if (x+y)%2 == 0 {
 				img.Set(x, y, color.RGBA{255, 255, 255, 255}) // White
 			} else {
@@ -423,7 +423,7 @@ func TestMemoryUsage(t *testing.T) {
 	runtime.ReadMemStats(&m1)
 
 	// Create and resize many images
-	for i := 0; i < 100; i++ {
+	for i := range 100 {
 		img := createTestImage(100, 100)
 		_ = ResizeImage(img, 50, 50, fmt.Sprintf("memory_test_%d", i))
 		if i%10 == 0 {

termimg_test.go

@@ -17,8 +17,8 @@ import (
 
 func createAPITestImage(width, height int) image.Image {
 	img := image.NewRGBA(image.Rect(0, 0, width, height))
-	for y := 0; y < height; y++ {
-		for x := 0; x < width; x++ {
+	for y := range height {
+		for x := range width {
 			img.Set(x, y, color.RGBA{
 				R: uint8((x * 255) / width),
 				G: uint8((y * 255) / height),

tools_cellbuf.go

@@ -1,5 +1,4 @@
 //go:build tools
-// +build tools
 
 package termimg
 

tui.go

@@ -322,7 +322,7 @@ func (g *ImageGallery) Render() (string, error) {
 	// Calculate grid layout
 	rows := (len(g.images) + g.columns - 1) / g.columns
 
-	for row := 0; row < rows; row++ {
+	for row := range rows {
 		// Render each image in the row
 		var imageOutputs []string
 		maxLines := 0
@@ -385,7 +385,7 @@ func combineImagesHorizontally(images []string, spacing int, maxLines int) strin
 	spacingStr := strings.Repeat(" ", spacing)
 
 	// Combine line by line
-	for line := 0; line < maxLines; line++ {
+	for line := range maxLines {
 		for i, imageLines := range imageLinesSet {
 			if i > 0 {
 				result.WriteString(spacingStr)