Merge pull request #1643 from simonbaird/nvim-lsp-gopls-delint

Big format update from lsp/gopls via LazyVim

Author: simonbaird

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
 				}