From 7323fe8009900f40be4696f8ec344582f7de4d25 Mon Sep 17 00:00:00 2001
From: Valentin Maerten <maerten.valentin@gmail.com>
Date: Sun, 25 Jan 2026 20:45:46 +0100
Subject: [PATCH] fix: resolve lint issues after rebase

- Fix import order in setup.go (gci)
- Fix variable alignment in experiments.go (gofmt)
- Add nolint:paralleltest directive for TestScopedTaskfiles
---
 executor_test.go           | 4 +---
 experiments/experiments.go | 8 ++++----
 setup.go                   | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/executor_test.go b/executor_test.go
index e4e12564..ef4ab033 100644
--- a/executor_test.go
+++ b/executor_test.go
@@ -1181,10 +1181,8 @@ func TestIf(t *testing.T) {
 	}
 }
 
+//nolint:paralleltest // enableExperimentForTest modifies global state
 func TestScopedTaskfiles(t *testing.T) {
-	// NOTE: Don't use t.Parallel() here because enableExperimentForTest modifies
-	// global state that can affect other tests running in parallel.
-
 	// Legacy tests (without experiment) - vars should be merged globally
 	t.Run("legacy", func(t *testing.T) {
 		// Test with scoped taskfiles disabled (legacy) - vars should be merged globally
diff --git a/experiments/experiments.go b/experiments/experiments.go
index 0e0139d1..7b4e0a4c 100644
--- a/experiments/experiments.go
+++ b/experiments/experiments.go
@@ -16,10 +16,10 @@ const envPrefix = "TASK_X_"
 
 // Active experiments.
 var (
-	GentleForce      Experiment
-	RemoteTaskfiles  Experiment
-	EnvPrecedence    Experiment
-	ScopedTaskfiles  Experiment
+	GentleForce     Experiment
+	RemoteTaskfiles Experiment
+	EnvPrecedence   Experiment
+	ScopedTaskfiles Experiment
 )
 
 // Inactive experiments. These are experiments that cannot be enabled, but are
diff --git a/setup.go b/setup.go
index bf252fb7..de56cbe4 100644
--- a/setup.go
+++ b/setup.go
@@ -13,6 +13,7 @@ import (
 	"github.com/sajari/fuzzy"
 
 	"github.com/go-task/task/v3/errors"
+	"github.com/go-task/task/v3/experiments"
 	"github.com/go-task/task/v3/internal/env"
 	"github.com/go-task/task/v3/internal/execext"
 	"github.com/go-task/task/v3/internal/filepathext"
@@ -20,7 +21,6 @@ import (
 	"github.com/go-task/task/v3/internal/logger"
 	"github.com/go-task/task/v3/internal/output"
 	"github.com/go-task/task/v3/internal/version"
-	"github.com/go-task/task/v3/experiments"
 	"github.com/go-task/task/v3/taskfile"
 	"github.com/go-task/task/v3/taskfile/ast"
 )