Merge branch 'johan/back-to-go-1.25'

Fixes: #459

Author: walles

cmd/moor/alt-screen_test.go

@@ -10,6 +10,8 @@ import (
 	"testing"
 
 	"gotest.tools/v3/assert"
+
+	"github.com/walles/moor/v2/internal/ptr"
 )
 
 // Paging input that doesn't fit on one screen happens on the alternate screen,
@@ -19,7 +21,7 @@ func TestLongInputUsesAlternateScreen(t *testing.T) {
 		t.Run(fmt.Sprintf("fromPipe=%t", fromPipe), func(t *testing.T) {
 			options := moorOptions{answerBackgroundQuery: true}
 			if fromPipe {
-				options.stdin = new(textLines(100))
+				options.stdin = ptr.To(textLines(100))
 			} else {
 				options.args = []string{createTextFile(t, 100)}
 			}
@@ -118,7 +120,7 @@ func TestQuitIfOneScreenNeverEntersAlternateScreen(t *testing.T) {
 					args:                  []string{"--quit-if-one-screen"},
 				}
 				if fromPipe {
-					options.stdin = new("hello world 1\nhello world 2\n")
+					options.stdin = ptr.To("hello world 1\nhello world 2\n")
 				} else {
 					options.args = append(options.args, createTextFile(t, 2))
 				}
@@ -168,7 +170,7 @@ func TestQuitIfOneScreenNeverEntersAlternateScreenWhenHighlighted(t *testing.T)
 					args:                  []string{"--quit-if-one-screen"},
 				}
 				if fromPipe {
-					options.stdin = new(jsonLines(lineCount, marker))
+					options.stdin = ptr.To(jsonLines(lineCount, marker))
 				} else {
 					options.args = append(options.args, createSourceFile(t, lineCount, marker))
 				}

cmd/moor/moor.go

@@ -21,12 +21,14 @@ import (
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/term"
 
+	"github.com/walles/twin"
+
 	"github.com/walles/moor/v2/internal"
 	"github.com/walles/moor/v2/internal/linemetadata"
+	"github.com/walles/moor/v2/internal/ptr"
 	"github.com/walles/moor/v2/internal/reader"
 	"github.com/walles/moor/v2/internal/textstyles"
 	"github.com/walles/moor/v2/internal/util"
-	"github.com/walles/moor/v2/twin"
 )
 
 var versionString = ""
@@ -357,7 +359,7 @@ func getVersion() string {
 // Can return a nil pager on --help or --version, or if pumping to stdout.
 func pagerFromArgs(
 	args []string,
-	newScreen func(mouseMode twin.MouseMode, terminalColorCount twin.ColorCount) (twin.Screen, error),
+	newScreen func(options twin.Options) (twin.Screen, error),
 	stdinIsRedirected bool,
 	stdoutIsRedirected bool,
 ) (
@@ -579,7 +581,11 @@ func pagerFromArgs(
 
 	// We got the first byte, this means sudo is done (if it was used) and we
 	// can set up the UI.
-	screen, err := newScreen(*mouseMode, *terminalColorsCount)
+	screen, err := newScreen(twin.Options{
+		MouseMode:          *mouseMode,
+		TerminalColorCount: *terminalColorsCount,
+		Logger:             &util.TwinLogger{},
+	})
 	if err != nil {
 		// Ref: https://github.com/walles/moor/issues/149
 		log.Info("Failed to set up screen for paging, pumping to stdout instead: ", err)
@@ -628,7 +634,7 @@ func pagerFromArgs(
 
 	pager.TargetLine = targetLine
 	if *follow && pager.TargetLine == nil {
-		pager.TargetLine = new(linemetadata.IndexMax())
+		pager.TargetLine = ptr.To(linemetadata.IndexMax())
 	}
 
 	return pager, screen, style, &formatter, logsRequested, nil
@@ -638,7 +644,6 @@ func main() {
 	var loglines internal.LogWriter
 	logsRequested := false
 	log.SetOutput(&loglines)
-	twin.SetLogger(&util.TwinLogger{})
 	russiaNotSupported()
 
 	defer func() {
@@ -673,7 +678,7 @@ func main() {
 
 	pager, screen, style, formatter, _logsRequested, err := pagerFromArgs(
 		os.Args,
-		twin.NewScreenWithMouseModeAndColorCount,
+		twin.NewScreen,
 		stdinIsRedirected,
 		stdoutIsRedirected,
 	)

cmd/moor/moor_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/walles/moor/v2/internal/textstyles"
-	"github.com/walles/moor/v2/twin"
+	"github.com/walles/twin"
 	"gotest.tools/v3/assert"
 )
 
@@ -31,7 +31,7 @@ func TestUnescapeManPn(t *testing.T) {
 func TestPageOneInputFile(t *testing.T) {
 	pager, screen, _, formatter, _, err := pagerFromArgs(
 		[]string{"", "moor_test.go"},
-		func(_ twin.MouseMode, _ twin.ColorCount) (twin.Screen, error) {
+		func(_ twin.Options) (twin.Screen, error) {
 			return twin.NewFakeScreen(80, 24), nil
 		},
 		false, // stdin is redirected

cmd/moor/plusparser.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/walles/moor/v2/internal/linemetadata"
+	"github.com/walles/moor/v2/internal/ptr"
 )
 
 // Parses arguments starting with '+':
@@ -59,13 +60,13 @@ func parseLineNumber(withoutPlus string) *linemetadata.Index {
 		lineNumber = 1
 	}
 
-	return new(linemetadata.IndexFromOneBased(int(lineNumber)))
+	return ptr.To(linemetadata.IndexFromOneBased(int(lineNumber)))
 }
 
 func parseSearchPattern(withoutPlus string) *string {
 	if !strings.HasPrefix(withoutPlus, "/") {
 		return nil
 	}
 
-	return new(withoutPlus[1:])
+	return ptr.To(withoutPlus[1:])
 }

cmd/moor/usage.go

@@ -12,7 +12,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"github.com/walles/moor/v2/internal"
-	"github.com/walles/moor/v2/twin"
+	"github.com/walles/twin"
 )
 
 func renderLessTermcapEnvVar(envVarName string, description string, colors twin.ColorCount) string {

go.mod

@@ -1,6 +1,12 @@
 module github.com/walles/moor/v2
 
-go 1.27.0
+// Go version policy: No newer than the most recently end-of-lifed Go release,
+// so distro packagers building from source aren't forced onto a toolchain their
+// repos don't have yet.
+//
+// Once this reaches 1.26, the whole internal/ptr package can be replaced with
+// Go's builtin new(expr) instead.
+go 1.25.0
 
 require (
 	github.com/adrg/xdg v0.5.3
@@ -14,13 +20,13 @@ require (
 	github.com/rivo/uniseg v0.4.7
 	github.com/sirupsen/logrus v1.9.4
 	github.com/ulikunitz/xz v0.5.16
-	golang.org/x/sync v0.22.0
-	golang.org/x/sys v0.47.0
+	github.com/walles/twin v0.9.1
 	golang.org/x/term v0.45.0
 	gotest.tools/v3 v3.5.2
 )
 
 require (
 	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/go-enry/go-oniguruma v1.2.1 // indirect
+	golang.org/x/sys v0.47.0 // indirect
 )

go.sum

@@ -41,8 +41,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/ulikunitz/xz v0.5.16 h1:ld6NyySjx5lowVKwJvMRLnW5nxKX/xnpSiFYZ/Lxur0=
 github.com/ulikunitz/xz v0.5.16/go.mod h1:H9Rt/W6/Qj27PGauhQc6nfCDy7vHpzsOThBSaYDoEhw=
-golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
-golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+github.com/walles/twin v0.9.1 h1:FhokRh6EXTd8TwmrH6xf60czQ+J1T+6wL7xdGg3PGWU=
+github.com/walles/twin v0.9.1/go.mod h1:3iGyRE6bnLVsQuIPMyW2i1YXe6e9VDjGHcAGOHi/mcA=
 golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
 golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=

internal/detectManPage_test.go

@@ -6,7 +6,7 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	"github.com/walles/moor/v2/internal/reader"
-	"github.com/walles/moor/v2/twin"
+	"github.com/walles/twin"
 	"gotest.tools/v3/assert"
 )
 

internal/editor.go

@@ -10,7 +10,9 @@ import (
 	"strings"
 
 	log "github.com/sirupsen/logrus"
+
 	"github.com/walles/moor/v2/internal/linemetadata"
+	"github.com/walles/moor/v2/internal/ptr"
 	"github.com/walles/moor/v2/internal/reader"
 )
 
@@ -118,7 +120,7 @@ func middleVisibleLine(p *Pager) *linemetadata.Index {
 		return nil
 	}
 
-	return new(lines[len(lines)/2].inputLineIndex)
+	return ptr.To(lines[len(lines)/2].inputLineIndex)
 }
 
 // check if the editor can accept "+LINENUMBER" argument

internal/file-switching_test.go

@@ -4,10 +4,12 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/walles/twin"
+	"gotest.tools/v3/assert"
+
 	"github.com/walles/moor/v2/internal/linemetadata"
+	"github.com/walles/moor/v2/internal/ptr"
 	"github.com/walles/moor/v2/internal/reader"
-	"github.com/walles/moor/v2/twin"
-	"gotest.tools/v3/assert"
 )
 
 func TestIssue426SwitchingToSmallerFileClearsStaleScrollPosition(t *testing.T) {
@@ -27,7 +29,7 @@ func TestIssue426SwitchingToSmallerFileClearsStaleScrollPosition(t *testing.T) {
 	// moved to a shorter file, but the scroll position still points below it.
 	pager.scrollPosition = scrollPosition{
 		internalDontTouch: scrollPositionInternal{
-			lineIndex: new(linemetadata.IndexFromZeroBased(70)),
+			lineIndex: ptr.To(linemetadata.IndexFromZeroBased(70)),
 			delta:     0,
 			name:      "Issue 426 stale file switch",
 		},