fix: order of updating doc to yamlls and local

mrjosh · Oct 14, 2024 · f2f76d4 · f2f76d4
1 parent 90fe288
commit f2f76d4
Show file tree

Hide file tree

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

diff --git a/internal/handler/lang_handler.go b/internal/handler/lang_handler.go
@@ -22,8 +22,8 @@ type LangHandler interface {
 	DidOpen(ctx context.Context, params *lsp.DidOpenTextDocumentParams, helmlsConfig util.HelmlsConfiguration) (err error)
 	// DidSave is called when a document is saved, it must not update the document store
 	DidSave(ctx context.Context, params *lsp.DidSaveTextDocumentParams) (err error)
-	// DidChange is called when a document is changed, it must not update the document store
-	DidChange(ctx context.Context, params *lsp.DidChangeTextDocumentParams) (err error)
+	// PostDidChange is called when a document is changed, it must not update the document store
+	PostDidChange(ctx context.Context, params *lsp.DidChangeTextDocumentParams) (err error)
 
 	Configure(ctx context.Context, helmlsConfig util.HelmlsConfiguration)
 	GetDiagnostics(uri lsp.DocumentURI) []lsp.PublishDiagnosticsParams

diff --git a/internal/handler/template_handler/text_document.go b/internal/handler/template_handler/text_document.go
@@ -32,7 +32,7 @@ func (h *TemplateHandler) DidSave(ctx context.Context, params *lsp.DidSaveTextDo
 	return nil
 }
 
-func (h *TemplateHandler) DidChange(ctx context.Context, params *lsp.DidChangeTextDocumentParams) (err error) {
+func (h *TemplateHandler) PostDidChange(ctx context.Context, params *lsp.DidChangeTextDocumentParams) (err error) {
 	doc, ok := h.documents.GetTemplateDoc(params.TextDocument.URI)
 	if !ok {
 		return errors.New("Could not get document: " + params.TextDocument.URI.Filename())

diff --git a/internal/handler/text_document.go b/internal/handler/text_document.go
@@ -43,17 +43,15 @@ func (h *ServerHandler) DidSave(ctx context.Context, params *lsp.DidSaveTextDocu
 }
 
 func (h *ServerHandler) DidChange(ctx context.Context, params *lsp.DidChangeTextDocumentParams) (err error) {
-	handler, err := h.selectLangHandler(ctx, params.TextDocument.URI)
-	handler.DidChange(ctx, params)
-
 	doc, ok := h.documents.GetSyncDocument(params.TextDocument.URI)
 	if !ok {
 		return errors.New("Could not get document: " + params.TextDocument.URI.Filename())
 	}
 	// Synchronise changes into the doc's ContentChanges
 	doc.ApplyChanges(params.ContentChanges)
 
-	return nil
+	handler, err := h.selectLangHandler(ctx, params.TextDocument.URI)
+	return handler.DidChange(ctx, params)
 }
 
 func (h *ServerHandler) DidCreateFiles(ctx context.Context, params *lsp.CreateFilesParams) (err error) {

diff --git a/internal/handler/yaml_handler/text_document.go b/internal/handler/yaml_handler/text_document.go
@@ -8,7 +8,7 @@ import (
 )
 
 // DidChange implements handler.LangHandler.
-func (h *YamlHandler) DidChange(ctx context.Context, params *protocol.DidChangeTextDocumentParams) (err error) {
+func (h *YamlHandler) PostDidChange(ctx context.Context, params *protocol.DidChangeTextDocumentParams) (err error) {
 	panic("unimplemented")
 }