From 731f5ed3464cbd5b605f1cc34b526ff09d70f112 Mon Sep 17 00:00:00 2001 From: polinasok <51177946+polinasok@users.noreply.github.com> Date: Fri, 4 Dec 2020 08:58:55 -0800 Subject: [PATCH] go.mod: update google/go-dap to 0.4.0 (#2248) Co-authored-by: Polina Sokolova --- go.mod | 2 +- go.sum | 2 ++ vendor/github.com/google/go-dap/.travis.yml | 2 +- .../github.com/google/go-dap/schematypes.go | 23 ++++++++++++------- vendor/modules.txt | 2 +- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 06b2af29..fed3c715 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/cosiner/argv v0.1.0 github.com/cpuguy83/go-md2man v1.0.10 // indirect github.com/creack/pty v1.1.9 - github.com/google/go-dap v0.3.0 + github.com/google/go-dap v0.4.0 github.com/hashicorp/golang-lru v0.5.4 github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/mattn/go-colorable v0.0.0-20170327083344-ded68f7a9561 diff --git a/go.sum b/go.sum index bc95a8a6..d24b4547 100644 --- a/go.sum +++ b/go.sum @@ -16,6 +16,8 @@ github.com/google/go-dap v0.2.0 h1:whjIGQRumwbR40qRU7CEKuFLmePUUc2s4Nt9DoXXxWk= github.com/google/go-dap v0.2.0/go.mod h1:5q8aYQFnHOAZEMP+6vmq25HKYAEwE+LF5yh7JKrrhSQ= github.com/google/go-dap v0.3.0 h1:Dc4izN0u4VhZERYrz80f1PSEoDsVfdVmdM/W82CxzFk= github.com/google/go-dap v0.3.0/go.mod h1:5q8aYQFnHOAZEMP+6vmq25HKYAEwE+LF5yh7JKrrhSQ= +github.com/google/go-dap v0.4.0 h1:bWSjcM9zp/jEFD4YbWERcHSed8vHbEdk0rmTvqgXDAs= +github.com/google/go-dap v0.4.0/go.mod h1:5q8aYQFnHOAZEMP+6vmq25HKYAEwE+LF5yh7JKrrhSQ= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= diff --git a/vendor/github.com/google/go-dap/.travis.yml b/vendor/github.com/google/go-dap/.travis.yml index f976928d..f793df89 100644 --- a/vendor/github.com/google/go-dap/.travis.yml +++ b/vendor/github.com/google/go-dap/.travis.yml @@ -4,8 +4,8 @@ language: go go: - - 1.13.x - 1.14.x + - 1.15.x env: global: diff --git a/vendor/github.com/google/go-dap/schematypes.go b/vendor/github.com/google/go-dap/schematypes.go index 369d7a2d..fcd6f61a 100644 --- a/vendor/github.com/google/go-dap/schematypes.go +++ b/vendor/github.com/google/go-dap/schematypes.go @@ -49,6 +49,16 @@ type EventMessage interface { GetEvent() *Event } +// LaunchAttachRequest is an interface implemented by +// LaunchRequest and AttachRequest as they contain shared +// implementation specific arguments that are not part of +// the specification. +type LaunchAttachRequest interface { + RequestMessage + // GetArguments provides access to the Arguments map. + GetArguments() map[string]interface{} +} + // ProtocolMessage: Base class of requests, responses, and events. type ProtocolMessage struct { Seq int `json:"seq"` @@ -466,7 +476,8 @@ type LaunchRequest struct { Arguments map[string]interface{} `json:"arguments"` } -func (r *LaunchRequest) GetRequest() *Request { return &r.Request } +func (r *LaunchRequest) GetRequest() *Request { return &r.Request } +func (r *LaunchRequest) GetArguments() map[string]interface{} { return r.Arguments } // LaunchResponse: Response to 'launch' request. This is just an acknowledgement, so no body field is required. type LaunchResponse struct { @@ -480,15 +491,11 @@ func (r *LaunchResponse) GetResponse() *Response { return &r.Response } type AttachRequest struct { Request - Arguments AttachRequestArguments `json:"arguments"` + Arguments map[string]interface{} `json:"arguments"` } -func (r *AttachRequest) GetRequest() *Request { return &r.Request } - -// AttachRequestArguments: Arguments for 'attach' request. Additional attributes are implementation specific. -type AttachRequestArguments struct { - Restart interface{} `json:"__restart,omitempty"` -} +func (r *AttachRequest) GetRequest() *Request { return &r.Request } +func (r *AttachRequest) GetArguments() map[string]interface{} { return r.Arguments } // AttachResponse: Response to 'attach' request. This is just an acknowledgement, so no body field is required. type AttachResponse struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index c2c71726..1d945805 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -4,7 +4,7 @@ github.com/cosiner/argv github.com/cpuguy83/go-md2man/md2man # github.com/creack/pty v1.1.9 github.com/creack/pty -# github.com/google/go-dap v0.3.0 +# github.com/google/go-dap v0.4.0 github.com/google/go-dap # github.com/hashicorp/golang-lru v0.5.4 github.com/hashicorp/golang-lru/simplelru