fix lint

Author: starius

cmd/loop/main.go

@@ -209,9 +209,8 @@ func defaultPathText(value string, homeDir func() (string, error)) string {
 	}
 
 	prefix := cleanHome + string(filepath.Separator)
-	if strings.HasPrefix(cleanValue, prefix) {
-		return "~" + string(filepath.Separator) +
-			strings.TrimPrefix(cleanValue, prefix)
+	if suffix, ok := strings.CutPrefix(cleanValue, prefix); ok {
+		return "~" + string(filepath.Separator) + suffix
 	}
 
 	return value
@@ -377,7 +376,7 @@ func maybeNormalizeJSON(raw []byte) []byte {
 		return raw
 	}
 
-	var parsed interface{}
+	var parsed any
 	if err := json.Unmarshal(raw, &parsed); err != nil {
 		return raw
 	}

cmd/loop/session_fixture_update_test.go

@@ -205,7 +205,6 @@ func rewriteTextEvents(events []sessionEvent, kind, recorded, actual string,
 	}
 
 	if normalizedEqual && textEventsMatch(events, kind, replacement) {
-
 		return events, changed, nil
 	}
 
@@ -221,6 +220,7 @@ func rewriteTextEvents(events []sessionEvent, kind, recorded, actual string,
 // stream.
 func canonicalTextEvents(events []sessionEvent, kind string, chunks []string,
 	combined string) ([]sessionEvent, error) {
+
 	indices := textEventIndices(events, kind)
 	replacement := replacementTextChunks(chunks, combined)
 	if len(indices) != len(replacement) {
@@ -253,6 +253,7 @@ func replaceTextEvents(events []sessionEvent, kind string,
 // event stream.
 func replaceTextEventsWithCanonical(events []sessionEvent, kind string,
 	indices []int, replacements []sessionEvent) ([]sessionEvent, error) {
+
 	if len(indices) == len(replacements) {
 		updated := append([]sessionEvent(nil), events...)
 		for i, idx := range indices {
@@ -458,15 +459,10 @@ func cloneOptionalString(value *string) *string {
 
 // TestUpdateRecordedSessionsEnabled verifies update-mode env parsing.
 func TestUpdateRecordedSessionsEnabled(t *testing.T) {
-	prev, hadPrev := os.LookupEnv(updateRecordedSessionsEnvVar)
-	if hadPrev {
-		defer func() {
-			_ = os.Setenv(updateRecordedSessionsEnvVar, prev)
-		}()
+	if current, ok := os.LookupEnv(updateRecordedSessionsEnvVar); ok {
+		t.Setenv(updateRecordedSessionsEnvVar, current)
 	} else {
-		defer func() {
-			_ = os.Unsetenv(updateRecordedSessionsEnvVar)
-		}()
+		t.Setenv(updateRecordedSessionsEnvVar, "")
 	}
 
 	_ = os.Unsetenv(updateRecordedSessionsEnvVar)
@@ -475,12 +471,12 @@ func TestUpdateRecordedSessionsEnabled(t *testing.T) {
 	require.NoError(t, err)
 	require.False(t, enabled)
 
-	require.NoError(t, os.Setenv(updateRecordedSessionsEnvVar, "true"))
+	t.Setenv(updateRecordedSessionsEnvVar, "true")
 	enabled, err = updateRecordedSessionsEnabled()
 	require.NoError(t, err)
 	require.True(t, enabled)
 
-	require.NoError(t, os.Setenv(updateRecordedSessionsEnvVar, "invalid"))
+	t.Setenv(updateRecordedSessionsEnvVar, "invalid")
 	enabled, err = updateRecordedSessionsEnabled()
 	require.False(t, enabled)
 	require.EqualError(t, err,

cmd/loop/session_recorder.go

@@ -236,7 +236,7 @@ func (r *sessionRecorder) resolveFilePath() (string, string, error) {
 }
 
 // logEvent records a new event with the elapsed timestamp.
-func (r *sessionRecorder) logEvent(kind string, payload interface{}) {
+func (r *sessionRecorder) logEvent(kind string, payload any) {
 	data, err := json.Marshal(payload)
 	if err != nil {
 		return
@@ -428,7 +428,7 @@ func (r *sessionRecorder) Dial(cmd *cli.Command) (daemonConn, func(), error) {
 
 // UnaryInterceptor captures unary RPCs for session playback.
 func (r *sessionRecorder) UnaryInterceptor() grpc.UnaryClientInterceptor {
-	return func(ctx context.Context, method string, req, reply interface{},
+	return func(ctx context.Context, method string, req, reply any,
 		cc *grpc.ClientConn, invoker grpc.UnaryInvoker,
 		opts ...grpc.CallOption) error {
 
@@ -477,7 +477,7 @@ type recordingClientStream struct {
 }
 
 // SendMsg records the outgoing stream message.
-func (s *recordingClientStream) SendMsg(m interface{}) error {
+func (s *recordingClientStream) SendMsg(m any) error {
 	s.recorder.logGRPCMessage(s.method, "send", m, nil)
 	err := s.ClientStream.SendMsg(m)
 	if err != nil {
@@ -488,7 +488,7 @@ func (s *recordingClientStream) SendMsg(m interface{}) error {
 }
 
 // RecvMsg records the incoming stream message.
-func (s *recordingClientStream) RecvMsg(m interface{}) error {
+func (s *recordingClientStream) RecvMsg(m any) error {
 	err := s.ClientStream.RecvMsg(m)
 	if err != nil {
 		s.recorder.logGRPCMessage(s.method, "error", nil, err)
@@ -502,7 +502,7 @@ func (s *recordingClientStream) RecvMsg(m interface{}) error {
 }
 
 // logGRPCMessage captures gRPC request/response data in the event stream.
-func (r *sessionRecorder) logGRPCMessage(method, event string, msg interface{},
+func (r *sessionRecorder) logGRPCMessage(method, event string, msg any,
 	receptionErr error) {
 
 	payload := grpcPayload{Method: method, Event: event}

cmd/loop/session_replay_test.go

@@ -13,6 +13,7 @@ import (
 	"reflect"
 	"regexp"
 	"runtime"
+	"slices"
 	"strings"
 	"sync"
 	"testing"
@@ -537,13 +538,7 @@ func compareJSONWithContext(method, event string, idx int, actual []byte,
 
 // contains returns true when v is in the slice.
 func contains(values []string, v string) bool {
-	for _, value := range values {
-		if value == v {
-			return true
-		}
-	}
-
-	return false
+	return slices.Contains(values, v)
 }
 
 // TestRecordedSessions replays all recorded sessions and compares output.
@@ -1208,10 +1203,8 @@ func findFlagByName(t *testing.T, flags []cli.Flag, name string) cli.Flag {
 		if flag == nil {
 			continue
 		}
-		for _, candidate := range flag.Names() {
-			if candidate == name {
-				return flag
-			}
+		if slices.Contains(flag.Names(), name) {
+			return flag
 		}
 	}
 	t.Fatalf("flag %q not found", name)

cmd/loop/session_stdio.go

@@ -42,16 +42,14 @@ func hookOutput(setDest func(*os.File), orig *os.File, forward io.Writer,
 	setDest(w)
 
 	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		defer r.Close()
 
 		writer := composeWriter(forward, onChunk)
 		// Restoring the original descriptor closes the pipe from the other
 		// side, so io.Copy can fail as part of normal teardown.
 		_, _ = io.Copy(writer, r)
-	}()
+	})
 
 	return func() error {
 		setDest(orig)
@@ -86,15 +84,13 @@ func hookStdin(orig *os.File, source io.Reader,
 	os.Stdin = r
 
 	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		defer w.Close()
 
 		// Closing the pipe during hook restoration can terminate the copy
 		// loop with an expected error.
 		_, _ = io.Copy(w, source)
-	}()
+	})
 
 	return func() error {
 		os.Stdin = orig