feat: rework diagnostics

mrjosh · May 11, 2024 · 1077299 · 1077299
1 parent 46aaa98
commit 1077299
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/internal/adapter/yamlls/documentSync.go b/internal/adapter/yamlls/documentSync.go
@@ -91,7 +91,7 @@ func (yamllsConnector Connector) DocumentDidChangeFullSync(doc *lsplocal.Documen
 		return
 	}
 
-	logger.Println("Sending DocumentDidChange with full sync, current content:", doc.Content)
+	logger.Debug("Sending DocumentDidChange with full sync, current content:", doc.Content)
 	trimmedText := lsplocal.TrimTemplate(doc.Ast.Copy(), doc.Content)
 
 	params.ContentChanges = []lsp.TextDocumentContentChangeEvent{

diff --git a/internal/handler/text_document.go b/internal/handler/text_document.go
@@ -28,9 +28,16 @@ func (h *langHandler) DidOpen(ctx context.Context, params *lsp.DidOpenTextDocume
 	if err != nil {
 		logger.Error("Error getting chart info for file", doc.URI, err)
 	}
-	notification := lsplocal.GetDiagnosticsNotification(chart, doc)
+	notifications := lsplocal.GetDiagnosticsNotifications(chart, doc)
 
-	return h.client.PublishDiagnostics(ctx, notification)
+	defer func() {
+		for _, notification := range notifications {
+			logger.Println("Publishing", notification)
+			h.client.PublishDiagnostics(ctx, &notification)
+		}
+	}()
+
+	return nil
 }
 
 func (h *langHandler) DidClose(ctx context.Context, params *lsp.DidCloseTextDocumentParams) (err error) {
@@ -48,9 +55,16 @@ func (h *langHandler) DidSave(ctx context.Context, params *lsp.DidSaveTextDocume
 	}
 
 	h.yamllsConnector.DocumentDidSave(doc, *params)
-	notification := lsplocal.GetDiagnosticsNotification(chart, doc)
+	notifications := lsplocal.GetDiagnosticsNotifications(chart, doc)
 
-	return h.client.PublishDiagnostics(ctx, notification)
+	defer func() {
+		for _, notification := range notifications {
+			logger.Println("Publishing", notification)
+			h.client.PublishDiagnostics(ctx, &notification)
+		}
+	}()
+
+	return nil
 }
 
 func (h *langHandler) DidChange(ctx context.Context, params *lsp.DidChangeTextDocumentParams) (err error) {