Use bufbuild/protocompile#669 in LSP

Ref: bufbuild/protocompile#669

Author: stefanvanburen

go.mod

@@ -16,7 +16,7 @@ require (
 	buf.build/go/standard v0.1.0
 	connectrpc.com/connect v1.19.1
 	connectrpc.com/otelconnect v0.9.0
-	github.com/bufbuild/protocompile v0.14.2-0.20260225215724-b8c2e2d4ce33
+	github.com/bufbuild/protocompile v0.14.2-0.20260303192457-6802ddf78c43
 	github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1
 	github.com/cli/browser v1.3.0
 	github.com/docker/docker v28.5.2+incompatible

go.sum

@@ -42,8 +42,8 @@ github.com/bmatcuk/doublestar/v4 v4.10.0 h1:zU9WiOla1YA122oLM6i4EXvGW62DvKZVxIe6
 github.com/bmatcuk/doublestar/v4 v4.10.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/brianvoe/gofakeit/v6 v6.28.0 h1:Xib46XXuQfmlLS2EXRuJpqcw8St6qSZz75OUo0tgAW4=
 github.com/brianvoe/gofakeit/v6 v6.28.0/go.mod h1:Xj58BMSnFqcn/fAQeSK+/PLtC5kSb7FJIq4JyGa8vEs=
-github.com/bufbuild/protocompile v0.14.2-0.20260225215724-b8c2e2d4ce33 h1:dyIXDSlRi5GYc+sAuasCGnmFOZS09rAShVnMiw+2c3E=
-github.com/bufbuild/protocompile v0.14.2-0.20260225215724-b8c2e2d4ce33/go.mod h1:cxhE8h+14t0Yxq2H9MV/UggzQ1L0gh0t2tJobITWsBE=
+github.com/bufbuild/protocompile v0.14.2-0.20260303192457-6802ddf78c43 h1:uI2QIsBGmJ2iTqH0x5kY+dpm+hbSw/9O1LDardylU/0=
+github.com/bufbuild/protocompile v0.14.2-0.20260303192457-6802ddf78c43/go.mod h1:cxhE8h+14t0Yxq2H9MV/UggzQ1L0gh0t2tJobITWsBE=
 github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1 h1:V1xulAoqLqVg44rY97xOR+mQpD2N+GzhMHVwJ030WEU=
 github.com/bufbuild/protoplugin v0.0.0-20250218205857-750e09ce93e1/go.mod h1:c5D8gWRIZ2HLWO3gXYTtUfw/hbJyD8xikv2ooPxnklQ=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=

private/buf/buflsp/file.go

@@ -234,6 +234,7 @@ func (f *file) RefreshIR(ctx context.Context) {
 	// Opener creates a cached view of all files in the workspace.
 	pathToFiles := f.workspace.PathToFile()
 	files := make([]*file, 0, len(pathToFiles))
+	paths := make([]string, 0, len(pathToFiles))
 	var evictQueryKeys []any
 
 	openerMap := f.lsp.opener.Get()
@@ -249,6 +250,7 @@ func (f *file) RefreshIR(ctx context.Context) {
 			}
 		}
 		files = append(files, file)
+		paths = append(paths, path)
 	}
 	// Remove paths that are no longer in the current workspace and evict stale query keys.
 	for path := range openerMap {
@@ -258,14 +260,14 @@ func (f *file) RefreshIR(ctx context.Context) {
 	}
 	f.lsp.queryExecutor.Evict(evictQueryKeys...)
 
-	queries := xslices.Map(files, func(file *file) incremental.Query[*ir.File] {
-		return file.queryIR()
-	})
-
 	results, diagnosticReport, err := incremental.Run(
 		ctx,
 		f.lsp.queryExecutor,
-		queries...,
+		queries.Workspace{
+			Opener:    f.lsp.opener,
+			Session:   f.lsp.irSession,
+			Workspace: source.NewWorkspace(paths),
+		},
 	)
 	if err != nil {
 		f.lsp.logger.Error(
@@ -276,8 +278,9 @@ func (f *file) RefreshIR(ctx context.Context) {
 		)
 		return
 	}
+	irFiles := results[0].Value
 	for i, file := range files {
-		file.ir = results[i].Value
+		file.ir = irFiles[i]
 		if f != file {
 			// Update symbols for imports.
 			file.IndexSymbols(ctx)
@@ -298,18 +301,6 @@ func (f *file) RefreshIR(ctx context.Context) {
 	)
 }
 
-// queryIR returns the [queries.IR] for the current file.
-func (f *file) queryIR() incremental.Query[*ir.File] {
-	if f.objectInfo == nil {
-		return nil
-	}
-	return queries.IR{
-		Opener:  f.lsp.opener,
-		Path:    f.objectInfo.Path(),
-		Session: f.lsp.irSession,
-	}
-}
-
 // queryFileKeys returns the keys for [queries.File] with ReportError set to true and false.
 // This is because [queries.AST] depends on ReportError set to true and [queries.IR] depends
 // on ReportError set to false, so we need both keys when evicting cached [queries.File]