From cb341fd2424a8d96234afb2c9a220e61a68405fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Oct 2021 15:10:42 +0000 Subject: [PATCH 1/2] build(deps): bump github.com/creachadair/jrpc2 from 0.26.1 to 0.27.0 Bumps [github.com/creachadair/jrpc2](https://github.com/creachadair/jrpc2) from 0.26.1 to 0.27.0. - [Release notes](https://github.com/creachadair/jrpc2/releases) - [Commits](https://github.com/creachadair/jrpc2/compare/v0.26.1...v0.27.0) --- updated-dependencies: - dependency-name: github.com/creachadair/jrpc2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index d94ec6ce..cbabd131 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.13 require ( github.com/agext/levenshtein v1.2.2 // indirect github.com/apparentlymart/go-textseg v1.0.0 - github.com/creachadair/jrpc2 v0.26.1 + github.com/creachadair/jrpc2 v0.27.0 github.com/fsnotify/fsnotify v1.5.1 github.com/google/go-cmp v0.5.6 github.com/google/uuid v1.2.0 // indirect diff --git a/go.sum b/go.sum index 88d78615..1e056fc0 100644 --- a/go.sum +++ b/go.sum @@ -73,8 +73,8 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/creachadair/jrpc2 v0.26.1 h1:5i6kkw2hmeocwwFHjNkiQ6jePMufdhcfWOlV6ACU5y8= -github.com/creachadair/jrpc2 v0.26.1/go.mod h1:w+GXZGc+NwsH0xsUOgeLBIIRM0jBOSTXhv28KaWGRZU= +github.com/creachadair/jrpc2 v0.27.0 h1:QzDp+Zrq+JKM21qQblLudnxevzQZ0FrcPDIVQzcgErs= +github.com/creachadair/jrpc2 v0.27.0/go.mod h1:w+GXZGc+NwsH0xsUOgeLBIIRM0jBOSTXhv28KaWGRZU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= @@ -191,10 +191,6 @@ github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/hcl-lang v0.0.0-20210803155453-7c098e4940bc/go.mod h1:xzXU6Fn+TWVaZUFxV8CyAsObi2oMgSEFAmLvCx2ArzM= -github.com/hashicorp/hcl-lang v0.0.0-20210824132129-4bf451bad31e h1:RJJCsEHFbEh3GByXTyKvNVMRN8VRVOWd45WQfb5oddQ= -github.com/hashicorp/hcl-lang v0.0.0-20210824132129-4bf451bad31e/go.mod h1:D7lBT7dekCcgbxzIHHBFvaRm42u5jY0pDoiC2J6A2KM= -github.com/hashicorp/hcl-lang v0.0.0-20211006152007-86c2c237ce8d h1:5v9AxvjOjmen1wYFD1x2LpsY7d8YZSSPwYa8ahLY5bM= -github.com/hashicorp/hcl-lang v0.0.0-20211006152007-86c2c237ce8d/go.mod h1:D7lBT7dekCcgbxzIHHBFvaRm42u5jY0pDoiC2J6A2KM= github.com/hashicorp/hcl-lang v0.0.0-20211007132635-f22d3c2adf6c h1:98h0kdFx2qqS8lMAbGxR+b/HO3d52NdJsIgzG6Ikucg= github.com/hashicorp/hcl-lang v0.0.0-20211007132635-f22d3c2adf6c/go.mod h1:D7lBT7dekCcgbxzIHHBFvaRm42u5jY0pDoiC2J6A2KM= github.com/hashicorp/hcl/v2 v2.10.1 h1:h4Xx4fsrRE26ohAk/1iGF/JBqRQbyUqu5Lvj60U54ys= From 07ce11083f4d42e5662deaf42c70df0cac7fd092 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Mon, 11 Oct 2021 10:32:57 +0100 Subject: [PATCH 2/2] update to reflect upstream interface changes https://github.com/creachadair/jrpc2/commit/31ce9d5f4c47765e4376c38bff3f7be4cae75791 --- internal/langserver/langserver.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/langserver/langserver.go b/internal/langserver/langserver.go index b89b8657..6acb11eb 100644 --- a/internal/langserver/langserver.go +++ b/internal/langserver/langserver.go @@ -121,10 +121,11 @@ func (ls *langServer) StartTCP(address string) error { } ls.logger.Printf("TCP server running at %q", lst.Addr()) + accepter := server.NetAccepter(lst, channel.LSP) + go func() { ls.logger.Println("Starting loop server ...") - err = server.Loop(lst, ls.newService, &server.LoopOptions{ - Framing: channel.LSP, + err = server.Loop(accepter, ls.newService, &server.LoopOptions{ ServerOptions: ls.srvOptions, }) if err != nil {