Fix crash and allow all ymllls configs

mrjosh · Nov 12, 2023 · 9d50cb7 · 9d50cb7
1 parent fb302a7
commit 9d50cb7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/internal/adapter/yamlls/documentSync.go b/internal/adapter/yamlls/documentSync.go
@@ -10,6 +10,9 @@ import (
 )
 
 func (yamllsConnector YamllsConnector) InitiallySyncOpenDocuments() {
+	if yamllsConnector.Conn == nil {
+		return
+	}
 	for _, doc := range yamllsConnector.documents.GetAllDocs() {
 		yamllsConnector.DocumentDidOpen(doc.Ast, lsp.DidOpenTextDocumentParams{
 			TextDocument: lsp.TextDocumentItem{

diff --git a/internal/util/config.go b/internal/util/config.go
@@ -13,8 +13,8 @@ type YamllsConfiguration struct {
 	// if set to false diagnostics will only be shown after saving the file
 	// otherwise writing a template will cause a lot of diagnostics to be shown because
 	// the structure of the document is broken during typing
-	ShowDiagnosticsDirectly bool           `json:"showDiagnosticsDirectly,omitempty"`
-	YamllsSettings          YamllsSettings `json:"config,omitempty"`
+	ShowDiagnosticsDirectly bool        `json:"showDiagnosticsDirectly,omitempty"`
+	YamllsSettings          interface{} `json:"config,omitempty"`
 }
 
 var DefaultConfig = HelmlsConfiguration{