fix: move some code

internal/language_features/template_context.go

@@ -9,7 +9,6 @@ import (
 
 	helmdocs "github.com/mrjosh/helm-ls/internal/documentation/helm"
 	lsplocal "github.com/mrjosh/helm-ls/internal/lsp"
-	"github.com/mrjosh/helm-ls/internal/protocol"
 	"github.com/mrjosh/helm-ls/internal/tree-sitter/gotemplate"
 	"github.com/mrjosh/helm-ls/internal/util"
 	"github.com/mrjosh/helm-ls/pkg/chart"
@@ -122,57 +121,3 @@ func (f *TemplateContextFeature) getMetadataField(v *chart.Metadata, fieldName s
 	field := reflect.Indirect(r).FieldByName(fieldName)
 	return util.FormatToYAML(field, fieldName)
 }
-
-func (f *TemplateContextFeature) Completion() (result *lsp.CompletionList, err error) {
-	templateContext, err := f.getTemplateContext()
-	if err != nil {
-		return nil, err
-	}
-
-	if len(templateContext) == 0 {
-		result := helmdocs.BuiltInObjects
-		return protocol.NewCompletionResults(result).ToLSP(), nil
-	}
-
-	if len(templateContext) == 1 {
-		result, ok := helmdocs.BuiltInOjectVals[templateContext[0]]
-		if !ok {
-			result := helmdocs.BuiltInObjects
-			return protocol.NewCompletionResults(result).ToLSP(), nil
-		}
-		return protocol.NewCompletionResults(result).ToLSP(), nil
-	}
-
-	switch templateContext[0] {
-	case "Values":
-		return f.valuesCompletion(templateContext)
-	case "Chart", "Release", "Files", "Capabilities", "Template":
-		// TODO: make this more fine, by checking the length
-		result, ok := helmdocs.BuiltInOjectVals[templateContext[0]]
-		if !ok {
-			result := helmdocs.BuiltInObjects
-			return protocol.NewCompletionResults(result).ToLSP(), nil
-		}
-		return protocol.NewCompletionResults(result).ToLSP(), nil
-
-	}
-
-	return nil, nil
-}
-
-func (f *TemplateContextFeature) valuesCompletion(templateContext lsplocal.TemplateContext) (*lsp.CompletionList, error) {
-	m := make(map[string]lsp.CompletionItem)
-	for _, queriedValuesFiles := range f.Chart.ResolveValueFiles(templateContext.Tail(), f.ChartStore) {
-		for _, valuesFile := range queriedValuesFiles.ValuesFiles.AllValuesFiles() {
-			for _, item := range util.GetValueCompletion(valuesFile.Values, queriedValuesFiles.Selector) {
-				m[item.InsertText] = item
-			}
-		}
-	}
-	completions := []lsp.CompletionItem{}
-	for _, item := range m {
-		completions = append(completions, item)
-	}
-
-	return &lsp.CompletionList{Items: completions, IsIncomplete: false}, nil
-}

internal/language_features/template_context_completion.go

@@ -0,0 +1,63 @@
+package languagefeatures
+
+import (
+	helmdocs "github.com/mrjosh/helm-ls/internal/documentation/helm"
+	lsplocal "github.com/mrjosh/helm-ls/internal/lsp"
+	"github.com/mrjosh/helm-ls/internal/protocol"
+	"github.com/mrjosh/helm-ls/internal/util"
+	lsp "go.lsp.dev/protocol"
+)
+
+func (f *TemplateContextFeature) Completion() (result *lsp.CompletionList, err error) {
+	templateContext, err := f.getTemplateContext()
+	if err != nil {
+		return nil, err
+	}
+
+	if len(templateContext) == 0 {
+		result := helmdocs.BuiltInObjects
+		return protocol.NewCompletionResults(result).ToLSP(), nil
+	}
+
+	if len(templateContext) == 1 {
+		result, ok := helmdocs.BuiltInOjectVals[templateContext[0]]
+		if !ok {
+			result := helmdocs.BuiltInObjects
+			return protocol.NewCompletionResults(result).ToLSP(), nil
+		}
+		return protocol.NewCompletionResults(result).ToLSP(), nil
+	}
+
+	switch templateContext[0] {
+	case "Values":
+		return f.valuesCompletion(templateContext)
+	case "Chart", "Release", "Files", "Capabilities", "Template":
+		// TODO: make this more fine, by checking the length
+		result, ok := helmdocs.BuiltInOjectVals[templateContext[0]]
+		if !ok {
+			result := helmdocs.BuiltInObjects
+			return protocol.NewCompletionResults(result).ToLSP(), nil
+		}
+		return protocol.NewCompletionResults(result).ToLSP(), nil
+
+	}
+
+	return nil, nil
+}
+
+func (f *TemplateContextFeature) valuesCompletion(templateContext lsplocal.TemplateContext) (*lsp.CompletionList, error) {
+	m := make(map[string]lsp.CompletionItem)
+	for _, queriedValuesFiles := range f.Chart.ResolveValueFiles(templateContext.Tail(), f.ChartStore) {
+		for _, valuesFile := range queriedValuesFiles.ValuesFiles.AllValuesFiles() {
+			for _, item := range util.GetValueCompletion(valuesFile.Values, queriedValuesFiles.Selector) {
+				m[item.InsertText] = item
+			}
+		}
+	}
+	completions := []lsp.CompletionItem{}
+	for _, item := range m {
+		completions = append(completions, item)
+	}
+
+	return &lsp.CompletionList{Items: completions, IsIncomplete: false}, nil
+}