Coalesce struct literals with go1.27's embedlit rewrite

go fix's embedlit analyzer folds field assignments into a preceding
struct literal, but only for the contiguous run right after it stops
at the first statement it can't safely fold (a self-referencing
assignment or a method call). Applied that to twin/screen.go, and in
scrollPosition_test.go finished the rest by hand: everything except
filteringReader could still move into the literal, since only that
one field depends on the pager variable it's still being constructed
into (&pager.filter, pager.readers).

🤖 Committed by Claude (Sonnet 5)

Author: walles

internal/scrollPosition_test.go

@@ -15,24 +15,27 @@ const screenHeight = 60
 
 // Repro for: https://github.com/walles/moor/issues/166
 func testCanonicalize1000(t *testing.T, withStatusBar bool, currentStartLine linemetadata.Index, lastVisibleLine linemetadata.Index) {
-	pager := Pager{}
-	pager.screen = twin.NewFakeScreen(100, screenHeight)
-	pager.readers = []*reader.ReaderImpl{reader.NewFromTextForTesting("test", strings.Repeat("a\n", 2000))}
+	pager := Pager{
+		screen: twin.NewFakeScreen(100, screenHeight),
+		readers: []*reader.ReaderImpl{
+			reader.NewFromTextForTesting("test", strings.Repeat("a\n", 2000)),
+		},
+		ShowLineNumbers: true,
+		showLineNumbers: true,
+		ShowStatusBar:   withStatusBar,
+		scrollPosition: scrollPosition{
+			internalDontTouch: scrollPositionInternal{
+				lineIndex:      &currentStartLine,
+				delta:          0,
+				name:           "findFirstHit",
+				canonicalizing: false,
+			},
+		},
+	}
 	pager.filteringReader = FilteringReader{
 		BackingReader: pager.readers[pager.currentReader],
 		Filter:        &pager.filter,
 	}
-	pager.ShowLineNumbers = true
-	pager.showLineNumbers = true
-	pager.ShowStatusBar = withStatusBar
-	pager.scrollPosition = scrollPosition{
-		internalDontTouch: scrollPositionInternal{
-			lineIndex:      &currentStartLine,
-			delta:          0,
-			name:           "findFirstHit",
-			canonicalizing: false,
-		},
-	}
 
 	lastVisiblePosition := scrollPosition{
 		internalDontTouch: scrollPositionInternal{
@@ -71,23 +74,23 @@ func TestCanonicalize1000WithoutStatusBar(t *testing.T) {
 // lines of input.
 func tryScrollAmount(t *testing.T, scrollFrom linemetadata.Index, scrollDistance linemetadata.ScreenLines) {
 	// Create 1492 lines of single-char content
-	pager := Pager{}
-	pager.screen = twin.NewFakeScreen(80, screenHeight)
-	pager.readers = []*reader.ReaderImpl{reader.NewFromTextForTesting("test", strings.Repeat("x\n", 1492))}
+	pager := Pager{
+		screen:          twin.NewFakeScreen(80, screenHeight),
+		readers:         []*reader.ReaderImpl{reader.NewFromTextForTesting("test", strings.Repeat("x\n", 1492))},
+		ShowLineNumbers: true,
+		showLineNumbers: true,
+		scrollPosition: scrollPosition{
+			internalDontTouch: scrollPositionInternal{
+				name:      "tryScrollAmount",
+				lineIndex: &scrollFrom,
+				delta:     scrollDistance,
+			},
+		},
+	}
 	pager.filteringReader = FilteringReader{
 		BackingReader: pager.readers[pager.currentReader],
 		Filter:        &pager.filter,
 	}
-	pager.ShowLineNumbers = true
-	pager.showLineNumbers = true
-
-	pager.scrollPosition = scrollPosition{
-		internalDontTouch: scrollPositionInternal{
-			name:      "tryScrollAmount",
-			lineIndex: &scrollFrom,
-			delta:     scrollDistance,
-		},
-	}
 
 	// Trigger rendering (and canonicalization). If the prefix is miscomputed
 	// this would previously panic inside createLinePrefix().

twin/screen.go

@@ -180,20 +180,20 @@ func NewScreenWithMouseModeAndColorCount(mouseMode MouseMode, terminalColorCount
 	screen := UnixScreen{
 		terminalColorCount: terminalColorCount,
 		mouseMode:          mouseMode,
-	}
 
-	// The number "80" here is from manual testing on my MacBook:
-	//
-	// First, start "./moor.sh sample-files/large-git-log-patch.txt".
-	//
-	// Then do a two finger flick initiating a momentum based scroll-up.
-	//
-	// Now, if you get "Events buffer full" warnings, the buffer is too small.
-	//
-	// By this definition, 40 was too small, and 80 was OK.
-	//
-	// Bumped to 160 because of: https://github.com/walles/moor/issues/164
-	screen.events = make(chan Event, 160)
+		// The number "80" here is from manual testing on my MacBook:
+		//
+		// First, start "./moor.sh sample-files/large-git-log-patch.txt".
+		//
+		// Then do a two finger flick initiating a momentum based scroll-up.
+		//
+		// Now, if you get "Events buffer full" warnings, the buffer is too small.
+		//
+		// By this definition, 40 was too small, and 80 was OK.
+		//
+		// Bumped to 160 because of: https://github.com/walles/moor/issues/164
+		events: make(chan Event, 160),
+	}
 
 	screen.setupSigwinchNotification()
 	err := screen.setupTtyInTtyOut()