move SyncToDisk function to interface

internal/adapter/yamlls/diagnostics.go

@@ -2,6 +2,7 @@ package yamlls
 
 import (
 	"context"
+	"fmt"
 	"runtime"
 	"strings"
 
@@ -15,6 +16,7 @@ func (c Connector) PublishDiagnostics(ctx context.Context, params *protocol.Publ
 	doc, ok := c.documents.Get(params.URI)
 	if !ok {
 		logger.Println("Error handling diagnostic. Could not get document: " + params.URI.Filename())
+		return fmt.Errorf("Could not get document: %s", params.URI.Filename())
 	}
 
 	doc.DiagnosticsCache.SetYamlDiagnostics(filterDiagnostics(params.Diagnostics, doc.Ast.Copy(), doc.Content))

internal/charts/dependency_files.go

@@ -0,0 +1,47 @@
+package charts
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+
+	"helm.sh/helm/v3/pkg/chart"
+)
+
+type DependencyTemplateFile struct {
+	Content []byte
+	Path    string
+}
+
+var DependencyCacheFolder = ".helm_ls_cache"
+
+func (c *Chart) NewDependencyTemplateFile(chartName string, file *chart.File) *DependencyTemplateFile {
+	path := filepath.Join(c.RootURI.Filename(), "charts", DependencyCacheFolder, chartName, file.Name)
+
+	return &DependencyTemplateFile{Content: file.Data, Path: path}
+}
+
+type PossibleDependencyFile interface {
+	GetContent() string
+	GetPath() string
+}
+
+// SyncToDisk writes the content of the document to disk if it is a dependency file.
+// If it is a dependency file, it was read from a archive, so we need to write it back,
+// to be able to open it in a editor when using go-to-definition or go-to-reference.
+func SyncToDisk(d PossibleDependencyFile) {
+	if !IsDependencyFile(d) {
+		return
+	}
+	err := os.MkdirAll(filepath.Dir(d.GetPath()), 0o755)
+	if err == nil {
+		err = os.WriteFile(d.GetPath(), []byte(d.GetContent()), 0o444)
+	}
+	if err != nil {
+		logger.Error("Could not write dependency file", d.GetPath(), err)
+	}
+}
+
+func IsDependencyFile(d PossibleDependencyFile) bool {
+	return strings.Contains(d.GetPath(), DependencyCacheFolder)
+}

internal/charts/values_file.go

@@ -59,3 +59,18 @@ func readInValuesFile(filePath string) (chartutil.Values, yaml.Node) {
 	}
 	return vals, valueNodes
 }
+
+// GetContent implements PossibleDependencyFile.
+func (d *ValuesFile) GetContent() string {
+	yaml, err := yaml.Marshal(d.Values)
+	if err != nil {
+		logger.Error(fmt.Sprintf("Could not load values for file %s", d.URI.Filename()), err)
+		return ""
+	}
+	return string(yaml)
+}
+
+// GetPath implements PossibleDependencyFile.
+func (d *ValuesFile) GetPath() string {
+	return d.URI.Filename()
+}

internal/charts/values_file_test.go

@@ -45,3 +45,11 @@ func TestReload(t *testing.T) {
 	assert.Equal(t, "baz", valuesFile.Values["foo"])
 	assert.NotEqual(t, yaml.Node{}, valuesFile.ValueNode)
 }
+
+func TestGetContent(t *testing.T) {
+	tempDir := t.TempDir()
+	valuesContent := `foo: bar\n`
+	_ = os.WriteFile(filepath.Join(tempDir, "values.yaml"), []byte(valuesContent), 0o644)
+	valuesFile := charts.NewValuesFile(filepath.Join(tempDir, "values.yaml"))
+	assert.Equal(t, valuesContent, valuesFile.GetContent())
+}

internal/handler/definition_chart_test.go

@@ -2,6 +2,7 @@ package handler
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -22,6 +23,7 @@ var (
 )
 
 type testCase struct {
+	// Must be content of a line in the file fileURI
 	templateLineWithMarker string
 	expectedFile           string
 	expectedStartPosition  lsp.Position
@@ -42,6 +44,12 @@ func TestDefinitionChart(t *testing.T) {
 			lsp.Position{Line: 35, Character: 0},
 			nil,
 		},
+		{
+			`{{ .Values.gl^obal.subchart }}`,
+			"values.yaml",
+			lsp.Position{Line: 7, Character: 0},
+			nil,
+		},
 	}
 
 	fileContent, err := os.ReadFile(fileURI.Filename())
@@ -51,18 +59,22 @@ func TestDefinitionChart(t *testing.T) {
 	lines := strings.Split(string(fileContent), "\n")
 	for _, tC := range testCases {
 		t.Run("Definition on "+tC.templateLineWithMarker, func(t *testing.T) {
-			pos := getPosition(tC, lines)
+			pos, found := getPosition(tC, lines)
+			if !found {
+				t.Fatal(fmt.Sprintf("%s is not in the file %s", tC.templateLineWithMarker, fileURI.Filename()))
+			}
 
 			documents := lsplocal.NewDocumentStore()
 
-			chart := charts.NewChart(rootUri, util.ValuesFilesConfig{})
+			chart := charts.NewChart(rootUri, util.DefaultConfig.ValuesFilesConfig)
 
 			chartStore := charts.NewChartStore(rootUri, charts.NewChart)
 			chartStore.Charts = map[uri.URI]*charts.Chart{rootUri: chart}
 			h := &langHandler{
 				chartStore:      chartStore,
 				documents:       documents,
 				yamllsConnector: &yamlls.Connector{},
+				helmlsConfig:    util.DefaultConfig,
 			}
 
 			h.LoadDocsOnNewChart(chart)
@@ -90,18 +102,20 @@ func TestDefinitionChart(t *testing.T) {
 	}
 }
 
-func getPosition(tC testCase, lines []string) lsp.Position {
+func getPosition(tC testCase, lines []string) (lsp.Position, bool) {
 	col := strings.Index(tC.templateLineWithMarker, "^")
 	buf := strings.Replace(tC.templateLineWithMarker, "^", "", 1)
 	line := uint32(0)
+	found := false
 
 	for i, v := range lines {
 		if strings.Contains(v, buf) {
+			found = true
 			line = uint32(i)
 			col = col + strings.Index(v, buf)
 			break
 		}
 	}
 	pos := lsp.Position{Line: line, Character: uint32(col)}
-	return pos
+	return pos, found
 }

internal/language_features/includes.go

@@ -3,6 +3,7 @@ package languagefeatures
 import (
 	lsp "go.lsp.dev/protocol"
 
+	"github.com/mrjosh/helm-ls/internal/charts"
 	lsplocal "github.com/mrjosh/helm-ls/internal/lsp"
 	"github.com/mrjosh/helm-ls/internal/protocol"
 	"github.com/mrjosh/helm-ls/internal/tree-sitter/gotemplate"
@@ -91,7 +92,7 @@ func (f *IncludesFeature) getReferenceLocations(includeName string) []lsp.Locati
 			locations = append(locations, util.RangeToLocation(doc.URI, referenceRange))
 		}
 		if len(locations) > 0 {
-			doc.SyncToDisk()
+			charts.SyncToDisk(doc)
 		}
 	}
 
@@ -106,7 +107,7 @@ func (f *IncludesFeature) getDefinitionLocations(includeName string) []lsp.Locat
 			locations = append(locations, util.RangeToLocation(doc.URI, referenceRange))
 		}
 		if len(locations) > 0 {
-			doc.SyncToDisk()
+			charts.SyncToDisk(doc)
 		}
 	}
 

internal/language_features/template_context.go

@@ -7,6 +7,7 @@ import (
 
 	lsp "go.lsp.dev/protocol"
 
+	"github.com/mrjosh/helm-ls/internal/charts"
 	helmdocs "github.com/mrjosh/helm-ls/internal/documentation/helm"
 	lsplocal "github.com/mrjosh/helm-ls/internal/lsp"
 	"github.com/mrjosh/helm-ls/internal/protocol"
@@ -70,7 +71,13 @@ func (f *TemplateContextFeature) getDefinitionLocations(templateContext lsplocal
 	switch templateContext[0] {
 	case "Values":
 		for _, value := range f.Chart.ResolveValueFiles(templateContext.Tail(), f.ChartStore) {
-			locations = append(locations, value.ValuesFiles.GetPositionsForValue(value.Selector)...)
+			locs := value.ValuesFiles.GetPositionsForValue(value.Selector)
+			if len(locs) > 0 {
+				for _, valuesFile := range value.ValuesFiles.AllValuesFiles() {
+					charts.SyncToDisk(valuesFile)
+				}
+			}
+			locations = append(locations, locs...)
 		}
 		return locations
 	case "Chart":

internal/lsp/document.go

@@ -3,11 +3,8 @@ package lsp
 import (
 	"bytes"
 	"fmt"
-	"os"
-	"path/filepath"
 	"strings"
 
-	"github.com/mrjosh/helm-ls/internal/charts"
 	"github.com/mrjosh/helm-ls/internal/util"
 	sitter "github.com/smacker/go-tree-sitter"
 	lsp "go.lsp.dev/protocol"
@@ -82,22 +79,12 @@ func (d *Document) getLines() []string {
 	return d.lines
 }
 
-// SyncToDisk writes the content of the document to disk if it is a dependency file.
-// If it is a dependency file, it was read from a archive, so we need to write it back,
-// to be able to open it in a editor when using go-to-definition or go-to-reference.
-func (d *Document) SyncToDisk() {
-	if !d.IsDependencyFile() {
-		return
-	}
-	err := os.MkdirAll(filepath.Dir(d.Path), 0o755)
-	if err == nil {
-		err = os.WriteFile(d.Path, []byte(d.Content), 0o444)
-	}
-	if err != nil {
-		logger.Error(err.Error())
-	}
+// GetContent implements PossibleDependencyFile.
+func (d *Document) GetContent() string {
+	return d.Content
 }
 
-func (d *Document) IsDependencyFile() bool {
-	return strings.Contains(d.Path, charts.DependencyCacheFolder)
+// GetPath implements PossibleDependencyFile.
+func (d *Document) GetPath() string {
+	return d.Path
 }

internal/lsp/document_store.go

@@ -53,7 +53,7 @@ func (s *DocumentStore) DidOpen(params *lsp.DidOpenTextDocumentParams, helmlsCon
 func (s *DocumentStore) Store(filename string, content []byte, helmlsConfig util.HelmlsConfiguration) {
 	ast := ParseAst(nil, string(content))
 	fileUri := uri.File(filename)
-	s.documents.Store(fileUri,
+	s.documents.Store(fileUri.Filename(),
 		&Document{
 			URI:              fileUri,
 			Path:             filename,

testdata/dependenciesExample/charts/subchartexample/values.yaml

@@ -1,4 +1,3 @@
 global:
   subchart: works
-
 subchartWithoutGlobal: works