Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions tsc/internal/jsonrpc/jsonrpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ func (r *ResponseError) String() string {
return ""
}
data, err := json.Marshal(r.Data)
if err != nil {
return fmt.Sprintf("[%d]: %s\n%v", r.Code, r.Message, data)
if err == nil && r.Data != nil {
return fmt.Sprintf("[%d]: %s\n%s", r.Code, r.Message, data)
}
return fmt.Sprintf("[%d]: %s", r.Code, r.Message)
}
Expand Down
43 changes: 43 additions & 0 deletions tsc/internal/lsp/lsproto/jsonrpc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,49 @@ func TestMarshalMessage(t *testing.T) {
}
}

func TestResponseErrorString(t *testing.T) {
t.Parallel()

tests := []struct {
name string
err *jsonrpc.ResponseError
want string
}{
{
name: "JSON details",
err: &jsonrpc.ResponseError{
Code: jsonrpc.CodeInvalidParams,
Message: "invalid params",
Data: struct {
Details []string `json:"details"`
}{Details: []string{`expected "name"`, "line\nbreak"}},
},
want: "[-32602]: invalid params\n" + `{"details":["expected \"name\"","line\nbreak"]}`,
},
{
name: "nil receiver",
want: "",
},
{
name: "nil data",
err: &jsonrpc.ResponseError{Code: jsonrpc.CodeInternalError, Message: "failed"},
want: "[-32603]: failed",
},
{
name: "unmarshalable data",
err: &jsonrpc.ResponseError{Code: jsonrpc.CodeInternalError, Message: "failed", Data: make(chan int)},
want: "[-32603]: failed",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
assert.Equal(t, tt.err.String(), tt.want)
assert.Equal(t, tt.err.Error(), tt.want)
})
}
}

func BenchmarkMarshalCompletionResponse(b *testing.B) {
items := make([]*CompletionItem, 2000)
for i := range items {
Expand Down
Loading