Created Go module, moved handler code to subpackage

Author: spoenemann

go.mod

@@ -0,0 +1,9 @@
+module github.com/bcmi-labs/arduino-language-server
+
+go 1.12
+
+require (
+	github.com/gorilla/websocket v1.4.0 // indirect
+	github.com/sourcegraph/go-lsp v0.0.0-20181119182933-0c7d621186c1
+	github.com/sourcegraph/jsonrpc2 v0.0.0-20190106185902-35a74f039c6a
+)

go.sum

@@ -0,0 +1,6 @@
+github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/sourcegraph/go-lsp v0.0.0-20181119182933-0c7d621186c1 h1:O1d7nVzpGmP5pGAZBSlp9TSpjNwwI0xThxhPd9oVJuU=
+github.com/sourcegraph/go-lsp v0.0.0-20181119182933-0c7d621186c1/go.mod h1:tpps84QRlOVVLYk5QpKYX8Tr289D1v/UTWDLqeguiqM=
+github.com/sourcegraph/jsonrpc2 v0.0.0-20190106185902-35a74f039c6a h1:jTZwOlrDhmk4Ez2vhWh7kA0eKUahp1lCO2uyM4fi/Qk=
+github.com/sourcegraph/jsonrpc2 v0.0.0-20190106185902-35a74f039c6a/go.mod h1:eESpbCslcLDs8j2D7IEdGVgul7xuk9odqDTaor30IUU=

builder.go renamed to handler/builder.go

@@ -1,4 +1,4 @@
-package main
+package handler
 
 import (
 	"bufio"

handler.go renamed to handler/handler.go

@@ -1,9 +1,10 @@
-package main
+package handler
 
 import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"io"
 	"log"
 	"net/url"
 	"path/filepath"
@@ -13,16 +14,29 @@ import (
 	"github.com/sourcegraph/jsonrpc2"
 )
 
-func newInoHandler() *InoHandler {
-	return &InoHandler{
+var enableLogging bool
+
+// NewInoHandler creates and configures an InoHandler.
+func NewInoHandler(stdin io.ReadCloser, stdout io.WriteCloser, stdinLog, stdoutLog io.Writer,
+	clangdIn io.ReadCloser, clangdOut io.WriteCloser, clangdinLog, clangdoutLog io.Writer,
+	logging bool) *InoHandler {
+	enableLogging = logging
+	handler := &InoHandler{
 		data: make(map[lsp.DocumentURI]*FileData),
 	}
+	clangdStream := jsonrpc2.NewBufferedStream(StreamReadWrite{clangdIn, clangdOut, clangdinLog, clangdoutLog}, jsonrpc2.VSCodeObjectCodec{})
+	clangdHandler := jsonrpc2.HandlerWithError(handler.FromClangd)
+	handler.ClangdConn = jsonrpc2.NewConn(context.Background(), clangdStream, clangdHandler)
+	stdStream := jsonrpc2.NewBufferedStream(StreamReadWrite{stdin, stdout, stdinLog, stdoutLog}, jsonrpc2.VSCodeObjectCodec{})
+	stdHandler := jsonrpc2.HandlerWithError(handler.FromStdio)
+	handler.StdioConn = jsonrpc2.NewConn(context.Background(), stdStream, stdHandler)
+	return handler
 }
 
 // InoHandler is a JSON-RPC handler that delegates messages to clangd.
 type InoHandler struct {
-	stdioConn  *jsonrpc2.Conn
-	clangdConn *jsonrpc2.Conn
+	StdioConn  *jsonrpc2.Conn
+	ClangdConn *jsonrpc2.Conn
 	data       map[lsp.DocumentURI]*FileData
 }
 
@@ -44,9 +58,9 @@ func (handler *InoHandler) FromStdio(ctx context.Context, conn *jsonrpc2.Conn, r
 	}
 	var result interface{}
 	if req.Notif {
-		err = handler.clangdConn.Notify(ctx, req.Method, params)
+		err = handler.ClangdConn.Notify(ctx, req.Method, params)
 	} else {
-		result, err = sendRequest(ctx, handler.clangdConn, req.Method, params)
+		result, err = sendRequest(ctx, handler.ClangdConn, req.Method, params)
 	}
 	if err != nil {
 		log.Println("From stdio: Method:", req.Method, "Params:", params, "Error:", err)
@@ -304,9 +318,9 @@ func (handler *InoHandler) FromClangd(ctx context.Context, connection *jsonrpc2.
 	}
 	var result interface{}
 	if req.Notif {
-		err = handler.stdioConn.Notify(ctx, req.Method, params)
+		err = handler.StdioConn.Notify(ctx, req.Method, params)
 	} else {
-		result, err = sendRequest(ctx, handler.stdioConn, req.Method, params)
+		result, err = sendRequest(ctx, handler.StdioConn, req.Method, params)
 	}
 	if err != nil {
 		log.Println("From clangd: Method:", req.Method, "Params:", params, "Error:", err)

properties.go renamed to handler/properties.go

@@ -1,4 +1,4 @@
-package main
+package handler
 
 import (
 	"bufio"

properties_test.go renamed to handler/properties_test.go

@@ -1,4 +1,4 @@
-package main
+package handler
 
 import (
 	"reflect"

protocol.go renamed to handler/protocol.go

@@ -1,4 +1,4 @@
-package main
+package handler
 
 import (
 	"context"

sourcemap.go renamed to handler/sourcemap.go

@@ -1,4 +1,4 @@
-package main
+package handler
 
 import (
 	"bufio"

sourcemap_test.go renamed to handler/sourcemap_test.go

@@ -1,4 +1,4 @@
-package main
+package handler
 
 import (
 	"reflect"

stream.go renamed to handler/stream.go

@@ -1,4 +1,4 @@
-package main
+package handler
 
 import (
 	"io"