Extracted count candidate and hover data

Author: jpogran

decoder/body_candidates.go

@@ -146,17 +146,3 @@ func isBlockDeclarable(body *hclsyntax.Body, blockType string, bSchema *schema.B
 	}
 	return true
 }
-
-func countAttributeCandidate(editRng hcl.Range) lang.Candidate {
-	return lang.Candidate{
-		Label:       "count",
-		Detail:      "optional, number",
-		Description: lang.PlainText("The distinct index number (starting with 0) corresponding to the instance"),
-		Kind:        lang.AttributeCandidateKind,
-		TextEdit: lang.TextEdit{
-			NewText: "count",
-			Snippet: "count = ${1:1}",
-			Range:   editRng,
-		},
-	}
-}

decoder/decoder.go

@@ -3,6 +3,7 @@ package decoder
 import (
 	"fmt"
 
+	"github.com/hashicorp/hcl-lang/lang"
 	"github.com/hashicorp/hcl-lang/schema"
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
@@ -157,3 +158,27 @@ func decodeBody(body hcl.Body, bodySchema *schema.BodySchema) bodyContent {
 func stringPos(pos hcl.Pos) string {
 	return fmt.Sprintf("%d,%d", pos.Line, pos.Column)
 }
+
+func countAttributeCandidate(editRng hcl.Range) lang.Candidate {
+	return lang.Candidate{
+		Label:       "count",
+		Detail:      "optional, number",
+		Description: lang.PlainText("The distinct index number (starting with 0) corresponding to the instance"),
+		Kind:        lang.AttributeCandidateKind,
+		TextEdit: lang.TextEdit{
+			NewText: "count",
+			Snippet: "count = ${1:1}",
+			Range:   editRng,
+		},
+	}
+}
+
+func countAttributeHoverData(editRng hcl.Range) *lang.HoverData {
+	return &lang.HoverData{
+		Content: lang.MarkupContent{
+			Kind:  lang.MarkdownKind,
+			Value: "**count** _optional, number_\n\nThe distinct index number (starting with 0) corresponding to the instance",
+		},
+		Range: editRng,
+	}
+}

decoder/expression_candidates.go

@@ -464,17 +464,7 @@ func (d *PathDecoder) candidatesForTraversalConstraint(ctx context.Context, tc s
 
 	ext, ok := icontext.ExtensionsFromContext(ctx)
 	if ok && ext.Count && icontext.ActiveCountFromContext(ctx) {
-		candidates = append(candidates, lang.Candidate{
-			Label:       "count.index",
-			Detail:      "number",
-			Description: lang.PlainText("The distinct index number (starting with 0) corresponding to the instance"),
-			Kind:        lang.TraversalCandidateKind,
-			TextEdit: lang.TextEdit{
-				NewText: "count.index",
-				Snippet: "count.index",
-				Range:   editRng,
-			},
-		})
+		candidates = append(candidates, countAttributeCandidate(editRng))
 	}
 
 	if d.pathCtx.ReferenceTargets == nil {

decoder/hover.go

@@ -61,13 +61,7 @@ func (d *PathDecoder) hoverAtPos(ctx context.Context, body *hclsyntax.Body, body
 
 			if bodySchema.Extensions != nil {
 				if name == "count" && bodySchema.Extensions.Count {
-					return &lang.HoverData{
-						Content: lang.MarkupContent{
-							Kind:  lang.MarkdownKind,
-							Value: "**count** _optional, number_\n\nThe distinct index number (starting with 0) corresponding to the instance",
-						},
-						Range: attr.Range(),
-					}, nil
+					return countAttributeHoverData(attr.Range()), nil
 				}
 			}
 
@@ -267,13 +261,7 @@ func (d *PathDecoder) hoverDataForExpr(ctx context.Context, expr hcl.Expression,
 				Name: "index",
 			},
 		}) && icontext.ActiveCountFromContext(ctx) {
-			return &lang.HoverData{
-				Content: lang.MarkupContent{
-					Kind:  lang.MarkdownKind,
-					Value: "**count** _optional, number_\n\nThe distinct index number (starting with 0) corresponding to the instance",
-				},
-				Range: expr.Range(),
-			}, nil
+			return countAttributeHoverData(expr.Range()), nil
 		}
 
 		tes, ok := constraints.TraversalExprs()