Reorganized repository

Author: cmaglie

handler/builder.go renamed to ls/builder.go

@@ -1,4 +1,4 @@
-package handler
+package ls
 
 import (
 	"bytes"

handler/handler.go renamed to ls/ls.go

@@ -1,4 +1,4 @@
-package handler
+package ls
 
 import (
 	"context"
@@ -15,16 +15,16 @@ import (
 	"go.bug.st/lsp/jsonrpc"
 )
 
-type ClangdClient struct {
-	conn    *lsp.Client
-	handler *INOLanguageServer
+type ClangdLSPClient struct {
+	conn *lsp.Client
+	ls   *INOLanguageServer
 }
 
-func NewClangdClient(logger jsonrpc.FunctionLogger,
+func NewClangdLSPClient(logger jsonrpc.FunctionLogger,
 	buildPath, buildSketchCpp, dataFolder *paths.Path,
 	connectionClosedCB func(),
 	inoLanguageServer *INOLanguageServer,
-) *ClangdClient {
+) *ClangdLSPClient {
 	clangdStdout, clangdStdin, clangdStderr := startClangd(logger, buildPath, buildSketchCpp, dataFolder)
 	clangdStdio := streams.NewReadWriteCloser(clangdStdin, clangdStdout)
 	if enableLogging {
@@ -34,8 +34,8 @@ func NewClangdClient(logger jsonrpc.FunctionLogger,
 		go io.Copy(os.Stderr, clangdStderr)
 	}
 
-	client := &ClangdClient{
-		handler: inoLanguageServer,
+	client := &ClangdLSPClient{
+		ls: inoLanguageServer,
 	}
 	client.conn = lsp.NewClient(clangdStdio, clangdStdio, client)
 	client.conn.SetLogger(&LSPLogger{IncomingPrefix: "IDE     LS <-- Clangd", OutgoingPrefix: "IDE     LS --> Clangd"})
@@ -74,68 +74,68 @@ func startClangd(logger jsonrpc.FunctionLogger, compileCommandsDir, sketchCpp, d
 	}
 }
 
-func (client *ClangdClient) Close() {
+func (client *ClangdLSPClient) Close() {
 	panic("unimplemented")
 }
 
 // The following are events incoming from Clangd
 
-func (client *ClangdClient) WindowShowMessageRequest(context.Context, jsonrpc.FunctionLogger, *lsp.ShowMessageRequestParams) (*lsp.MessageActionItem, *jsonrpc.ResponseError) {
+func (client *ClangdLSPClient) WindowShowMessageRequest(context.Context, jsonrpc.FunctionLogger, *lsp.ShowMessageRequestParams) (*lsp.MessageActionItem, *jsonrpc.ResponseError) {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) WindowShowDocument(context.Context, jsonrpc.FunctionLogger, *lsp.ShowDocumentParams) (*lsp.ShowDocumentResult, *jsonrpc.ResponseError) {
+func (client *ClangdLSPClient) WindowShowDocument(context.Context, jsonrpc.FunctionLogger, *lsp.ShowDocumentParams) (*lsp.ShowDocumentResult, *jsonrpc.ResponseError) {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) WindowWorkDoneProgressCreate(ctx context.Context, logger jsonrpc.FunctionLogger, params *lsp.WorkDoneProgressCreateParams) *jsonrpc.ResponseError {
-	return client.handler.WindowWorkDoneProgressCreateFromClangd(ctx, logger, params)
+func (client *ClangdLSPClient) WindowWorkDoneProgressCreate(ctx context.Context, logger jsonrpc.FunctionLogger, params *lsp.WorkDoneProgressCreateParams) *jsonrpc.ResponseError {
+	return client.ls.WindowWorkDoneProgressCreateFromClangd(ctx, logger, params)
 }
 
-func (client *ClangdClient) ClientRegisterCapability(context.Context, jsonrpc.FunctionLogger, *lsp.RegistrationParams) *jsonrpc.ResponseError {
+func (client *ClangdLSPClient) ClientRegisterCapability(context.Context, jsonrpc.FunctionLogger, *lsp.RegistrationParams) *jsonrpc.ResponseError {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) ClientUnregisterCapability(context.Context, jsonrpc.FunctionLogger, *lsp.UnregistrationParams) *jsonrpc.ResponseError {
+func (client *ClangdLSPClient) ClientUnregisterCapability(context.Context, jsonrpc.FunctionLogger, *lsp.UnregistrationParams) *jsonrpc.ResponseError {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) WorkspaceWorkspaceFolders(context.Context, jsonrpc.FunctionLogger) ([]lsp.WorkspaceFolder, *jsonrpc.ResponseError) {
+func (client *ClangdLSPClient) WorkspaceWorkspaceFolders(context.Context, jsonrpc.FunctionLogger) ([]lsp.WorkspaceFolder, *jsonrpc.ResponseError) {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) WorkspaceConfiguration(context.Context, jsonrpc.FunctionLogger, *lsp.ConfigurationParams) ([]json.RawMessage, *jsonrpc.ResponseError) {
+func (client *ClangdLSPClient) WorkspaceConfiguration(context.Context, jsonrpc.FunctionLogger, *lsp.ConfigurationParams) ([]json.RawMessage, *jsonrpc.ResponseError) {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) WorkspaceApplyEdit(context.Context, jsonrpc.FunctionLogger, *lsp.ApplyWorkspaceEditParams) (*lsp.ApplyWorkspaceEditResult, *jsonrpc.ResponseError) {
+func (client *ClangdLSPClient) WorkspaceApplyEdit(context.Context, jsonrpc.FunctionLogger, *lsp.ApplyWorkspaceEditParams) (*lsp.ApplyWorkspaceEditResult, *jsonrpc.ResponseError) {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) WorkspaceCodeLensRefresh(context.Context, jsonrpc.FunctionLogger) *jsonrpc.ResponseError {
+func (client *ClangdLSPClient) WorkspaceCodeLensRefresh(context.Context, jsonrpc.FunctionLogger) *jsonrpc.ResponseError {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) Progress(logger jsonrpc.FunctionLogger, progress *lsp.ProgressParams) {
-	client.handler.ProgressFromClangd(logger, progress)
+func (client *ClangdLSPClient) Progress(logger jsonrpc.FunctionLogger, progress *lsp.ProgressParams) {
+	client.ls.ProgressFromClangd(logger, progress)
 }
 
-func (client *ClangdClient) LogTrace(jsonrpc.FunctionLogger, *lsp.LogTraceParams) {
+func (client *ClangdLSPClient) LogTrace(jsonrpc.FunctionLogger, *lsp.LogTraceParams) {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) WindowShowMessage(jsonrpc.FunctionLogger, *lsp.ShowMessageParams) {
+func (client *ClangdLSPClient) WindowShowMessage(jsonrpc.FunctionLogger, *lsp.ShowMessageParams) {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) WindowLogMessage(jsonrpc.FunctionLogger, *lsp.LogMessageParams) {
+func (client *ClangdLSPClient) WindowLogMessage(jsonrpc.FunctionLogger, *lsp.LogMessageParams) {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) TelemetryEvent(jsonrpc.FunctionLogger, json.RawMessage) {
+func (client *ClangdLSPClient) TelemetryEvent(jsonrpc.FunctionLogger, json.RawMessage) {
 	panic("unimplemented")
 }
 
-func (client *ClangdClient) TextDocumentPublishDiagnostics(logger jsonrpc.FunctionLogger, params *lsp.PublishDiagnosticsParams) {
-	client.handler.PublishDiagnosticsFromClangd(logger, params)
+func (client *ClangdLSPClient) TextDocumentPublishDiagnostics(logger jsonrpc.FunctionLogger, params *lsp.PublishDiagnosticsParams) {
+	client.ls.PublishDiagnosticsFromClangd(logger, params)
 }

handler/clangd_client.go renamed to ls/lsp_client_clangd.go

@@ -1,4 +1,4 @@
-package handler
+package ls
 
 import (
 	"fmt"

handler/lsp_logger.go renamed to ls/lsp_logger.go

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

handler/progress.go renamed to ls/progress.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/arduino/arduino-language-server/handler"
+	"github.com/arduino/arduino-language-server/ls"
 	"github.com/arduino/arduino-language-server/streams"
 	"github.com/arduino/go-paths-helper"
 )
@@ -52,15 +52,15 @@ func main() {
 		log.Fatal("Path to ArduinoCLI config file must be set.")
 	}
 
-	handler.Setup(cliPath, cliConfigPath, clangdPath, formatFilePath, enableLogging)
-	initialBoard := handler.Board{Fqbn: initialFqbn, Name: initialBoardName}
+	ls.Setup(cliPath, cliConfigPath, clangdPath, formatFilePath, enableLogging)
+	initialBoard := ls.Board{Fqbn: initialFqbn, Name: initialBoardName}
 
 	stdio := streams.NewReadWriteCloser(os.Stdin, os.Stdout)
 	if enableLogging {
 		stdio = streams.LogReadWriteCloserAs(stdio, "inols.log")
 	}
 
-	inoHandler := handler.NewINOLanguageServer(stdio, stdio, initialBoard)
+	inoHandler := ls.NewINOLanguageServer(stdio, stdio, initialBoard)
 
 	// Intercept kill signal
 	c := make(chan os.Signal, 2)

main.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/arduino/arduino-language-server/handler/textutils"
+	"github.com/arduino/arduino-language-server/textutils"
 	"github.com/arduino/go-paths-helper"
 	"github.com/pkg/errors"
 	"go.bug.st/lsp"