wip

hashicorp · Feb 2, 2022 · c73ed71 · c73ed71
1 parent 55d1c08
commit c73ed71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/internal/langserver/handlers/initialize.go b/internal/langserver/handlers/initialize.go
@@ -157,8 +157,6 @@ func (svc *service) Initialize(ctx context.Context, params lsp.InitializeParams)
 
 	serverCaps.Capabilities.SemanticTokensProvider = semanticTokensOpts
 
-	svc.jrpcSvr = jrpc2.ServerFromContext(ctx)
-
 	// set commandPrefix for session
 	lsctx.SetCommandPrefix(ctx, out.Options.CommandPrefix)
 	// apply prefix to executeCommand handler names

diff --git a/internal/langserver/handlers/service.go b/internal/langserver/handlers/service.go
@@ -55,8 +55,6 @@ type service struct {
 	server           session.Server
 	diagsNotifier    *diagnostics.Notifier
 
-	jrpcSvr *jrpc2.Server
-
 	additionalHandlers map[string]rpch.Func
 }
 
@@ -450,10 +448,11 @@ func (svc *service) configureSessionDependencies(ctx context.Context, cfgOpts *s
 		sendModuleTelemetry(svc.sessCtx, svc.stateStore, svc.telemetry),
 		func(_, newMod *state.Module) {
 			svc.logger.Printf("Sending refresh notification for %s", newMod.Path)
-			_, err := svc.jrpcSvr.Callback(svc.srvCtx, "workspace/semanticTokens/refresh", nil)
+			_, err := jrpc2.ServerFromContext(ctx).Callback(svc.srvCtx, "workspace/semanticTokens/refresh", nil)
 			if err != nil {
 				svc.logger.Printf("Error refreshing %s: %s", newMod.Path, err)
 			}
+			svc.logger.Printf("Sending refresh notification for %s", newMod.Path)
 		},
 	}