Big format update from lsp/gopls via LazyVim

Looks like it's making the following changes:
- Remove some line breaks, e.g before a func ending `}`
  or before an `if err != nil {` line.
- Add some line breaks, e.g. before an object ending `}`
- Replace `var foo =` with `foo :=`.
- Group some consecutive var declarations with `var(...)`
- Group some consecutive type declarations with `type(...)`
- Remove some redundant type declarations, e.g. `[]foo{{...}}`
  not `[]foo{foo{...}}`

To make the change I did something like the following:
  nvim `git ls-files | grep \.go$`
Then in the editor: `qq:w^M:n^Mq` and `200@q`

I'm not sure how to automate this.

acceptance/cli/cli.go

@@ -261,7 +261,6 @@ func setupSigs(ctx context.Context, vars map[string]string, environment []string
 		if err := setVar(n, v); err != nil {
 			return environment, vars, err
 		}
-
 	}
 
 	return environment, vars, nil

acceptance/coverage/coverage.go

@@ -219,7 +219,6 @@ func parseMainGoFile(fset *token.FileSet, filePath string) (*ast.File, error) {
 // heurestics for resolving conflicts. Conflicts will have to be solved by a
 // human.
 func mergeASTTrees(fset *token.FileSet, t1 *ast.File, t2 *ast.File) (*bytes.Buffer, error) {
-
 	// Merge the imports from both files
 	ast.Inspect(t1, func(n ast.Node) bool {
 		switch x := n.(type) {
@@ -241,7 +240,6 @@ func mergeASTTrees(fset *token.FileSet, t1 *ast.File, t2 *ast.File) (*bytes.Buff
 			}
 		}
 		return true
-
 	})
 
 	// Merge the declarations from t2 into t1

acceptance/kubernetes/kind/image.go

@@ -54,7 +54,6 @@ func (k *kindCluster) buildCliImage(ctx context.Context) error {
 // only the task of a particular version. The image reference to the ec-cli
 // image is replaced with the image reference from buildCliImage.
 func (k *kindCluster) buildTaskBundleImage(ctx context.Context) error {
-
 	taskBundles := make(map[string][]string)
 
 	basePath := "tasks/"

acceptance/kubernetes/kind/kubernetes.go

@@ -81,7 +81,6 @@ func (k *kindCluster) createPolicyObject(ctx context.Context, specification stri
 		},
 		Spec: policySpec,
 	}, nil
-
 }
 
 // createPolicy creates the EnterpriseContractPolicy custom resource in the test
@@ -127,7 +126,6 @@ func (k *kindCluster) createSnapshotObject(ctx context.Context, specification st
 		},
 		Spec: snapshotSpec,
 	}, nil
-
 }
 
 // createSnapshot creates the Snapshot custom resource in the test

acceptance/kubernetes/kubernetes.go

@@ -77,7 +77,7 @@ type startFunc func(context.Context) (context.Context, types.Cluster, error)
 // sure we don't start the cluster multiple times per Context is handled here
 func startAndSetupState(start startFunc) func(context.Context) (context.Context, error) {
 	return func(ctx context.Context) (context.Context, error) {
-		var c = &ClusterState{}
+		c := &ClusterState{}
 		ctx, err := testenv.SetupState(ctx, &c)
 		if err != nil {
 			return ctx, err
@@ -476,7 +476,6 @@ func AddStepsTo(sc *godog.ScenarioContext) {
 
 		return c.cluster.Stop(ctx)
 	})
-
 }
 
 func InitializeSuite(ctx context.Context, tsc *godog.TestSuiteContext) {

acceptance/kubernetes/stub/stub.go

@@ -32,8 +32,7 @@ import (
 	"github.com/enterprise-contract/ec-cli/acceptance/wiremock"
 )
 
-type stubCluster struct {
-}
+type stubCluster struct{}
 
 // stubApiserverRunning starts the stub apiserver using WireMock
 func Start(ctx context.Context) (context.Context, types.Cluster, error) {

acceptance/snaps/snaps.go

@@ -36,12 +36,14 @@ import (
 	"github.com/enterprise-contract/ec-cli/acceptance/testenv"
 )
 
-var timestampRegex = regexp.MustCompile(`\d\d[1-9]\d-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,9})?(?:Z|[+-]\d{2}:\d{2})?`) // generalized timestamp in not in 200x year
-var effectiveTimeRegex = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}?Z`)                                    // generalized timestamp for any year
-var logTimestampRegex = regexp.MustCompile(`^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2}`)                                     // timestamp as it apears in the logs
-var tempPathRegex = regexp.MustCompile(`\$\{TEMP\}([^: \\"]+)[: ]?`)                                                     // starts with "${TEMP}" and ends with something not in path, perhaps breaks on Windows due to the colon
-var randomBitsRegex = regexp.MustCompile(`([a-f0-9]+)$`)                                                                 // in general, we add random bits to paths as suffixes
-var unixTimestamp = regexp.MustCompile(`("| )(?:\d{10})(\\"|"|$)`)                                                       // Recent Unix timestamp in second resolution
+var (
+	timestampRegex     = regexp.MustCompile(`\d\d[1-9]\d-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,9})?(?:Z|[+-]\d{2}:\d{2})?`) // generalized timestamp in not in 200x year
+	effectiveTimeRegex = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}?Z`)                                        // generalized timestamp for any year
+	logTimestampRegex  = regexp.MustCompile(`^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2}`)                                        // timestamp as it apears in the logs
+	tempPathRegex      = regexp.MustCompile(`\$\{TEMP\}([^: \\"]+)[: ]?`)                                                    // starts with "${TEMP}" and ends with something not in path, perhaps breaks on Windows due to the colon
+	randomBitsRegex    = regexp.MustCompile(`([a-f0-9]+)$`)                                                                  // in general, we add random bits to paths as suffixes
+	unixTimestamp      = regexp.MustCompile(`("| )(?:\d{10})(\\"|"|$)`)                                                      // Recent Unix timestamp in second resolution
+)
 
 type errCapture struct {
 	t         *testing.T
@@ -142,7 +144,6 @@ func MatchSnapshot(ctx context.Context, qualifier, text string, vars map[string]
 	}
 
 	wd, err := os.Getwd()
-
 	if err != nil {
 		return err
 	}

acceptance/testenv/testenv.go

@@ -49,12 +49,16 @@ const (
 	persistedFile = ".persisted"
 )
 
-var loader = os.ReadFile
-var persister = os.WriteFile
+var (
+	loader    = os.ReadFile
+	persister = os.WriteFile
+)
 
-var version sync.Once
-var ecVersion = "undefined"
-var ecVersionErr error
+var (
+	version      sync.Once
+	ecVersion    = "undefined"
+	ecVersionErr error
+)
 
 // Persist persists the environment stored in context in a ".persisted" file as JSON
 func Persist(ctx context.Context) (bool, error) {

acceptance/wiremock/wiremock.go

@@ -50,11 +50,13 @@ const (
 // we re-expose functions from the wiremock package, add others
 // as needed
 
-var Get = wiremock.Get
-var Post = wiremock.Post
-var URLPathEqualTo = wiremock.URLPathEqualTo
-var MatchingJsonPath = wiremock.MatchingJsonPath
-var NewResponse = wiremock.NewResponse
+var (
+	Get              = wiremock.Get
+	Post             = wiremock.Post
+	URLPathEqualTo   = wiremock.URLPathEqualTo
+	MatchingJsonPath = wiremock.MatchingJsonPath
+	NewResponse      = wiremock.NewResponse
+)
 
 type client struct {
 	*wiremock.Client

cmd/inspect/inspect_policy_data.go

@@ -135,7 +135,6 @@ func inspectPolicyDataCmd() *cobra.Command {
 
 					return nil
 				})
-
 				if err != nil {
 					return err
 				}

cmd/root/root_cmd.go

@@ -29,11 +29,13 @@ import (
 
 var cancel context.CancelFunc
 
-var quiet bool = false
-var verbose bool = false
-var debug bool = false
-var trace bool = false
-var globalTimeout = 5 * time.Minute
+var (
+	quiet         bool = false
+	verbose       bool = false
+	debug         bool = false
+	trace         bool = false
+	globalTimeout      = 5 * time.Minute
+)
 
 func NewRootCmd() *cobra.Command {
 	rootCmd := &cobra.Command{

cmd/track/track_bundle.go

@@ -28,12 +28,14 @@ import (
 	"github.com/enterprise-contract/ec-cli/internal/utils"
 )
 
-type trackBundleFn func(context.Context, []string, []byte, bool, bool) ([]byte, error)
-type pullImageFn func(context.Context, string) ([]byte, error)
-type pushImageFn func(context.Context, string, []byte, string) error
+type (
+	trackBundleFn func(context.Context, []string, []byte, bool, bool) ([]byte, error)
+	pullImageFn   func(context.Context, string) ([]byte, error)
+	pushImageFn   func(context.Context, string, []byte, string) error
+)
 
 func trackBundleCmd(track trackBundleFn, pullImage pullImageFn, pushImage pushImageFn) *cobra.Command {
-	var params = struct {
+	params := struct {
 		bundles []string
 		gits    []string
 		input   string

cmd/validate/definition.go

@@ -35,7 +35,7 @@ import (
 type definitionValidationFn func(context.Context, string, []source.PolicySource, []string) (*output.Output, error)
 
 func validateDefinitionCmd(validate definitionValidationFn) *cobra.Command {
-	var data = struct {
+	data := struct {
 		filePaths  []string
 		policyURLs []string
 		dataURLs   []string
@@ -103,7 +103,6 @@ func validateDefinitionCmd(validate definitionValidationFn) *cobra.Command {
 						for i := range out.PolicyCheck {
 							out.PolicyCheck[i].Successes = []evaluator.Result{}
 						}
-
 					}
 					report.Add(*out)
 				}

cmd/validate/image.go

@@ -47,7 +47,7 @@ type imageValidationFunc func(context.Context, app.SnapshotComponent, policy.Pol
 var newConftestEvaluator = evaluator.NewConftestEvaluator
 
 func validateImageCmd(validate imageValidationFunc) *cobra.Command {
-	var data = struct {
+	data := struct {
 		certificateIdentity         string
 		certificateIdentityRegExp   string
 		certificateOIDCIssuer       string
@@ -222,10 +222,10 @@ func validateImageCmd(validate imageValidationFunc) *cobra.Command {
 			} else {
 				// inject extra variables into rule data per source
 				if len(data.extraRuleData) > 0 {
-					var policySpec = p.Spec()
-					var sources = policySpec.Sources
+					policySpec := p.Spec()
+					sources := policySpec.Sources
 					for i := range sources {
-						var source = sources[i]
+						source := sources[i]
 						var rule_data_raw []byte
 						unmarshaled := make(map[string]interface{})
 

cmd/validate/image_test.go

@@ -498,6 +498,7 @@ func Test_ValidateImageCommandKeyless(t *testing.T) {
 	assert.NoError(t, err)
 	assert.True(t, called)
 }
+
 func Test_ValidateImageCommandYAMLPolicyFile(t *testing.T) {
 	validate := func(_ context.Context, component app.SnapshotComponent, _ policy.Policy, _ []evaluator.Evaluator, _ bool) (*output.Output, error) {
 		return &output.Output{
@@ -546,7 +547,8 @@ func Test_ValidateImageCommandYAMLPolicyFile(t *testing.T) {
 		name   string
 		config string
 	}{
-		{name: "spec",
+		{
+			name: "spec",
 			config: `
 description: My custom enterprise contract policy configuration
 sources:
@@ -863,6 +865,7 @@ func Test_ValidateImageCommandEmptyPolicyFile(t *testing.T) {
 	err = cmd.Execute()
 	assert.EqualError(t, err, "1 error occurred:\n\t* file /policy.yaml is empty\n\n")
 }
+
 func Test_ValidateErrorCommand(t *testing.T) {
 	cases := []struct {
 		name     string

cmd/validate/input.go

@@ -39,7 +39,7 @@ import (
 type InputValidationFunc func(context.Context, string, policy.Policy, bool) (*output.Output, error)
 
 func validateInputCmd(validate InputValidationFunc) *cobra.Command {
-	var data = struct {
+	data := struct {
 		effectiveTime       string
 		filePaths           []string
 		info                bool
@@ -101,7 +101,6 @@ func validateInputCmd(validate InputValidationFunc) *cobra.Command {
 			return
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-
 			type result struct {
 				err         error
 				input       input.Input

cmd/validate/policy.go

@@ -30,7 +30,7 @@ import (
 type policyValidationFunc func(context.Context, string) error
 
 func ValidatePolicyCmd(validate policyValidationFunc) *cobra.Command {
-	var data = struct {
+	data := struct {
 		policyConfiguration string
 		output              []string
 		strict              bool
@@ -61,7 +61,6 @@ func ValidatePolicyCmd(validate policyValidationFunc) *cobra.Command {
 			data.policyConfiguration = policyConfiguration
 
 			return
-
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// Policy conforms to the schema.

internal/applicationsnapshot/input_test.go

@@ -188,7 +188,6 @@ func Test_DetermineInputSpec(t *testing.T) {
 }
 
 func TestReadSnapshotFile(t *testing.T) {
-
 	t.Run("Successful file read and unmarshal", func(t *testing.T) {
 		snapshotSpec := app.SnapshotSpec{
 			Components: []app.SnapshotComponent{
@@ -234,7 +233,6 @@ func TestReadSnapshotFile(t *testing.T) {
 		expected := fmt.Errorf("unable to parse Snapshot specification from %s: %w", spec, wrapped)
 		assert.Error(t, err, expected)
 	})
-
 }
 
 func TestExpandImageIndex(t *testing.T) {

internal/applicationsnapshot/junit_test.go

@@ -45,7 +45,6 @@ func TestMapResults(t *testing.T) {
 			{Name: "2"},
 		},
 	}, s)
-
 }
 
 func TestAsTestCase(t *testing.T) {

internal/applicationsnapshot/report_test.go

@@ -255,7 +255,6 @@ func Test_GenerateMarkdownSummary(t *testing.T) {
 
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-
 			ctx := context.Background()
 			report, err := NewReport(c.snapshot, c.components, createTestPolicy(t, ctx), nil, nil)
 			assert.NoError(t, err)
@@ -509,7 +508,6 @@ func Test_ReportSummary(t *testing.T) {
 			assert.Equal(t, tc.want, report.toSummary())
 		})
 	}
-
 }
 
 func Test_ReportAppstudio(t *testing.T) {

internal/attestation/attestation_test.go

@@ -36,7 +36,6 @@ import (
 // internal/attestation/slsa_provenance_02_test.go
 
 func TestProvenanceFromSignature(t *testing.T) {
-
 	sig1 := `{"keyid": "key-id-1", "sig": "sig-1"}`
 
 	payloadJson1 := `{
@@ -107,7 +106,7 @@ func TestProvenanceFromSignature(t *testing.T) {
 				l.On("Chain").Return(signature.ParseSigstoreChainCert(), nil)
 			},
 			data: payloadJson2, // String payload remains as a string
-			//data: payloadJson1, // String payload is marshaled
+			// data: payloadJson1, // String payload is marshaled
 		},
 	}
 

internal/definition/report_test.go

@@ -40,7 +40,7 @@ func TestReport(t *testing.T) {
 			name: "success",
 			output: []output.Output{
 				{PolicyCheck: []evaluator.Outcome{
-					evaluator.Outcome{FileName: "/path/to/pipeline.json"},
+					{FileName: "/path/to/pipeline.json"},
 				}},
 			},
 			expect: `{"definitions": [{
@@ -58,7 +58,7 @@ func TestReport(t *testing.T) {
 			output: []output.Output{
 				{
 					PolicyCheck: []evaluator.Outcome{
-						evaluator.Outcome{
+						{
 							FileName: "/path/to/pipeline.json",
 							Warnings: []evaluator.Result{
 								{Message: "running low in spam"},
@@ -83,7 +83,7 @@ func TestReport(t *testing.T) {
 			output: []output.Output{
 				{
 					PolicyCheck: []evaluator.Outcome{
-						evaluator.Outcome{
+						{
 							FileName: "/path/to/pipeline.json",
 							Failures: []evaluator.Result{
 								{Message: "out of spam!"},
@@ -108,7 +108,7 @@ func TestReport(t *testing.T) {
 			output: []output.Output{
 				{
 					PolicyCheck: []evaluator.Outcome{
-						evaluator.Outcome{
+						{
 							FileName: "/path/to/pipeline.json",
 							Successes: []evaluator.Result{
 								{Message: "Nice"},

internal/definition/validate_test.go

@@ -35,8 +35,10 @@ import (
 	"github.com/enterprise-contract/ec-cli/internal/utils"
 )
 
-type mockEvaluator struct{}
-type badMockEvaluator struct{}
+type (
+	mockEvaluator    struct{}
+	badMockEvaluator struct{}
+)
 
 func (e mockEvaluator) Evaluate(ctx context.Context, inputs []string) ([]evaluator.Outcome, evaluator.Data, error) {
 	return []evaluator.Outcome{}, nil, nil