feat(completion): fallback for nothing typed yet

mrjosh · May 4, 2024 · f31671d · f31671d
1 parent 5f95b6b
commit f31671d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/internal/handler/completion.go b/internal/handler/completion.go
@@ -5,6 +5,7 @@ import (
 
 	languagefeatures "github.com/mrjosh/helm-ls/internal/language_features"
 	lsplocal "github.com/mrjosh/helm-ls/internal/lsp"
+	"github.com/mrjosh/helm-ls/internal/protocol"
 	lsp "go.lsp.dev/protocol"
 
 	helmdocs "github.com/mrjosh/helm-ls/internal/documentation/helm"
@@ -29,14 +30,13 @@ func (h *langHandler) Completion(ctx context.Context, params *lsp.CompletionPara
 		}
 	}
 
-	items := []lsp.CompletionItem{}
+	items := []helmdocs.HelmDocumentation{}
 	for _, v := range helmdocs.BuiltInObjects {
-		items = append(items, lsp.CompletionItem{
-			Label:         v.Name,
-			InsertText:    "." + v.Name,
-			Detail:        v.Detail,
-			Documentation: v.Doc,
-		})
+		v.Name = "." + v.Name
+		items = append(items, v)
 	}
-	return &lsp.CompletionList{IsIncomplete: false, Items: items}, err
+
+	return protocol.CompletionResults{}.
+		WithDocs(items, lsp.CompletionItemKindConstant).
+		WithDocs(helmdocs.AllFuncs, lsp.CompletionItemKindFunction).ToList(), nil
 }
diff --git a/internal/handler/completion_main_test.go b/internal/handler/completion_main_test.go
@@ -23,6 +23,18 @@ func TestCompletionMain(t *testing.T) {
 		notExpectedInsertTexts []string
 		expectedError          error
 	}{
+		{
+			desc: "Test completion on {{ not }}",
+			position: lsp.Position{
+				Line:      11,
+				Character: 7,
+			},
+			expectedInsertText: "toYaml",
+			notExpectedInsertTexts: []string{
+				"replicaCount",
+			},
+			expectedError: nil,
+		},
 		{
 			desc: "Test completion on text",
 			position: lsp.Position{
@@ -83,6 +95,7 @@ func TestCompletionMain(t *testing.T) {
 			expectedInsertText: "Chart",
 			notExpectedInsertTexts: []string{
 				helmdocs.HelmFuncs[0].Name,
+				"js",
 				"replicaCount",
 				"toYaml",
 			},
@@ -112,18 +125,6 @@ func TestCompletionMain(t *testing.T) {
 			},
 			expectedError: nil,
 		},
-		// {
-		// 	desc: "Test completion on {{ }}",
-		// 	position: lsp.Position{
-		// 		Line:      4,
-		// 		Character: 3,
-		// 	},
-		// 	expectedInsertText: "toYaml",
-		// 	notExpectedInsertTexts: []string{
-		// 		"replicaCount",
-		// 	},
-		// 	expectedError: nil,
-		// },
 	}
 	for _, tt := range testCases {
 		t.Run(tt.desc, func(t *testing.T) {

diff --git a/testdata/example/templates/completion-test.yaml b/testdata/example/templates/completion-test.yaml
@@ -9,3 +9,4 @@
 {{ if (and .Values.    ) }}
 
 {{ end }}
+{{ if  }}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,4 @@
		{{ if (and .Values. ) }}

		{{ end }}
		{{ if }}