decoder: Use EmptyCompletionData for Set

hashicorp · Mar 9, 2023 · ad2396d · ad2396d
1 parent 7f4b92a
commit ad2396d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/decoder/expr_set_completion.go b/decoder/expr_set_completion.go
@@ -12,29 +12,29 @@ import (
 func (set Set) CompletionAtPos(ctx context.Context, pos hcl.Pos) []lang.Candidate {
  if isEmptyExpression(set.expr) {
  label := "[ ]"
- triggerSuggest := false
 
  if set.cons.Elem != nil {
  label = fmt.Sprintf("[ %s ]", set.cons.Elem.FriendlyName())
- triggerSuggest = true
  }
 
+ d := set.cons.EmptyCompletionData(1, 0)
+
  return []lang.Candidate{
  {
  Label: label,
  Detail: set.cons.FriendlyName(),
  Kind: lang.SetCandidateKind,
  Description: set.cons.Description,
  TextEdit: lang.TextEdit{
- NewText: "[ ]",
- Snippet: "[ ${0} ]",
+ NewText: d.NewText,
+ Snippet: d.Snippet,
  Range: hcl.Range{
  Filename: set.expr.Range().Filename,
  Start: pos,
  End: pos,
  },
  },
- TriggerSuggest: triggerSuggest,
+ TriggerSuggest: d.TriggerSuggest,
  },
  }
  }

diff --git a/decoder/expr_set_completion_test.go b/decoder/expr_set_completion_test.go
@@ -10,6 +10,7 @@ import (
  "github.com/hashicorp/hcl-lang/schema"
  "github.com/hashicorp/hcl/v2"
  "github.com/hashicorp/hcl/v2/hclsyntax"
+ "github.com/zclconf/go-cty/cty"
 )
 
 func TestCompletionAtPos_exprSet(t *testing.T) {
@@ -41,7 +42,7 @@ func TestCompletionAtPos_exprSet(t *testing.T) {
  End: hcl.Pos{Line: 1, Column: 8, Byte: 7},
  },
  NewText: "[ ]",
- Snippet: "[ ${0} ]",
+ Snippet: "[ ${1} ]",
  },
  Kind: lang.SetCandidateKind,
  },
@@ -52,8 +53,8 @@ func TestCompletionAtPos_exprSet(t *testing.T) {
  map[string]*schema.AttributeSchema{
  "attr": {
  Constraint: schema.Set{
- Elem: schema.Keyword{
- Keyword: "keyword",
+ Elem: schema.LiteralType{
+ Type: cty.String,
  },
  },
  },
@@ -63,19 +64,19 @@ func TestCompletionAtPos_exprSet(t *testing.T) {
  hcl.Pos{Line: 1, Column: 8, Byte: 7},
  lang.CompleteCandidates([]lang.Candidate{
  {
- Label: `[ keyword ]`,
- Detail: "set of keyword",
+ Label: `[ string ]`,
+ Detail: "set of string",
  TextEdit: lang.TextEdit{
  Range: hcl.Range{
  Filename: "test.tf",
  Start: hcl.Pos{Line: 1, Column: 8, Byte: 7},
  End: hcl.Pos{Line: 1, Column: 8, Byte: 7},
  },
- NewText: "[ keyword ]",
- Snippet: "[ ${0:keyword} ]",
+ NewText: "[ \"value\" ]",
+ Snippet: "[ \"${1:value}\" ]",
  },
  Kind: lang.SetCandidateKind,
- TriggerSuggest: true,
+ TriggerSuggest: false,
  },
  }),
  },

diff --git a/schema/constraint_set.go b/schema/constraint_set.go
@@ -51,7 +51,7 @@ func (s Set) Copy() Constraint {
 func (s Set) EmptyCompletionData(nextPlaceholder int, nestingLevel int) CompletionData {
  if s.Elem == nil {
  return CompletionData{
- NewText: "[]",
+ NewText: "[ ]",
  Snippet: fmt.Sprintf("[ ${%d} ]", nextPlaceholder),
  NextPlaceholder: nextPlaceholder + 1,
  }
@@ -60,7 +60,7 @@ func (s Set) EmptyCompletionData(nextPlaceholder int, nestingLevel int) Completi
  elemData := s.Elem.EmptyCompletionData(nextPlaceholder, nestingLevel)
  if elemData.NewText == "" || elemData.Snippet == "" {
  return CompletionData{
- NewText: "[]",
+ NewText: "[ ]",
  Snippet: fmt.Sprintf("[ ${%d} ]", nextPlaceholder),
  TriggerSuggest: elemData.TriggerSuggest,
  NextPlaceholder: nextPlaceholder + 1,

diff --git a/schema/constraint_test.go b/schema/constraint_test.go
@@ -628,7 +628,7 @@ STRING
  },
  },
  CompletionData{
- NewText: "[]",
+ NewText: "[ ]",
  Snippet: "[ ${1} ]",
  TriggerSuggest: true,
  NextPlaceholder: 2,