laravel-ls/jsonrpc2
1
0
Fork 0
mirror of https://github.com/sourcegraph/jsonrpc2.git synced 2026-07-04 16:23:41 +02:00
Code Issues Releases Wiki Activity

propagate JSON "null" result instead of treating it as Go nil (and field-not-present in JSON)

Browse source
This commit is contained in:
Quinn Slack 2017-01-22 16:05:00 -08:00
parent a61d8f7bd7
commit 64d0b93a7a
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
jsonrpc2.go
View file

@ -377,7 +377,10 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
if err != nil { if err != nil {
return err return err
} }
if result != nil && call.response.Result != nil { if result != nil {
if call.response.Result == nil {
call.response.Result = &jsonNull
}
// TODO(sqs): error handling // TODO(sqs): error handling
if err := json.Unmarshal(*call.response.Result, result); err != nil { if err := json.Unmarshal(*call.response.Result, result); err != nil {
return err return err
@ -390,6 +393,8 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
} }
} }
var jsonNull = json.RawMessage("null")
// Notify is like Call, but it returns when the notification request // Notify is like Call, but it returns when the notification request
// is sent (without waiting for a response, because JSON-RPC // is sent (without waiting for a response, because JSON-RPC
// notifications do not have responses). // notifications do not have responses).
@ -595,7 +600,13 @@ func (m *anyMessage) UnmarshalJSON(data []byte) error {
case !isRequest && isResponse: case !isRequest && isResponse:
v = &m.response v = &m.response
} }
return json.Unmarshal(data, v) if err := json.Unmarshal(data, v); err != nil {
return err
}
if !isRequest && isResponse && m.response.Error == nil && m.response.Result == nil {
m.response.Result = &jsonNull
}
return nil
} }
// anyValueWithExplicitNull is used to distinguish {} from // anyValueWithExplicitNull is used to distinguish {} from

5
object_test.go
View file

@ -36,6 +36,7 @@ func TestAnyMessage(t *testing.T) {
} }
func TestMessageCodec(t *testing.T) { func TestMessageCodec(t *testing.T) {
obj := json.RawMessage(`{"foo":"bar"}`)
tests := []struct { tests := []struct {
v, vempty interface{} v, vempty interface{}
}{ }{
@ -44,8 +45,8 @@ func TestMessageCodec(t *testing.T) {
vempty: &Request{ID: ID{Num: 123}}, vempty: &Request{ID: ID{Num: 123}},
}, },
{ {
v: &Response{ID: ID{Num: 123}}, v: &Response{ID: ID{Num: 123}, Result: &obj},
vempty: &Response{ID: ID{Num: 123}}, vempty: &Response{ID: ID{Num: 123}, Result: &obj},
}, },
} }
for _, test := range tests { for _, test := range tests {