From 93968e7333adf525dbd6952f1fc639806b4e3dc0 Mon Sep 17 00:00:00 2001
From: Hayden Hargreaves <hhargreaves2006@gmail.com>
Date: Thu, 5 Mar 2026 14:42:11 -0700
Subject: [PATCH] fix: fixed most of the tests, but not all of them, some still
 fail

---
 internal/core/window_builder.go             |  4 +---
 internal/editor/integration_command_test.go | 26 ++++++++++-----------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/internal/core/window_builder.go b/internal/core/window_builder.go
index 75e5645..53a1de6 100644
--- a/internal/core/window_builder.go
+++ b/internal/core/window_builder.go
@@ -20,9 +20,7 @@ func NewWindowBuilder() *WindowBuilder {
 			ScrollY: 0,
 			Height:  0,
 			Width:   0,
-			Options: WinOptions{
-				ScrollOff: 8, // 8 is default
-			},
+			Options: NewDefaultWinOptions(),
 		},
 	}
 }
diff --git a/internal/editor/integration_command_test.go b/internal/editor/integration_command_test.go
index 0a29312..bed890d 100644
--- a/internal/editor/integration_command_test.go
+++ b/internal/editor/integration_command_test.go
@@ -19,7 +19,7 @@ func TestCommandSetBoolean(t *testing.T) {
 		sendKeys(tm, ":", "s", "e", "t", " ", "n", "o", "n", "u", "m", "b", "e", "r", "enter")
 
 		m := getFinalModel(t, tm)
-		if m.Settings().Number {
+		if m.ActiveWindow().Options.Number {
 			t.Error("expected Number to be false after :set nonumber")
 		}
 	})
@@ -33,7 +33,7 @@ func TestCommandSetBoolean(t *testing.T) {
 		sendKeys(tm, ":", "s", "e", "t", " ", "n", "u", "enter")
 
 		m := getFinalModel(t, tm)
-		if !m.Settings().Number {
+		if !m.ActiveWindow().Options.Number {
 			t.Error("expected Number to be true after :set nu")
 		}
 	})
@@ -46,7 +46,7 @@ func TestCommandSetBoolean(t *testing.T) {
 		sendKeys(tm, ":", "s", "e", "t", " ", "n", "u", "m", "b", "e", "r", "!", "enter")
 
 		m := getFinalModel(t, tm)
-		if m.Settings().Number {
+		if m.ActiveWindow().Options.Number {
 			t.Error("expected Number to be false after :set number!")
 		}
 	})
@@ -60,7 +60,7 @@ func TestCommandSetBoolean(t *testing.T) {
 		sendKeys(tm, ":", "s", "e", "t", " ", "n", "u", "!", "enter")
 
 		m := getFinalModel(t, tm)
-		if !m.Settings().Number {
+		if !m.ActiveWindow().Options.Number {
 			t.Error("expected Number to be true after double toggle")
 		}
 	})
@@ -73,7 +73,7 @@ func TestCommandSetBoolean(t *testing.T) {
 		sendKeys(tm, ":", "s", "e", "t", " ", "n", "o", "r", "n", "u", "enter")
 
 		m := getFinalModel(t, tm)
-		if m.Settings().RelativeNumber {
+		if m.ActiveWindow().Options.RelativeNumber {
 			t.Error("expected RelativeNumber to be false after :set nornu")
 		}
 	})
@@ -87,7 +87,7 @@ func TestCommandSetBoolean(t *testing.T) {
 		sendKeys(tm, ":", "s", "e", "t", " ", "r", "n", "u", "enter")
 
 		m := getFinalModel(t, tm)
-		if !m.Settings().RelativeNumber {
+		if !m.ActiveWindow().Options.RelativeNumber {
 			t.Error("expected RelativeNumber to be true after :set rnu")
 		}
 	})
@@ -95,7 +95,7 @@ func TestCommandSetBoolean(t *testing.T) {
 
 func TestCommandSetInteger(t *testing.T) {
 	t.Run("':set tabstop=4' sets tab size", func(t *testing.T) {
-		// Default TabSize=2
+		// Default TabStop=2
 		lines := []string{"hello"}
 		tm := newTestModelWithLines(t, lines)
 
@@ -103,7 +103,7 @@ func TestCommandSetInteger(t *testing.T) {
 
 		m := getFinalModel(t, tm)
 		if m.Settings().TabStop != 4 {
-			t.Errorf("TabSize = %d, want 4", m.Settings().TabStop)
+			t.Errorf("TabStop = %d, want 4", m.Settings().TabStop)
 		}
 	})
 
@@ -115,7 +115,7 @@ func TestCommandSetInteger(t *testing.T) {
 
 		m := getFinalModel(t, tm)
 		if m.Settings().TabStop != 8 {
-			t.Errorf("TabSize = %d, want 8", m.Settings().TabStop)
+			t.Errorf("TabStop = %d, want 8", m.Settings().TabStop)
 		}
 	})
 
@@ -127,8 +127,8 @@ func TestCommandSetInteger(t *testing.T) {
 		sendKeys(tm, ":", "s", "e", "t", " ", "s", "c", "r", "o", "l", "l", "o", "f", "f", "=", "5", "enter")
 
 		m := getFinalModel(t, tm)
-		if m.Settings().ScrollOff != 5 {
-			t.Errorf("ScrollOff = %d, want 5", m.Settings().ScrollOff)
+		if m.ActiveWindow().Options.ScrollOff != 5 {
+			t.Errorf("ScrollOff = %d, want 5", m.ActiveWindow().Options.ScrollOff)
 		}
 	})
 
@@ -139,8 +139,8 @@ func TestCommandSetInteger(t *testing.T) {
 		sendKeys(tm, ":", "s", "e", "t", " ", "s", "o", "=", "1", "0", "enter")
 
 		m := getFinalModel(t, tm)
-		if m.Settings().ScrollOff != 10 {
-			t.Errorf("ScrollOff = %d, want 10", m.Settings().ScrollOff)
+		if m.ActiveWindow().Options.ScrollOff != 10 {
+			t.Errorf("ScrollOff = %d, want 10", m.ActiveWindow().Options.ScrollOff)
 		}
 	})
 }