all: fix linter suggestions

Author: zchee

errors.go

@@ -31,6 +31,7 @@ func (e *Error) Error() string {
 	if e == nil {
 		return ""
 	}
+
 	return e.Message
 }
 

handler.go

@@ -89,6 +89,7 @@ func (EmptyHandler) Deliver(ctx context.Context, r *Request, delivered bool) boo
 			return false
 		}
 	}
+
 	return true
 }
 

jsonrpc2.go

@@ -204,6 +204,7 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
 		if err := json.Unmarshal(*resp.Result, result); err != nil {
 			return fmt.Errorf("failed to unmarshalling result: %v", err)
 		}
+
 		return nil
 
 	case <-ctx.Done():
@@ -214,6 +215,7 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
 				canceled = true
 			}
 		}
+
 		return ctx.Err()
 	}
 }
@@ -258,6 +260,7 @@ func (c *Conn) Run(ctx context.Context) error {
 			for _, h := range c.handlers {
 				h.Error(ctx, errMsg)
 			}
+
 			continue
 		}
 

jsonrpc2_test.go

@@ -58,6 +58,7 @@ func (test *callTest) newResults() interface{} {
 		for _, v := range e {
 			r = append(r, reflect.New(reflect.TypeOf(v)).Interface())
 		}
+
 		return r
 	case nil:
 		return nil
@@ -81,6 +82,7 @@ func prepare(ctx context.Context, t *testing.T) (a, b *jsonrpc2.Conn) {
 	bR, aW := io.Pipe()
 	a = run(ctx, t, aR, aW)
 	b = run(ctx, t, bR, bW)
+
 	return a, b
 }
 
@@ -139,6 +141,7 @@ func (h handle) Deliver(ctx context.Context, r *jsonrpc2.Request, delivered bool
 	case "no_args":
 		if r.Params != nil {
 			r.Reply(ctx, nil, jsonrpc2.Errorf(jsonrpc2.InvalidParams, "Expected no params"))
+
 			return true
 		}
 		r.Reply(ctx, true, nil)
@@ -147,6 +150,7 @@ func (h handle) Deliver(ctx context.Context, r *jsonrpc2.Request, delivered bool
 		var v string
 		if err := json.Unmarshal(*r.Params, &v); err != nil {
 			r.Reply(ctx, nil, jsonrpc2.Errorf(jsonrpc2.ParseError, "%v", err.Error()))
+
 			return true
 		}
 		r.Reply(ctx, "got:"+v, nil)
@@ -155,6 +159,7 @@ func (h handle) Deliver(ctx context.Context, r *jsonrpc2.Request, delivered bool
 		var v int
 		if err := json.Unmarshal(*r.Params, &v); err != nil {
 			r.Reply(ctx, nil, jsonrpc2.Errorf(jsonrpc2.ParseError, "%v", err.Error()))
+
 			return true
 		}
 		r.Reply(ctx, fmt.Sprintf("got:%d", v), nil)
@@ -163,6 +168,7 @@ func (h handle) Deliver(ctx context.Context, r *jsonrpc2.Request, delivered bool
 		var v []string
 		if err := json.Unmarshal(*r.Params, &v); err != nil {
 			r.Reply(ctx, nil, jsonrpc2.Errorf(jsonrpc2.ParseError, "%v", err.Error()))
+
 			return true
 		}
 		r.Reply(ctx, path.Join(v...), nil)
@@ -193,6 +199,7 @@ func (h handle) Request(ctx context.Context, conn *jsonrpc2.Conn, direction json
 		ctx = context.WithValue(ctx, ctxMethodKey{}, r.Method)
 		ctx = context.WithValue(ctx, ctxTimeKey{}, time.Now())
 	}
+
 	return ctx
 }
 
@@ -202,6 +209,7 @@ func (h handle) Response(ctx context.Context, conn *jsonrpc2.Conn, direction jso
 		elapsed := time.Since(ctx.Value(ctxTimeKey{}).(time.Time))
 		h.logger.Info("Response", zap.String(method.(string), fmt.Sprintf("%v response in %v [%v] %s %v", direction, elapsed, r.ID, method, r.Result)))
 	}
+
 	return ctx
 }
 

stream_bench_test.go

@@ -2,13 +2,15 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package jsonrpc2
+package jsonrpc2_test
 
 import (
 	"bytes"
 	"context"
 	"io/ioutil"
 	"testing"
+
+	"go.lsp.dev/jsonrpc2"
 )
 
 const payload = `Content-Length: 265
@@ -41,7 +43,7 @@ func BenchmarkSteam_Read(b *testing.B) {
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		in.Write([]byte(payload))
-		stream := NewStream(&in, ioutil.Discard)
+		stream := jsonrpc2.NewStream(&in, ioutil.Discard)
 		_, _, _ = stream.Read(context.Background())
 		in.Reset()
 	}
@@ -52,7 +54,7 @@ func BenchmarkSteam_Write(b *testing.B) {
 	b.ReportAllocs()
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		stream := NewStream(nil, ioutil.Discard)
+		stream := jsonrpc2.NewStream(nil, ioutil.Discard)
 		_, _ = stream.Write(context.Background(), []byte(payload))
 	}
 	b.SetBytes(int64(len(payload)))

types.go

@@ -30,6 +30,7 @@ func (version) UnmarshalJSON(data []byte) error {
 	if version != Version {
 		return fmt.Errorf("invalid JSON-RPC version %v", version)
 	}
+
 	return nil
 }
 
@@ -69,6 +70,7 @@ func (id *ID) MarshalJSON() ([]byte, error) {
 	if id.name != "" {
 		return json.Marshal(id.name)
 	}
+
 	return json.Marshal(id.number)
 }
 
@@ -78,6 +80,7 @@ func (id *ID) UnmarshalJSON(data []byte) error {
 	if err := json.Unmarshal(data, &id.number); err == nil {
 		return nil
 	}
+
 	return json.Unmarshal(data, &id.name)
 }