feat(completion): add variable completion

internal/handler/template_handler/completion.go

@@ -24,6 +24,7 @@ func (h *TemplateHandler) Completion(ctx context.Context, params *lsp.Completion
 		languagefeatures.NewFunctionCallFeature(genericDocumentUseCase),
 		languagefeatures.NewTextFeature(ctx, genericDocumentUseCase, h.yamllsConnector, &params.TextDocumentPositionParams),
 		languagefeatures.NewIncludesCallFeature(genericDocumentUseCase),
+		languagefeatures.NewVariablesFeature(genericDocumentUseCase),
 	}
 
 	for _, usecase := range usecases {

internal/handler/template_handler/completion_main_test.go

@@ -164,6 +164,8 @@ func TestCompletionMainSingleLines(t *testing.T) {
 		notExpectedInsertTexts []string
 		err                    error
 	}{
+		{`Test completion on {{ $variable := "hello" }} {{ $v^ }}`, []string{"$variable"}, []string{".Values", "include"}, nil},
+		{`Test completion on {{ $variable := "hello" }} {{ $^ }}`, []string{"$variable"}, []string{".Values", "include"}, nil},
 		{"Test completion on {{.Bad.^}}", []string{}, []string{}, errors.New("[Bad ] is no valid template context for helm")},
 		{"Test completion on {{ .Bad.^ }}", []string{}, []string{}, errors.New("[Bad ] is no valid template context for helm")},
 		{"Test completion on {{ n^ }}", []string{"not"}, []string{}, nil},

internal/language_features/variables.go

@@ -1,6 +1,7 @@
 package languagefeatures
 
 import (
+	"github.com/mrjosh/helm-ls/internal/protocol"
 	"github.com/mrjosh/helm-ls/internal/tree-sitter/gotemplate"
 	"github.com/mrjosh/helm-ls/internal/util"
 	lsp "go.lsp.dev/protocol"
@@ -17,7 +18,7 @@ func NewVariablesFeature(genericDocumentUseCase *GenericDocumentUseCase) *Variab
 }
 
 func (f *VariablesFeature) AppropriateForNode() bool {
-	return f.NodeType == gotemplate.NodeTypeIdentifier &&
+	return (f.NodeType == gotemplate.NodeTypeIdentifier || f.NodeType == gotemplate.NodeTypeDollar) &&
 		f.ParentNodeType == gotemplate.NodeTypeVariable
 }
 
@@ -41,3 +42,7 @@ func (f *VariablesFeature) References() (result []lsp.Location, err error) {
 	}
 	return result, nil
 }
+
+func (f *VariablesFeature) Completion() (result *lsp.CompletionList, err error) {
+	return protocol.CompletionResults{}.WithVariableDefinitions(f.Document.SymbolTable.GetAllVariableDefinitions()).ToList(), nil
+}

internal/lsp/symbol_table/symbol_table_variables.go

@@ -45,6 +45,16 @@ func (s *SymbolTable) getVariableDefinition(name string, accessRange sitter.Rang
 	return definition, nil
 }
 
+func (s *SymbolTable) GetAllVariableDefinitions() (result map[string][]VariableDefinition) {
+	result = map[string][]VariableDefinition{}
+	for name, definitions := range s.variableDefinitions {
+		result[name] = append(
+			[]VariableDefinition{},
+			definitions...)
+	}
+	return result
+}
+
 func (s *SymbolTable) GetVariableDefinitionForNode(node *sitter.Node, content []byte) (VariableDefinition, error) {
 	name, err := getVariableName(node, content)
 	if err != nil {

internal/protocol/completion.go

@@ -3,6 +3,7 @@ package protocol
 import (
 	"github.com/mrjosh/helm-ls/internal/documentation/godocs"
 	helmdocs "github.com/mrjosh/helm-ls/internal/documentation/helm"
+	symboltable "github.com/mrjosh/helm-ls/internal/lsp/symbol_table"
 	lsp "go.lsp.dev/protocol"
 )
 
@@ -48,3 +49,29 @@ func snippetCompletionItem(gotemplateSnippet godocs.GoTemplateSnippet) lsp.Compl
 		InsertTextFormat: lsp.InsertTextFormatSnippet,
 	}
 }
+
+func (c CompletionResults) WithVariableDefinitions(variableDefinitions map[string][]symboltable.VariableDefinition) CompletionResults {
+	items := c.Items
+	for variableName, definitions := range variableDefinitions {
+
+		if len(definitions) == 0 {
+			continue
+		}
+		definition := definitions[0]
+
+		items = append(items,
+			variableCompletionItem(variableName, definition),
+		)
+	}
+	return CompletionResults{Items: items}
+}
+
+func variableCompletionItem(variableName string, definition symboltable.VariableDefinition) lsp.CompletionItem {
+	return lsp.CompletionItem{
+		Label:            variableName,
+		Detail:           definition.Value,
+		InsertText:       variableName,
+		InsertTextFormat: lsp.InsertTextFormatPlainText,
+		Kind:             lsp.CompletionItemKindVariable,
+	}
+}