remove context pkg

Author: jpogran

context/context.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	icontext "github.com/hashicorp/hcl-lang/context"
 	"github.com/hashicorp/hcl-lang/lang"
 	"github.com/hashicorp/hcl-lang/schema"
 	"github.com/hashicorp/hcl/v2"
@@ -53,7 +52,7 @@ func (d *PathDecoder) candidatesAtPos(ctx context.Context, body *hclsyntax.Body,
 		if bodySchema.Extensions.Count {
 			if _, ok := body.Attributes["count"]; ok {
 				// append to context we need count completed
-				ctx = icontext.WithActiveCount(ctx)
+				ctx = schema.WithActiveCount(ctx)
 			}
 		}
 	}

decoder/candidates.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/zclconf/go-cty/cty"
 
-	icontext "github.com/hashicorp/hcl-lang/context"
 	"github.com/hashicorp/hcl-lang/lang"
 	"github.com/hashicorp/hcl-lang/reference"
 	"github.com/hashicorp/hcl-lang/schema"
@@ -462,7 +461,7 @@ func (d *PathDecoder) constraintToCandidates(ctx context.Context, constraint sch
 func (d *PathDecoder) candidatesForTraversalConstraint(ctx context.Context, tc schema.TraversalExpr, outerBodyRng, prefixRng, editRng hcl.Range) []lang.Candidate {
 	candidates := make([]lang.Candidate, 0)
 
-	if icontext.ActiveCountFromContext(ctx) {
+	if schema.ActiveCountFromContext(ctx) {
 		candidates = append(candidates, countIndexCandidate(editRng))
 	}
 

decoder/expression_candidates.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/zclconf/go-cty/cty"
 
-	icontext "github.com/hashicorp/hcl-lang/context"
 	"github.com/hashicorp/hcl-lang/lang"
 	"github.com/hashicorp/hcl-lang/reference"
 	"github.com/hashicorp/hcl-lang/schema"
@@ -50,7 +49,7 @@ func (d *PathDecoder) hoverAtPos(ctx context.Context, body *hclsyntax.Body, body
 		if bodySchema.Extensions.Count {
 			if _, ok := body.Attributes["count"]; ok {
 				// append to context we need count provided
-				ctx = icontext.WithActiveCount(ctx)
+				ctx = schema.WithActiveCount(ctx)
 			}
 		}
 	}
@@ -259,7 +258,7 @@ func (d *PathDecoder) hoverDataForExpr(ctx context.Context, expr hcl.Expression,
 			lang.AttrStep{
 				Name: "index",
 			},
-		}) && icontext.ActiveCountFromContext(ctx) {
+		}) && schema.ActiveCountFromContext(ctx) {
 			return countAttributeHoverData(expr.Range()), nil
 		}
 

decoder/hover.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/zclconf/go-cty/cty"
 
-	icontext "github.com/hashicorp/hcl-lang/context"
 	"github.com/hashicorp/hcl-lang/lang"
 	"github.com/hashicorp/hcl-lang/reference"
 	"github.com/hashicorp/hcl-lang/schema"
@@ -52,7 +51,7 @@ func (d *PathDecoder) tokensForBody(ctx context.Context, body *hclsyntax.Body, b
 		if bodySchema.Extensions.Count {
 			if _, ok := body.Attributes["count"]; ok {
 				// append to context we need count provided
-				ctx = icontext.WithActiveCount(ctx)
+				ctx = schema.WithActiveCount(ctx)
 			}
 		}
 	}
@@ -131,7 +130,7 @@ func (d *PathDecoder) tokensForBody(ctx context.Context, body *hclsyntax.Body, b
 				if blockSchema.Body.Extensions.Count {
 					if _, ok := block.Body.Attributes["count"]; ok {
 						// append to context we need count provided
-						ctx = icontext.WithActiveCount(ctx)
+						ctx = schema.WithActiveCount(ctx)
 					}
 				}
 			}
@@ -173,7 +172,7 @@ func (d *PathDecoder) tokensForExpression(ctx context.Context, expr hclsyntax.Ex
 				Name: "index",
 			},
 		}
-		countAvailable := icontext.ActiveCountFromContext(ctx)
+		countAvailable := schema.ActiveCountFromContext(ctx)
 		// TODO why is countAvailable not true here?
 		// if address.Equals(countIndexAttr) && countAvailable {
 		if address.Equals(countIndexAttr) && countAvailable {

decoder/semantic_tokens.go

@@ -1,8 +1,24 @@
 package schema
 
+import (
+	"context"
+)
+
 type schemaImplSigil struct{}
 
 // Schema represents any schema (e.g. attribute, label, or a block)
 type Schema interface {
 	isSchemaImpl() schemaImplSigil
 }
+
+type bodyExtCtxKey struct{}
+
+type bodyActiveCountCtxKey struct{}
+
+func WithActiveCount(ctx context.Context) context.Context {
+	return context.WithValue(ctx, bodyActiveCountCtxKey{}, true)
+}
+
+func ActiveCountFromContext(ctx context.Context) bool {
+	return ctx.Value(bodyActiveCountCtxKey{}) != nil
+}