feat(values): support values of dependecy-charts (wip)

internal/charts/chart.go

@@ -60,24 +60,52 @@ type QueriedValuesFiles struct {
 // ResolveValueFiles returns a list of all values files in the chart
 // and all parent charts if the query tries to access global values
 func (c *Chart) ResolveValueFiles(query []string, chartStore *ChartStore) []*QueriedValuesFiles {
-	ownResult := []*QueriedValuesFiles{{Selector: query, ValuesFiles: c.ValuesFiles}}
+	logger.Debug(fmt.Sprintf("Resolving values files for %s with query %s", c.HelmChart.Name(), query))
+	result := []*QueriedValuesFiles{{Selector: query, ValuesFiles: c.ValuesFiles}}
 	if len(query) == 0 {
-		return ownResult
+		return result
+	}
+
+	for _, dependency := range c.HelmChart.Dependencies() {
+		logger.Debug(fmt.Sprintf("Resolving dependency %s with query %s", dependency.Name(), query))
+		if dependency.Name() == query[0] {
+
+			subQuery := []string{}
+			if len(query) > 1 {
+				subQuery = query[1:]
+			}
+
+			valueNode, error := util.ValuesToYamlNode(dependency.Values)
+			if error != nil {
+				logger.Error(fmt.Sprintf("Error loading values file %s: %s", dependency.Name(), error.Error()))
+				continue
+			}
+
+			result = append(result,
+				// TODO: should we do this now? or should we create a chart in the store for each dependency
+				&QueriedValuesFiles{Selector: subQuery, ValuesFiles: &ValuesFiles{
+					MainValuesFile: &ValuesFile{
+						Values:    dependency.Values,
+						ValueNode: valueNode,
+						URI:       uri.File(dependency.ChartPath()), // TODO: Fix this, chartPath is not a file path but something like chartNameA.common
+					},
+				}})
+		}
 	}
 
 	parentChart := c.ParentChart.GetParentChart(chartStore)
 	if parentChart == nil {
-		return ownResult
+		return result
 	}
 
 	if query[0] == "global" {
-		return append(ownResult,
+		return append(result,
 			parentChart.ResolveValueFiles(query, chartStore)...)
 	}
 
 	chartName := c.ChartMetadata.Metadata.Name
 	extendedQuery := append([]string{chartName}, query...)
-	return append(ownResult,
+	return append(result,
 		parentChart.ResolveValueFiles(extendedQuery, chartStore)...)
 }
 

internal/handler/text_document.go

@@ -3,6 +3,7 @@ package handler
 import (
 	"context"
 	"errors"
+	"fmt"
 	"path/filepath"
 
 	"github.com/mrjosh/helm-ls/internal/charts"
@@ -106,6 +107,7 @@ func (h *langHandler) LoadDocsOnNewChart(chart *charts.Chart) {
 		h.documents.Store(filepath.Join(chart.RootURI.Filename(), file.Name), file.Data, h.helmlsConfig)
 	}
 	for _, file := range chart.GetDependeciesTemplates() {
+		logger.Debug(fmt.Sprintf("Storing dependency %s", file.Path))
 		h.documents.Store(file.Path, file.Content, h.helmlsConfig)
 	}
 }

internal/lsp/document.go

@@ -47,7 +47,7 @@ func (d *Document) ApplyChanges(changes []lsp.TextDocumentContentChangeEvent) {
 	d.Content = string(content)
 
 	d.ApplyChangesToAst(d.Content)
-	d.SymbolTable = NewSymbolTable(d.Ast, []byte(d.Content))
+	d.SymbolTable = NewSymbolTable(d.Ast, content)
 
 	d.lines = nil
 }

internal/lsp/document_store.go

@@ -49,7 +49,7 @@ func (s *DocumentStore) DidOpen(params *lsp.DidOpenTextDocumentParams, helmlsCon
 	return doc, nil
 }
 
-func (s *DocumentStore) Store(filename string, content []byte, helmlsConfig util.HelmlsConfiguration) error {
+func (s *DocumentStore) Store(filename string, content []byte, helmlsConfig util.HelmlsConfiguration) {
 	ast := ParseAst(nil, string(content))
 	s.documents.Store(filename,
 		&Document{
@@ -62,7 +62,6 @@ func (s *DocumentStore) Store(filename string, content []byte, helmlsConfig util
 			SymbolTable:      NewSymbolTable(ast, content),
 		},
 	)
-	return nil
 }
 
 func (s *DocumentStore) Get(docuri uri.URI) (*Document, bool) {

internal/util/yaml.go

@@ -7,6 +7,7 @@ import (
 
 	lsp "go.lsp.dev/protocol"
 	yamlv3 "gopkg.in/yaml.v3"
+	"helm.sh/helm/v3/pkg/chartutil"
 )
 
 func GetPositionOfNode(node *yamlv3.Node, query []string) (lsp.Position, error) {
@@ -85,3 +86,12 @@ func ReadYamlFileToNode(filename string) (node yamlv3.Node, err error) {
 	err = yamlv3.Unmarshal(data, &node)
 	return node, err
 }
+
+func ValuesToYamlNode(values chartutil.Values) (node yamlv3.Node, err error) {
+	yaml, error := values.YAML()
+	if error != nil {
+		return yamlv3.Node{}, error
+	}
+	err = yamlv3.Unmarshal([]byte(yaml), &node)
+	return node, err
+}