decoder: Implement completion for LiteralType

hashicorp · Jan 27, 2023 · 0358cd7 · 0358cd7
1 parent 9ff60d5
commit 0358cd7
Show file tree

Hide file tree

Showing 8 changed files with 1,750 additions and 17 deletions.
diff --git a/decoder/attribute_candidates.go b/decoder/attribute_candidates.go
@@ -14,9 +14,14 @@ import (
 func attributeSchemaToCandidate(name string, attr *schema.AttributeSchema, rng hcl.Range) lang.Candidate {
 	var snippet string
 	var triggerSuggest bool
+	kind := lang.AttributeCandidateKind
+
 	if attr.Constraint != nil {
 		cData := attr.Constraint.EmptyCompletionData(1)
 		snippet = fmt.Sprintf("%s = %s", name, cData.Snippet)
+		if cData.Kind != lang.NilCandidateKind {
+			kind = cData.Kind
+		}
 		triggerSuggest = cData.TriggerSuggest
 	} else {
 		snippet = snippetForAttribute(name, attr)
@@ -28,7 +33,7 @@ func attributeSchemaToCandidate(name string, attr *schema.AttributeSchema, rng h
 		Detail:       detailForAttribute(attr),
 		Description:  attr.Description,
 		IsDeprecated: attr.IsDeprecated,
-		Kind:         lang.AttributeCandidateKind,
+		Kind:         kind,
 		TextEdit: lang.TextEdit{
 			NewText: name,
 			Snippet: snippet,

diff --git a/decoder/attribute_candidates_legacy_test.go b/decoder/attribute_candidates_legacy_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/zclconf/go-cty/cty"
 )
 
-func TestLegacyDecoder_CompletionAtPos_EmptyCompletionData(t *testing.T) {
+func TestDecoder_CompletionAtPos_EmptyCompletionData(t *testing.T) {
 	testCases := []struct {
 		testName           string
 		attrName           string
@@ -39,7 +39,7 @@ func TestLegacyDecoder_CompletionAtPos_EmptyCompletionData(t *testing.T) {
 						NewText: "primitive",
 						Snippet: `primitive = "${1:value}"`,
 					},
-					Kind: lang.AttributeCandidateKind,
+					Kind: lang.StringCandidateKind,
 				},
 			}),
 		},
@@ -64,7 +64,7 @@ func TestLegacyDecoder_CompletionAtPos_EmptyCompletionData(t *testing.T) {
   "${1:key}" = "${2:value}"
 }`,
 					},
-					Kind: lang.AttributeCandidateKind,
+					Kind: lang.MapCandidateKind,
 				},
 			}),
 		},
@@ -89,7 +89,7 @@ func TestLegacyDecoder_CompletionAtPos_EmptyCompletionData(t *testing.T) {
   "${1:key}" = ${2:1}
 }`,
 					},
-					Kind: lang.AttributeCandidateKind,
+					Kind: lang.MapCandidateKind,
 				},
 			}),
 		},
@@ -112,7 +112,7 @@ func TestLegacyDecoder_CompletionAtPos_EmptyCompletionData(t *testing.T) {
 						NewText: "mylist",
 						Snippet: `mylist = [ ${1:1} ]`,
 					},
-					Kind: lang.AttributeCandidateKind,
+					Kind: lang.ListCandidateKind,
 				},
 			}),
 		},
@@ -141,7 +141,7 @@ func TestLegacyDecoder_CompletionAtPos_EmptyCompletionData(t *testing.T) {
   second = ${2:1}
 } ]`,
 					},
-					Kind: lang.AttributeCandidateKind,
+					Kind: lang.ListCandidateKind,
 				},
 			}),
 		},
@@ -164,7 +164,7 @@ func TestLegacyDecoder_CompletionAtPos_EmptyCompletionData(t *testing.T) {
 						NewText: "myset",
 						Snippet: `myset = [ ${1:1} ]`,
 					},
-					Kind: lang.AttributeCandidateKind,
+					Kind: lang.SetCandidateKind,
 				},
 			}),
 		},
@@ -195,7 +195,7 @@ func TestLegacyDecoder_CompletionAtPos_EmptyCompletionData(t *testing.T) {
   keystr = "${3:value}"
 }`,
 					},
-					Kind: lang.AttributeCandidateKind,
+					Kind: lang.ObjectCandidateKind,
 				},
 			}),
 		},
@@ -253,7 +253,7 @@ func TestLegacyDecoder_CompletionAtPos_EmptyCompletionData(t *testing.T) {
   keystr = "${3:value}"
 }`,
 					},
-					Kind: lang.AttributeCandidateKind,
+					Kind: lang.ObjectCandidateKind,
 				},
 			}),
 		},

diff --git a/decoder/expr_literal_type.go b/decoder/expr_literal_type.go
@@ -12,11 +12,8 @@ import (
 type LiteralType struct {
 	expr hcl.Expression
 	cons schema.LiteralType
-}
 
-func (lt LiteralType) CompletionAtPos(ctx context.Context, pos hcl.Pos) []lang.Candidate {
-	// TODO
-	return nil
+	pathCtx *PathContext
 }
 
 func (lt LiteralType) HoverAtPos(ctx context.Context, pos hcl.Pos) *lang.HoverData {