Made logging color more coherent

Author: cmaglie

Diff for: ls/lsp_client_clangd.go

@@ -10,6 +10,7 @@ import (
 	"github.com/arduino/arduino-cli/executils"
 	"github.com/arduino/arduino-language-server/streams"
 	"github.com/arduino/go-paths-helper"
+	"github.com/fatih/color"
 	"go.bug.st/json"
 	"go.bug.st/lsp"
 	"go.bug.st/lsp/jsonrpc"
@@ -38,7 +39,11 @@ func NewClangdLSPClient(
 		ls: inoLanguageServer,
 	}
 	client.conn = lsp.NewClient(clangdStdio, clangdStdio, client)
-	client.conn.SetLogger(&LSPLogger{IncomingPrefix: "IDE     LS <-- Clangd", OutgoingPrefix: "IDE     LS --> Clangd"})
+	client.conn.SetLogger(&LSPLogger{
+		IncomingPrefix: "IDE     LS <-- Clangd",
+		OutgoingPrefix: "IDE     LS --> Clangd",
+		HiColor:        color.HiRedString,
+		LoColor:        color.RedString})
 	return client
 }
 

Diff for: ls/lsp_logger.go

@@ -11,40 +11,41 @@ import (
 
 type LSPLogger struct {
 	IncomingPrefix, OutgoingPrefix string
+	HiColor, LoColor               func(format string, a ...interface{}) string
 }
 
 func (l *LSPLogger) LogOutgoingRequest(id string, method string, params json.RawMessage) {
-	log.Print(color.HiGreenString("%s REQU %s %s", l.OutgoingPrefix, method, id))
+	log.Print(l.HiColor("%s REQU %s %s", l.OutgoingPrefix, method, id))
 }
 func (l *LSPLogger) LogOutgoingCancelRequest(id string) {
-	log.Print(color.GreenString("%s CANCEL %s", l.OutgoingPrefix, id))
+	log.Print(l.LoColor("%s CANCEL %s", l.OutgoingPrefix, id))
 }
 func (l *LSPLogger) LogIncomingResponse(id string, method string, resp json.RawMessage, respErr *jsonrpc.ResponseError) {
-	log.Print(color.GreenString("%s RESP %s %s", l.IncomingPrefix, method, id))
+	log.Print(l.LoColor("%s RESP %s %s", l.IncomingPrefix, method, id))
 }
 func (l *LSPLogger) LogOutgoingNotification(method string, params json.RawMessage) {
-	log.Print(color.HiGreenString("%s NOTIF %s", l.OutgoingPrefix, method))
+	log.Print(l.HiColor("%s NOTIF %s", l.OutgoingPrefix, method))
 }
 
 func (l *LSPLogger) LogIncomingRequest(id string, method string, params json.RawMessage) jsonrpc.FunctionLogger {
 	spaces := "                                               "
-	log.Print(color.HiRedString(fmt.Sprintf("%s REQU %s %s", l.IncomingPrefix, method, id)))
+	log.Print(l.HiColor(fmt.Sprintf("%s REQU %s %s", l.IncomingPrefix, method, id)))
 	return &LSPFunctionLogger{
-		colorFunc: color.HiRedString,
+		colorFunc: l.HiColor,
 		prefix:    fmt.Sprintf("%s      %s %s", spaces[:len(l.IncomingPrefix)], method, id),
 	}
 }
 func (l *LSPLogger) LogIncomingCancelRequest(id string) {
-	log.Print(color.RedString("%s CANCEL %s", l.IncomingPrefix, id))
+	log.Print(l.LoColor("%s CANCEL %s", l.IncomingPrefix, id))
 }
 func (l *LSPLogger) LogOutgoingResponse(id string, method string, resp json.RawMessage, respErr *jsonrpc.ResponseError) {
-	log.Print(color.RedString("%s RESP %s %s", l.OutgoingPrefix, method, id))
+	log.Print(l.LoColor("%s RESP %s %s", l.OutgoingPrefix, method, id))
 }
 func (l *LSPLogger) LogIncomingNotification(method string, params json.RawMessage) jsonrpc.FunctionLogger {
 	spaces := "                                               "
-	log.Print(color.HiRedString(fmt.Sprintf("%s NOTIF %s", l.IncomingPrefix, method)))
+	log.Print(l.HiColor(fmt.Sprintf("%s NOTIF %s", l.IncomingPrefix, method)))
 	return &LSPFunctionLogger{
-		colorFunc: color.HiRedString,
+		colorFunc: l.HiColor,
 		prefix:    fmt.Sprintf("%s       %s", spaces[:len(l.IncomingPrefix)], method),
 	}
 }

Diff for: ls/lsp_server_ide.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"io"
 
+	"github.com/fatih/color"
 	"go.bug.st/json"
 	"go.bug.st/lsp"
 	"go.bug.st/lsp/jsonrpc"
@@ -19,7 +20,11 @@ func NewIDELSPServer(logger jsonrpc.FunctionLogger, in io.Reader, out io.Writer,
 		ls: ls,
 	}
 	server.conn = lsp.NewServer(in, out, server)
-	server.conn.SetLogger(&LSPLogger{IncomingPrefix: "IDE --> LS", OutgoingPrefix: "IDE <-- LS"})
+	server.conn.SetLogger(&LSPLogger{
+		IncomingPrefix: "IDE --> LS",
+		OutgoingPrefix: "IDE <-- LS",
+		HiColor:        color.HiGreenString,
+		LoColor:        color.GreenString})
 	return server
 }