Merge branch 'main' into string-errs

.version

@@ -1 +1 @@
-0.2.481
+0.2.486

cmd/templ/lspcmd/proxy/diagnosticcache.go

@@ -1,8 +1,9 @@
 package proxy
 
 import (
-	lsp "github.com/a-h/protocol"
 	"sync"
+
+	lsp "github.com/a-h/protocol"
 )
 
 func NewDiagnosticCache() *DiagnosticCache {
@@ -22,20 +23,39 @@ type DiagnosticCache struct {
 	cache map[string]fileDiagnostic
 }
 
+func zeroLengthSliceIfNil(diags []lsp.Diagnostic) []lsp.Diagnostic {
+	if diags == nil {
+		return make([]lsp.Diagnostic, 0)
+	}
+	return diags
+}
+
 func (dc *DiagnosticCache) AddTemplDiagnostics(uri string, goDiagnostics []lsp.Diagnostic) []lsp.Diagnostic {
+	goDiagnostics = zeroLengthSliceIfNil(goDiagnostics)
 	dc.m.Lock()
 	defer dc.m.Unlock()
 	diag := dc.cache[uri]
 	diag.goplsDiagnostics = goDiagnostics
+	diag.templDiagnostics = zeroLengthSliceIfNil(diag.templDiagnostics)
 	dc.cache[uri] = diag
 	return append(diag.templDiagnostics, goDiagnostics...)
 }
 
+func (dc *DiagnosticCache) ClearTemplDiagnostics(uri string) {
+	dc.m.Lock()
+	defer dc.m.Unlock()
+	diag := dc.cache[uri]
+	diag.templDiagnostics = make([]lsp.Diagnostic, 0)
+	dc.cache[uri] = diag
+}
+
 func (dc *DiagnosticCache) AddGoDiagnostics(uri string, templDiagnostics []lsp.Diagnostic) []lsp.Diagnostic {
+	templDiagnostics = zeroLengthSliceIfNil(templDiagnostics)
 	dc.m.Lock()
 	defer dc.m.Unlock()
 	diag := dc.cache[uri]
 	diag.templDiagnostics = templDiagnostics
+	diag.goplsDiagnostics = zeroLengthSliceIfNil(diag.goplsDiagnostics)
 	dc.cache[uri] = diag
 	return append(diag.goplsDiagnostics, templDiagnostics...)
 }

cmd/templ/lspcmd/proxy/server.go

@@ -182,9 +182,11 @@ func (p *Server) parseTemplate(ctx context.Context, uri uri.URI, templateText st
 		return
 	}
 	// Clear templ diagnostics.
+	p.DiagnosticCache.ClearTemplDiagnostics(string(uri))
 	err = p.Client.PublishDiagnostics(ctx, &lsp.PublishDiagnosticsParams{
-		URI:         uri,
-		Diagnostics: p.DiagnosticCache.AddGoDiagnostics(string(uri), nil),
+		URI: uri,
+		// Cannot be nil as per https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#publishDiagnosticsParams
+		Diagnostics: []lsp.Diagnostic{},
 	})
 	if err != nil {
 		p.Log.Error("failed to publish diagnostics", zap.Error(err))