feat: post to language server from log stream

buildengine/engine.go

@@ -30,8 +30,6 @@ type schemaChange struct {
 }
 
 type Listener struct {
-	OnBuildComplete  func(project Project, err error)
-	OnDeployComplete func(project Project, err error)
 }
 
 // Engine for building a set of modules.
@@ -370,9 +368,6 @@ func (e *Engine) buildAndDeploy(ctx context.Context, replicas int32, waitForDepl
 					}
 					if module, ok := project.(Module); ok {
 						err := Deploy(ctx, module, replicas, waitForDeployOnline, e.client)
-						if e.listener != nil && e.listener.OnDeployComplete != nil {
-							e.listener.OnDeployComplete(project, err)
-						}
 						if err != nil {
 							return err
 						}
@@ -474,9 +469,6 @@ func (e *Engine) build(ctx context.Context, key ProjectKey, builtModules map[str
 	sch := &schema.Schema{Modules: maps.Values(combined)}
 
 	err := Build(ctx, sch, project)
-	if e.listener != nil && e.listener.OnBuildComplete != nil {
-		e.listener.OnBuildComplete(project, err)
-	}
 	if err != nil {
 		return err
 	}

cmd/ftl/cmd_dev.go

@@ -10,6 +10,7 @@ import (
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
 	"github.com/TBD54566975/ftl/buildengine"
 	"github.com/TBD54566975/ftl/common/projectconfig"
+	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/rpc"
 	"github.com/TBD54566975/ftl/lsp"
 )
@@ -62,15 +63,11 @@ func (d *devCmd) Run(ctx context.Context, projConfig projectconfig.Config) error
 		var listener *buildengine.Listener
 		if d.RunLsp {
 			d.languageServer = lsp.NewServer(ctx)
-			listener = &buildengine.Listener{
-				OnBuildComplete:  d.OnBuildComplete,
-				OnDeployComplete: d.OnDeployComplete,
-			}
+			ctx = log.ContextWithLogger(ctx, log.FromContext(ctx).AddSink(lsp.NewLogSink(d.languageServer)))
 			g.Go(func() error {
 				return d.languageServer.Run()
 			})
 		}
-
 		engine, err := buildengine.New(ctx, client, d.Dirs, d.External, buildengine.Parallelism(d.Parallelism), buildengine.WithListener(listener))
 		if err != nil {
 			return err
@@ -80,11 +77,3 @@ func (d *devCmd) Run(ctx context.Context, projConfig projectconfig.Config) error
 
 	return g.Wait()
 }
-
-func (d *devCmd) OnBuildComplete(project buildengine.Project, err error) {
-	d.languageServer.BuildComplete(project.Config().Dir, err)
-}
-
-func (d *devCmd) OnDeployComplete(project buildengine.Project, err error) {
-	d.languageServer.DeployComplete(project.Config().Dir, err)
-}

lsp/logger.go

@@ -65,3 +65,20 @@ func toGLSPLevel(l log.Level) commonlog.Level {
 		return commonlog.Debug
 	}
 }
+
+type LogSink struct {
+	server *Server
+}
+
+var _ log.Sink = (*LogSink)(nil)
+
+func NewLogSink(server *Server) *LogSink {
+	return &LogSink{server: server}
+}
+
+func (l *LogSink) Log(entry log.Entry) error {
+	if entry.Level == log.Error {
+		l.server.post(entry.Error)
+	}
+	return nil
+}

lsp/lsp.go

@@ -43,8 +43,6 @@ func NewServer(ctx context.Context) *Server {
 		logger:     *log.FromContext(ctx),
 	}
 	handler.Initialize = server.initialize()
-	// handler.TextDocumentDidOpen = server.textDocumentDidOpen()
-	handler.TextDocumentDidChange = server.textDocumentDidChange()
 	return server
 }
 
@@ -58,18 +56,6 @@ func (s *Server) Run() error {
 
 type errSet map[string]schema.Error
 
-func (s *Server) BuildComplete(dir string, err error) {
-	if err != nil {
-		s.post(err)
-	}
-}
-
-func (s *Server) DeployComplete(dir string, err error) {
-	if err != nil {
-		s.post(err)
-	}
-}
-
 // Post sends diagnostics to the client. err must be joined schema.Errors.
 func (s *Server) post(err error) {
 	errByFilename := make(map[string]errSet)
@@ -137,14 +123,6 @@ func (s *Server) initialize() protocol.InitializeFunc {
 		}, nil
 	}
 }
-
-func (s *Server) textDocumentDidChange() protocol.TextDocumentDidChangeFunc {
-	return func(context *glsp.Context, params *protocol.DidChangeTextDocumentParams) error {
-		// s.refreshDiagnosticsOfDocument(params.TextDocument.URI)
-		return nil
-	}
-}
-
 func (s *Server) clearDiagnosticsOfDocument(uri protocol.DocumentUri) {
 	go func() {
 		go s.glspContext.Notify(protocol.ServerTextDocumentPublishDiagnostics, protocol.PublishDiagnosticsParams{