Bump fix to include latest upstream commits

client.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Cristian Maglie. All rights reserved.
+// Copyright 2024 Cristian Maglie. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //

doc.go

@@ -0,0 +1,8 @@
+//
+// Copyright 2024 Cristian Maglie. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+//
+
+// Package lsp is an implementation of a Language Server Protocol handler.
+package lsp

go.mod

@@ -1,10 +1,16 @@
 module go.bug.st/lsp
 
-go 1.15
+go 1.22
 
 require (
 	github.com/arduino/go-paths-helper v1.6.1
 	github.com/davecgh/go-spew v1.1.0
 	github.com/stretchr/testify v1.6.1
 	go.bug.st/json v1.15.6
 )
+
+require (
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+)

jsonrpc/doc.go

@@ -0,0 +1,8 @@
+//
+// Copyright 2024 Cristian Maglie. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+//
+
+// Package jsonrpc is an implementation of a Language Server Protocol JSON-RPC protocol.
+package jsonrpc

jsonrpc/jsonrpc_connection.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Cristian Maglie. All rights reserved.
+// Copyright 2024 Cristian Maglie. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //
@@ -236,14 +236,14 @@ func (c *Connection) Close() {
 
 func (c *Connection) SendRequest(ctx context.Context, method string, params json.RawMessage) (json.RawMessage, *ResponseError, error) {
 	id := fmt.Sprintf("%d", atomic.AddUint64(&c.lastOutRequestsIndex, 1))
-	encodedId, err := json.Marshal(id)
+	encodedID, err := json.Marshal(id)
 	if err != nil {
 		// should never happen...
 		panic("internal error creating RequestMessage")
 	}
 	req := RequestMessage{
 		JSONRPC: "2.0",
-		ID:      encodedId,
+		ID:      encodedID,
 		Method:  method,
 		Params:  params,
 	}
@@ -277,7 +277,7 @@ func (c *Connection) SendRequest(ctx context.Context, method string, params json
 		_, active := c.activeOutRequests[id]
 		c.activeOutRequestsMutex.Unlock()
 		if active {
-			if notif, err := json.Marshal(CancelParams{ID: encodedId}); err != nil {
+			if notif, err := json.Marshal(CancelParams{ID: encodedID}); err != nil {
 				// should never happen
 				panic("internal error: failed json encoding")
 			} else {

jsonrpc/jsonrpc_protocol.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Cristian Maglie. All rights reserved.
+// Copyright 2024 Cristian Maglie. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //

jsonrpc/jsonrpc_test.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Cristian Maglie. All rights reserved.
+// Copyright 2024 Cristian Maglie. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //

jsonrpc/logger.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Cristian Maglie. All rights reserved.
+// Copyright 2024 Cristian Maglie. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //

lsp_basic.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Cristian Maglie. All rights reserved.
+// Copyright 2024 Cristian Maglie. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //
@@ -260,7 +260,7 @@ func (p WorkDoneProgressEnd) String() string {
 	return res
 }
 
-// General parameters to register for a capability.
+// Registration General parameters to register for a capability.
 type Registration struct {
 	// The id used to register the request. The id can be used to deregister
 	// the request again.
@@ -277,7 +277,7 @@ type RegistrationParams struct {
 	Registrations []Registration `json:"registrations,required"`
 }
 
-// General parameters to unregister a capability.
+// Unregistration General parameters to unregister a capability.
 type Unregistration struct {
 	// The id used to unregister the request or notification. Usually an id
 	// provided during the register request.

lsp_basic_test.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Cristian Maglie. All rights reserved.
+// Copyright 2024 Cristian Maglie. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 //
@@ -23,7 +23,7 @@ func TestDecodingProgressReports(t *testing.T) {
 			Percentage:  &perc,
 		}
 
-		beginJson := `{
+		beginJSON := `{
 			"cancellable" : true,
 			"kind" : "begin",
 			"message" : "mesg",
@@ -32,21 +32,21 @@ func TestDecodingProgressReports(t *testing.T) {
 		}`
 		beginData, err := json.Marshal(beginParam)
 		require.NoError(t, err)
-		require.JSONEq(t, beginJson, string(beginData))
+		require.JSONEq(t, beginJSON, string(beginData))
 
-		err = json.Unmarshal([]byte(beginJson), &beginParam)
+		err = json.Unmarshal([]byte(beginJSON), &beginParam)
 		require.NoError(t, err)
 	}
 	{
-		begin_json := `{
+		beginJSON := `{
 			"token": "aaaa10292992929287172",
 			"value": {
 				"kind": "begin",
 				"title": "hello",
 				"cancellable": true
 			}
 		}`
-		r, err := DecodeServerNotificationParams("$/progress", json.RawMessage([]byte(begin_json)))
+		r, err := DecodeServerNotificationParams("$/progress", json.RawMessage([]byte(beginJSON)))
 		require.NoError(t, err)
 		require.IsType(t, &ProgressParams{}, r)
 		pp := r.(*ProgressParams)
@@ -62,29 +62,29 @@ func TestDecodingProgressReports(t *testing.T) {
 			Percentage:  &perc,
 		}
 
-		reportJson := `{
+		reportJSON := `{
 			"cancellable" : true,
 			"kind" : "report",
 			"message" : "mesg",
 			"percentage" : 15
 		}`
 		reportData, err := json.Marshal(reportParam)
 		require.NoError(t, err)
-		require.JSONEq(t, reportJson, string(reportData))
+		require.JSONEq(t, reportJSON, string(reportData))
 
-		err = json.Unmarshal([]byte(reportJson), &reportParam)
+		err = json.Unmarshal([]byte(reportJSON), &reportParam)
 		require.NoError(t, err)
 	}
 	{
-		report_json := `{
+		reportJSON := `{
 			"token": "aaaa10292992929287172",
 			"value": {
 				"kind": "report",
 				"message": "hello",
 				"cancellable": true
 			}
 		}`
-		r, err := DecodeServerNotificationParams("$/progress", json.RawMessage([]byte(report_json)))
+		r, err := DecodeServerNotificationParams("$/progress", json.RawMessage([]byte(reportJSON)))
 		require.NoError(t, err)
 		require.IsType(t, &ProgressParams{}, r)
 		pp := r.(*ProgressParams)
@@ -97,26 +97,26 @@ func TestDecodingProgressReports(t *testing.T) {
 			Message: "mesg",
 		}
 
-		endJson := `{
+		endJSON := `{
 			"kind" : "end",
 			"message" : "mesg"
 		}`
 		endData, err := json.Marshal(endParam)
 		require.NoError(t, err)
-		require.JSONEq(t, endJson, string(endData))
+		require.JSONEq(t, endJSON, string(endData))
 
-		err = json.Unmarshal([]byte(endJson), &endParam)
+		err = json.Unmarshal([]byte(endJSON), &endParam)
 		require.NoError(t, err)
 	}
 	{
-		end_json := `{
+		endJSON := `{
 			"token": "aaaa10292992929287172",
 			"value": {
 				"kind": "end",
 				"message": "bye"
 			}
 		}`
-		r, err := DecodeServerNotificationParams("$/progress", json.RawMessage([]byte(end_json)))
+		r, err := DecodeServerNotificationParams("$/progress", json.RawMessage([]byte(endJSON)))
 		require.NoError(t, err)
 		require.IsType(t, &ProgressParams{}, r)
 		pp := r.(*ProgressParams)