reflect breaking API changes

hashicorp · Jul 8, 2021 · 11d551c · 11d551c
1 parent 3cca140
commit 11d551c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/internal/langserver/handlers/service.go b/internal/langserver/handlers/service.go
@@ -416,7 +416,7 @@ func (svc *service) Assigner() (jrpc2.Assigner, error) {
 	return convertMap(m), nil
 }
 
-func (svc *service) Finish(status jrpc2.ServerStatus) {
+func (svc *service) Finish(_ jrpc2.Assigner, status jrpc2.ServerStatus) {
 	if status.Closed() || status.Err != nil {
 		svc.logger.Printf("session stopped unexpectedly (err: %v)", status.Err)
 	}

diff --git a/internal/langserver/langserver.go b/internal/langserver/langserver.go
@@ -149,8 +149,8 @@ func (ls *langServer) StartTCP(address string) error {
 // singleServer is a wrapper around jrpc2.NewServer providing support
 // for server.Service (Assigner/Finish interface)
 type singleServer struct {
-	srv        *jrpc2.Server
-	finishFunc func(jrpc2.ServerStatus)
+	srv *jrpc2.Server
+	svc server.Service
 }
 
 func Server(svc server.Service, opts *jrpc2.ServerOptions) (*singleServer, error) {
@@ -160,8 +160,8 @@ func Server(svc server.Service, opts *jrpc2.ServerOptions) (*singleServer, error
 	}
 
 	return &singleServer{
-		srv:        jrpc2.NewServer(assigner, opts),
-		finishFunc: svc.Finish,
+		srv: jrpc2.NewServer(assigner, opts),
+		svc: svc,
 	}, nil
 }
 
@@ -175,8 +175,9 @@ func (ss *singleServer) StartAndWait(ch channel.Channel) {
 }
 
 func (ss *singleServer) Wait() {
+	assigner, _ := ss.svc.Assigner()
 	status := ss.srv.WaitStatus()
-	ss.finishFunc(status)
+	ss.svc.Finish(assigner, status)
 }
 
 func (ss *singleServer) Stop() {

diff --git a/internal/langserver/session/types.go b/internal/langserver/session/types.go
@@ -9,7 +9,7 @@ import (
 
 type Session interface {
 	Assigner() (jrpc2.Assigner, error)
-	Finish(jrpc2.ServerStatus)
+	Finish(jrpc2.Assigner, jrpc2.ServerStatus)
 	SetLogger(*log.Logger)
 }