Skip to content
This repository was archived by the owner on Jan 31, 2024. It is now read-only.

[elastic] Don't send the error messages to the client. #80

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[elastic] Don't send the error messages to the client. #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions internal/lsp/protocol/elasticserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,13 @@ func (h elasticServerHandler) Deliver(ctx context.Context, r *jsonrpc2.Request,
log.Error(ctx, "", err)
}
resp, err := h.server.Initialize(ctx, &params)
if err := r.Reply(ctx, resp, err); err != nil {
if err := NoDiagnosticsReply(r, ctx, resp, err); err != nil {
log.Error(ctx, "", err)
}
return true
case "shutdown": // req
if r.Params != nil {
r.Reply(ctx, nil, jsonrpc2.NewErrorf(jsonrpc2.CodeInvalidParams, "Expected no params"))
NoDiagnosticsReply(r, ctx, nil, jsonrpc2.NewErrorf(jsonrpc2.CodeInvalidParams, "Expected no params"))
return true
}
if err := h.server.Shutdown(ctx); err != nil {
Expand Down Expand Up @@ -313,7 +313,7 @@ func (h elasticServerHandler) Deliver(ctx context.Context, r *jsonrpc2.Request,
return true
}
resp, err := h.server.EDefinition(ctx, &params)
if err := r.Reply(ctx, resp, err); err != nil {
if err := NoDiagnosticsReply(r, ctx, resp, err); err != nil {
log.Error(ctx, "", err)
}
return true
Expand All @@ -324,7 +324,7 @@ func (h elasticServerHandler) Deliver(ctx context.Context, r *jsonrpc2.Request,
return true
}
resp, err := h.server.References(ctx, &params)
if err := r.Reply(ctx, resp, err); err != nil {
if err := NoDiagnosticsReply(r, ctx, resp, err); err != nil {
log.Error(ctx, "", err)
}
return true
Expand All @@ -346,7 +346,7 @@ func (h elasticServerHandler) Deliver(ctx context.Context, r *jsonrpc2.Request,
return true
}
resp, err := h.server.DocumentSymbol(ctx, &params)
if err := r.Reply(ctx, resp, err); err != nil {
if err := NoDiagnosticsReply(r, ctx, resp, err); err != nil {
log.Error(ctx, "", err)
}
return true
Expand Down Expand Up @@ -413,7 +413,7 @@ func (h elasticServerHandler) Deliver(ctx context.Context, r *jsonrpc2.Request,
}

resp, err := h.server.Full(ctx, &fullParams)
if err := r.Reply(ctx, resp, err); err != nil {
if err := NoDiagnosticsReply(r, ctx, resp, err); err != nil {
log.Error(ctx, "", err)
}
return true
Expand Down Expand Up @@ -507,3 +507,7 @@ func NewElasticServer(ctx context.Context, stream jsonrpc2.Stream, server Elasti
conn.AddHandler(&elasticServerHandler{server: server})
return ctx, conn, client
}

func NoDiagnosticsReply(r *jsonrpc2.Request, ctx context.Context, result interface{}, err error) error {
return r.Reply(ctx, result, nil)
}