Forked https://github.com/sourcegraph/go-lsp

Author: cmaglie

go.mod

@@ -8,12 +8,7 @@ require (
 	github.com/arduino/arduino-cli v0.0.0-20201118111649-5edef82c60fb
 	github.com/arduino/go-paths-helper v1.3.2
 	github.com/arduino/go-properties-orderedmap v1.4.0
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/sourcegraph/go-lsp v0.0.0-20200429204803-219e11d77f5d
 	github.com/sourcegraph/jsonrpc2 v0.0.0-20200429184054-15c2290dcb37
 	github.com/stretchr/testify v1.6.1
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 )

go.sum

@@ -16,9 +16,9 @@ import (
 	"github.com/arduino/go-paths-helper"
 	"github.com/bcmi-labs/arduino-language-server/handler/sourcemapper"
 	"github.com/bcmi-labs/arduino-language-server/handler/textutils"
+	"github.com/bcmi-labs/arduino-language-server/lsp"
 	"github.com/bcmi-labs/arduino-language-server/streams"
 	"github.com/pkg/errors"
-	lsp "github.com/sourcegraph/go-lsp"
 	"github.com/sourcegraph/jsonrpc2"
 )
 
@@ -39,11 +39,11 @@ func Setup(cliPath string, clangdPath string, _enableLogging bool, _asyncProcess
 type CLangdStarter func() (stdin io.WriteCloser, stdout io.ReadCloser, stderr io.ReadCloser)
 
 // NewInoHandler creates and configures an InoHandler.
-func NewInoHandler(stdio io.ReadWriteCloser, board Board) *InoHandler {
+func NewInoHandler(stdio io.ReadWriteCloser, board lsp.Board) *InoHandler {
 	handler := &InoHandler{
 		data:         map[lsp.DocumentURI]*FileData{},
 		trackedFiles: map[lsp.DocumentURI]lsp.TextDocumentItem{},
-		config: BoardConfig{
+		config: lsp.BoardConfig{
 			SelectedBoard: board,
 		},
 	}
@@ -77,7 +77,7 @@ type InoHandler struct {
 	trackedFiles            map[lsp.DocumentURI]lsp.TextDocumentItem
 
 	data         map[lsp.DocumentURI]*FileData
-	config       BoardConfig
+	config       lsp.BoardConfig
 	synchronizer Synchronizer
 }
 
@@ -114,7 +114,7 @@ func (handler *InoHandler) HandleMessageFromIDE(ctx context.Context, conn *jsonr
 	// Handle LSP methods: transform parameters and send to clangd
 	var uri lsp.DocumentURI
 
-	params, err := readParams(req.Method, req.Params)
+	params, err := lsp.ReadParams(req.Method, req.Params)
 	if err != nil {
 		return nil, err
 	}
@@ -147,7 +147,7 @@ func (handler *InoHandler) HandleMessageFromIDE(ctx context.Context, conn *jsonr
 		err = handler.ino2cppTextDocumentPositionParams(&p.TextDocumentPositionParams)
 		log.Printf("    --> completion(%s:%d:%d)\n", p.TextDocument.URI, p.Position.Line, p.Position.Character)
 
-	case *HoverParams:
+	case *lsp.HoverParams:
 		// method: "textDocument/hover"
 		uri = p.TextDocument.URI
 		doc := &p.TextDocumentPositionParams
@@ -230,7 +230,7 @@ func (handler *InoHandler) HandleMessageFromIDE(ctx context.Context, conn *jsonr
 	} else {
 		ctx, cancel := context.WithTimeout(ctx, 800*time.Millisecond)
 		defer cancel()
-		result, err = sendRequest(ctx, handler.ClangdConn, req.Method, params)
+		result, err = lsp.SendRequest(ctx, handler.ClangdConn, req.Method, params)
 		if enableLogging {
 			log.Println("    sent", req.Method, "request id", req.ID, " to clangd")
 		}
@@ -609,7 +609,7 @@ func (handler *InoHandler) transformClangdResult(method string, uri lsp.Document
 	switch r := result.(type) {
 	case *lsp.CompletionList: // "textDocument/completion":
 		handler.cpp2inoCompletionList(r, uri)
-	case *[]*commandOrCodeAction: // "textDocument/codeAction":
+	case *[]*lsp.CommandOrCodeAction: // "textDocument/codeAction":
 		for index := range *r {
 			command := (*r)[index].Command
 			if command != nil {
@@ -620,7 +620,7 @@ func (handler *InoHandler) transformClangdResult(method string, uri lsp.Document
 				handler.cpp2inoCodeAction(codeAction, uri)
 			}
 		}
-	case *Hover: // "textDocument/hover":
+	case *lsp.Hover: // "textDocument/hover":
 		if len(r.Contents.Value) == 0 {
 			return nil
 		}
@@ -647,15 +647,15 @@ func (handler *InoHandler) transformClangdResult(method string, uri lsp.Document
 		for index := range *r {
 			handler.cpp2inoTextEdit(&(*r)[index], uri)
 		}
-	case *[]*documentSymbolOrSymbolInformation: // "textDocument/documentSymbol":
+	case *[]*lsp.DocumentSymbolOrSymbolInformation: // "textDocument/documentSymbol":
 		if len(*r) == 0 {
 			return result
 		}
 
 		slice := *r
 		if slice[0].DocumentSymbol != nil {
 			// Treat the input as []DocumentSymbol
-			symbols := make([]DocumentSymbol, len(slice))
+			symbols := make([]lsp.DocumentSymbol, len(slice))
 			for index := range slice {
 				symbols[index] = *slice[index].DocumentSymbol
 			}
@@ -694,7 +694,7 @@ func (handler *InoHandler) cpp2inoCompletionList(list *lsp.CompletionList, uri l
 	}
 }
 
-func (handler *InoHandler) cpp2inoCodeAction(codeAction *CodeAction, uri lsp.DocumentURI) {
+func (handler *InoHandler) cpp2inoCodeAction(codeAction *lsp.CodeAction, uri lsp.DocumentURI) {
 	codeAction.Edit = handler.cpp2inoWorkspaceEdit(codeAction.Edit)
 	if data, ok := handler.data[uri]; ok {
 		for index := range codeAction.Diagnostics {
@@ -732,7 +732,7 @@ func (handler *InoHandler) cpp2inoWorkspaceEdit(origEdit *lsp.WorkspaceEdit) *ls
 	return &newEdit
 }
 
-func (handler *InoHandler) cpp2inoHover(hover *Hover, uri lsp.DocumentURI) {
+func (handler *InoHandler) cpp2inoHover(hover *lsp.Hover, uri lsp.DocumentURI) {
 	if data, ok := handler.data[uri]; ok {
 		r := hover.Range
 		if r != nil {
@@ -760,13 +760,13 @@ func (handler *InoHandler) cpp2inoTextEdit(edit *lsp.TextEdit, uri lsp.DocumentU
 	}
 }
 
-func (handler *InoHandler) cpp2inoDocumentSymbols(origSymbols []DocumentSymbol, uri lsp.DocumentURI) []DocumentSymbol {
+func (handler *InoHandler) cpp2inoDocumentSymbols(origSymbols []lsp.DocumentSymbol, uri lsp.DocumentURI) []lsp.DocumentSymbol {
 	data, ok := handler.data[uri]
 	if !ok || len(origSymbols) == 0 {
 		return origSymbols
 	}
 
-	symbolIdx := make(map[string]*DocumentSymbol)
+	symbolIdx := make(map[string]*lsp.DocumentSymbol)
 	for i := 0; i < len(origSymbols); i++ {
 		symbol := &origSymbols[i]
 		_, symbol.Range = data.sourceMap.CppToInoRange(symbol.Range)
@@ -787,7 +787,7 @@ func (handler *InoHandler) cpp2inoDocumentSymbols(origSymbols []DocumentSymbol,
 		symbolIdx[symbol.Name] = symbol
 	}
 
-	newSymbols := make([]DocumentSymbol, len(symbolIdx))
+	newSymbols := make([]lsp.DocumentSymbol, len(symbolIdx))
 	j := 0
 	for _, s := range symbolIdx {
 		newSymbols[j] = *s
@@ -825,7 +825,7 @@ func (handler *InoHandler) FromClangd(ctx context.Context, connection *jsonrpc2.
 	handler.synchronizer.DataMux.RLock()
 	defer handler.synchronizer.DataMux.RUnlock()
 
-	params, err := readParams(req.Method, req.Params)
+	params, err := lsp.ReadParams(req.Method, req.Params)
 	if err != nil {
 		return nil, errors.WithMessage(err, "parsing JSON message from clangd")
 	}
@@ -877,7 +877,7 @@ func (handler *InoHandler) FromClangd(ctx context.Context, connection *jsonrpc2.
 			return nil, err
 		}
 
-	case *ApplyWorkspaceEditParams:
+	case *lsp.ApplyWorkspaceEditParams:
 		// "workspace/applyEdit"
 		p.Edit = *handler.cpp2inoWorkspaceEdit(&p.Edit)
 	}
@@ -893,7 +893,7 @@ func (handler *InoHandler) FromClangd(ctx context.Context, connection *jsonrpc2.
 			log.Println("From clangd:", req.Method)
 		}
 	} else {
-		result, err = sendRequest(ctx, handler.StdioConn, req.Method, params)
+		result, err = lsp.SendRequest(ctx, handler.StdioConn, req.Method, params)
 		if enableLogging {
 			log.Println("From clangd:", req.Method, "id", req.ID)
 		}

handler/handler.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/sourcegraph/go-lsp"
+	"github.com/bcmi-labs/arduino-language-server/lsp"
 )
 
 // InoMapper is a mapping between the .ino sketch and the preprocessed .cpp file

handler/sourcemapper/ino.go

@@ -3,7 +3,7 @@ package textutils
 import (
 	"fmt"
 
-	"github.com/sourcegraph/go-lsp"
+	"github.com/bcmi-labs/arduino-language-server/lsp"
 )
 
 // ApplyTextChange replaces startingText substring specified by replaceRange with insertText

handler/textutils/textutils.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/sourcegraph/go-lsp"
+	"github.com/bcmi-labs/arduino-language-server/lsp"
 )
 
 func TestApplyTextChange(t *testing.T) {

handler/textutils/textutils_test.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/arduino/go-paths-helper"
+	"github.com/bcmi-labs/arduino-language-server/lsp"
 	"github.com/pkg/errors"
-	lsp "github.com/sourcegraph/go-lsp"
 )
 
 var expDriveID = regexp.MustCompile("[a-zA-Z]:")

handler/uri.go

@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"testing"
 
-	lsp "github.com/sourcegraph/go-lsp"
+	"github.com/bcmi-labs/arduino-language-server/lsp"
 )
 
 func TestUriToPath(t *testing.T) {

handler/uri_test.go

@@ -0,0 +1,19 @@
+Copyright (c) 2018 Sourcegraph
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

lsp/LICENSE

@@ -0,0 +1,10 @@
+This module has been imported from: https://github.com/sourcegraph/go-lsp
+
+# go-lsp
+
+Package lsp contains Go types for the messages used in the Language Server
+Protocol.
+
+See
+https://github.com/Microsoft/language-server-protocol/blob/master/protocol.md
+for more information.

lsp/README.md

@@ -0,0 +1,52 @@
+package lsp
+
+import (
+	"encoding/json"
+	"strconv"
+)
+
+// ID represents a JSON-RPC 2.0 request ID, which may be either a
+// string or number (or null, which is unsupported).
+type ID struct {
+	// At most one of Num or Str may be nonzero. If both are zero
+	// valued, then IsNum specifies which field's value is to be used
+	// as the ID.
+	Num uint64
+	Str string
+
+	// IsString controls whether the Num or Str field's value should be
+	// used as the ID, when both are zero valued. It must always be
+	// set to true if the request ID is a string.
+	IsString bool
+}
+
+func (id ID) String() string {
+	if id.IsString {
+		return strconv.Quote(id.Str)
+	}
+	return strconv.FormatUint(id.Num, 10)
+}
+
+// MarshalJSON implements json.Marshaler.
+func (id ID) MarshalJSON() ([]byte, error) {
+	if id.IsString {
+		return json.Marshal(id.Str)
+	}
+	return json.Marshal(id.Num)
+}
+
+// UnmarshalJSON implements json.Unmarshaler.
+func (id *ID) UnmarshalJSON(data []byte) error {
+	// Support both uint64 and string IDs.
+	var v uint64
+	if err := json.Unmarshal(data, &v); err == nil {
+		*id = ID{Num: v}
+		return nil
+	}
+	var v2 string
+	if err := json.Unmarshal(data, &v2); err != nil {
+		return err
+	}
+	*id = ID{Str: v2, IsString: true}
+	return nil
+}