all: fix lint suggestions

Signed-off-by: Koichi Shiraishi <[email protected]>

Author: zchee

base_json.go

@@ -66,6 +66,7 @@ func (v *ProgressToken) MarshalJSON() ([]byte, error) {
 	if v.name != "" {
 		return json.Marshal(v.name)
 	}
+
 	return json.Marshal(v.number)
 }
 
@@ -75,5 +76,6 @@ func (v *ProgressToken) UnmarshalJSON(data []byte) error {
 	if err := json.Unmarshal(data, &v.number); err == nil {
 		return nil
 	}
+
 	return json.Unmarshal(data, &v.name)
 }

basic_gojay.go

@@ -646,6 +646,7 @@ var (
 // MarshalJSONObject implements gojay.MarshalerJSONObject.
 func (v TextEditsMap) MarshalJSONObject(enc *gojay.Encoder) {
 	for key, value := range v {
+		value := value
 		enc.ArrayKeyOmitEmpty(string(key), (*TextEdits)(&value))
 	}
 }
@@ -710,6 +711,7 @@ var (
 // MarshalJSONObject implements gojay.MarshalerJSONObject.
 func (v ChangeAnnotationsMap) MarshalJSONObject(enc *gojay.Encoder) {
 	for key, value := range v {
+		value := value
 		enc.ObjectKeyOmitEmpty(string(key), &value)
 	}
 }

basic_test.go

@@ -2414,6 +2414,8 @@ func testTextDocumentItem(t *testing.T, marshal marshalFunc, unmarshal unmarshal
 }
 
 func TestToLanguageIdentifier(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name string
 		ft   string

client.go

@@ -26,13 +26,15 @@ func ClientHandler(client Client, handler jsonrpc2.Handler) jsonrpc2.Handler {
 	h := func(ctx context.Context, reply jsonrpc2.Replier, req jsonrpc2.Request) error {
 		if ctx.Err() != nil {
 			xctx := xcontext.Detach(ctx)
+
 			return reply(xctx, nil, ErrRequestCancelled)
 		}
 
 		handled, err := clientDispatch(ctx, client, reply, req)
 		if handled || err != nil {
 			return err
 		}
+
 		return handler(ctx, reply, req)
 	}
 
@@ -169,6 +171,7 @@ func (c *client) ShowMessageRequest(ctx context.Context, params *ShowMessageRequ
 	if err := Call(ctx, c.Conn, MethodWindowShowMessageRequest, params, &result); err != nil {
 		return nil, err
 	}
+
 	return result, nil
 }
 
@@ -209,6 +212,7 @@ func (c *client) ApplyEdit(ctx context.Context, params *ApplyWorkspaceEditParams
 	if err := Call(ctx, c.Conn, MethodWorkspaceApplyEdit, params, &result); err != nil {
 		return false, err
 	}
+
 	return result, nil
 }
 
@@ -225,6 +229,7 @@ func (c *client) Configuration(ctx context.Context, params *ConfigurationParams)
 	if err := Call(ctx, c.Conn, MethodWorkspaceConfiguration, params, &result); err != nil {
 		return nil, err
 	}
+
 	return result, nil
 }
 
@@ -240,5 +245,6 @@ func (c *client) WorkspaceFolders(ctx context.Context) (result []WorkspaceFolder
 	if err := Call(ctx, c.Conn, MethodWorkspaceWorkspaceFolders, nil, &result); err != nil {
 		return nil, err
 	}
+
 	return result, nil
 }

client_gojay.go

@@ -19,7 +19,7 @@ import (
 )
 
 // clientDispatch implements jsonrpc2.Conn.
-//nolint:funlen,gocognit
+//nolint:funlen
 func clientDispatch(ctx context.Context, client Client, reply jsonrpc2.Replier, req jsonrpc2.Request) (handled bool, err error) {
 	if ctx.Err() != nil {
 		return true, reply(ctx, nil, ErrRequestCancelled)

client_json.go

@@ -18,7 +18,7 @@ import (
 )
 
 // clientDispatch implements jsonrpc2.Handler.
-//nolint:gocognit,funlen
+//nolint:funlen,cyclop
 func clientDispatch(ctx context.Context, client Client, reply jsonrpc2.Replier, req jsonrpc2.Request) (handled bool, err error) {
 	if ctx.Err() != nil {
 		return true, reply(ctx, nil, ErrRequestCancelled)

deprecated.go

@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2021 The Go Language Server Authors
+// SPDX-License-Identifier: BSD-3-Clause
+
 package protocol
 
 // ClientCapabilitiesShowDocument alias of ShowDocumentClientCapabilities.

diagnostics_test.go

@@ -312,6 +312,8 @@ func testDiagnostic(t *testing.T, marshal marshalFunc, unmarshal unmarshalFunc)
 }
 
 func TestDiagnosticSeverity_String(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name string
 		d    DiagnosticSeverity
@@ -356,6 +358,8 @@ func TestDiagnosticSeverity_String(t *testing.T) {
 }
 
 func TestDiagnosticTag_String(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name string
 		d    DiagnosticTag
@@ -443,8 +447,7 @@ func testDiagnosticRelatedInformation(t *testing.T, marshal marshalFunc, unmarsh
 
 				got, err := marshal(&tt.field)
 				if (err != nil) != tt.wantMarshalErr {
-					t.Error(err)
-					return
+					t.Fatal(err)
 				}
 
 				if diff := cmp.Diff(tt.want, string(got)); (diff != "") != tt.wantErr {

general_gojay_test.go

@@ -1,6 +1,5 @@
-// Copyright 2019 The Go Language Server Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
+// SPDX-FileCopyrightText: Copyright 2019 The Go Language Server Authors
+// SPDX-License-Identifier: BSD-3-Clause
 
 //go:build gojay
 // +build gojay

general_test.go

@@ -3416,6 +3416,8 @@ func testDocumentColorRegistrationOptions(t *testing.T, marshal marshalFunc, unm
 }
 
 func TestPrepareSupportDefaultBehavior_String(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name string
 		k    PrepareSupportDefaultBehavior
@@ -4215,6 +4217,8 @@ func testShowDocumentResult(t *testing.T, marshal marshalFunc, unmarshal unmarsh
 }
 
 func TestTextDocumentSyncKind_String(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name string
 		k    TextDocumentSyncKind