deps: Bump creachadair/jrpc2 to latest (0.10.0)

go.mod

@@ -4,9 +4,9 @@ go 1.13
 
 require (
  github.com/apparentlymart/go-textseg v1.0.0
- github.com/creachadair/jrpc2 v0.8.1
+ github.com/creachadair/jrpc2 v0.10.0
  github.com/fsnotify/fsnotify v1.4.9
- github.com/google/go-cmp v0.4.0
+ github.com/google/go-cmp v0.4.1
  github.com/hashicorp/go-multierror v1.1.0
  github.com/hashicorp/go-version v1.2.0
  github.com/hashicorp/hcl/v2 v2.5.2-0.20200528183353-fa7c453538de
@@ -21,7 +21,7 @@ require (
  github.com/spf13/afero v1.3.2
  github.com/zclconf/go-cty v1.2.1
  golang.org/x/net v0.0.0-20191009170851-d66e71096ffb
- golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
+ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
  golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 // indirect
 )
 

go.sum

@@ -14,8 +14,8 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310 h1:BUAU3CGlLvorLI26
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/creachadair/jrpc2 v0.8.1 h1:YX27WgtXa9v7g0kn3oYe7gmxt7e5M3miVgEgTXoTqcY=
-github.com/creachadair/jrpc2 v0.8.1/go.mod h1:yMFI6NwXGITWoWDEEdmZESIHp13SAuSkGCTBz9bSGBg=
+github.com/creachadair/jrpc2 v0.10.0 h1:mGfesLMmnbgFBqcbnowkn5CY1DTzl+S7lektnzFvJuE=
+github.com/creachadair/jrpc2 v0.10.0/go.mod h1:+3c/p6ON1SXme/oF6hX4/EODB+GIQ+e7FGPizh27VQQ=
 github.com/creachadair/staticfile v0.1.2/go.mod h1:a3qySzCIXEprDGxk6tSxSI+dBBdLzqeBOMhZ+o2d3pM=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -29,8 +29,8 @@ github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3a
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
@@ -103,8 +103,8 @@ golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

langserver/handlers/did_open.go

@@ -50,7 +50,7 @@ func (lh *logHandler) TextDocumentDidOpen(ctx context.Context, params lsp.DidOpe
  // because we don't gather "init-able folders" in any way
  " You may need to run terraform init"+
  " and reload your editor.", readableDir)
- return jrpc2.ServerPush(ctx, "window/showMessage", lsp.ShowMessageParams{
+ return jrpc2.PushNotify(ctx, "window/showMessage", lsp.ShowMessageParams{
  Type: lsp.MTWarning,
  Message: msg,
  })
@@ -62,7 +62,7 @@ func (lh *logHandler) TextDocumentDidOpen(ctx context.Context, params lsp.DidOpe
  " You can try setting paths to root modules explicitly in settings.",
  readableDir, candidatePaths(rootDir, candidates[1:]),
  candidateDir)
- return jrpc2.ServerPush(ctx, "window/showMessage", lsp.ShowMessageParams{
+ return jrpc2.PushNotify(ctx, "window/showMessage", lsp.ShowMessageParams{
  Type: lsp.MTWarning,
  Message: msg,
  })

langserver/handlers/initialize.go

@@ -74,7 +74,7 @@ func (lh *logHandler) Initialize(ctx context.Context, params lsp.InitializeParam
  return serverCaps, err
  }
  if len(out.UnusedKeys) > 0 {
- jrpc2.ServerPush(ctx, "window/showMessage", &lsp.ShowMessageParams{
+ jrpc2.PushNotify(ctx, "window/showMessage", &lsp.ShowMessageParams{
  Type: lsp.MTWarning,
  Message: fmt.Sprintf("Unknown configuration options: %q", out.UnusedKeys),
  })
@@ -87,7 +87,7 @@ func (lh *logHandler) Initialize(ctx context.Context, params lsp.InitializeParam
  for _, rawPath := range cfgOpts.RootModulePaths {
  rmPath, err := resolvePath(rootDir, rawPath)
  if err != nil {
- jrpc2.ServerPush(ctx, "window/showMessage", &lsp.ShowMessageParams{
+ jrpc2.PushNotify(ctx, "window/showMessage", &lsp.ShowMessageParams{
  Type: lsp.MTWarning,
  Message: fmt.Sprintf("Ignoring root module path %s: %s", rawPath, err),
  })