refactor: Introduce DirContext and DecoderContext

decoder/block_candidates.go

@@ -12,7 +12,7 @@ import (
 // blockSchemaToCandidate generates a lang.Candidate used for auto-complete inside an editor from a BlockSchema.
 // If `prefillRequiredFields` is `false`, it returns a snippet that does not expect any prefilled fields.
 // If `prefillRequiredFields` is `true`, it returns a snippet that is compatiable with a list of prefilled fields from `generateRequiredFieldsSnippet`
-func (d *Decoder) blockSchemaToCandidate(blockType string, block *schema.BlockSchema, rng hcl.Range) lang.Candidate {
+func (d *DirDecoder) blockSchemaToCandidate(blockType string, block *schema.BlockSchema, rng hcl.Range) lang.Candidate {
 	triggerSuggest := false
 	if len(block.Labels) > 0 {
 		// We make some naive assumptions here for simplicity

decoder/body_candidates.go

@@ -11,7 +11,7 @@ import (
 )
 
 // bodySchemaCandidates returns candidates for completion of fields inside a body or block.
-func (d *Decoder) bodySchemaCandidates(body *hclsyntax.Body, schema *schema.BodySchema, prefixRng, editRng hcl.Range) lang.Candidates {
+func (d *DirDecoder) bodySchemaCandidates(body *hclsyntax.Body, schema *schema.BodySchema, prefixRng, editRng hcl.Range) lang.Candidates {
 	prefix, _ := d.bytesFromRange(prefixRng)
 
 	candidates := lang.NewCandidates()

decoder/body_candidates_test.go

@@ -30,19 +30,18 @@ func TestDecoder_CandidateAtPos_incompleteAttributes(t *testing.T) {
 		},
 	}
 
-	d := NewDecoder()
-	d.maxCandidates = 1
-
-	d.SetSchema(bodySchema)
-
 	f, _ := hclsyntax.ParseConfig([]byte(`customblock "label1" {
   attr
 }
 `), "test.tf", hcl.InitialPos)
-	err := d.LoadFile("test.tf", f)
-	if err != nil {
-		t.Fatal(err)
-	}
+
+	d := testDirDecoder(t, &DirContext{
+		Schema: bodySchema,
+		Files: map[string]*hcl.File{
+			"test.tf": f,
+		},
+	})
+	d.maxCandidates = 1
 
 	candidates, err := d.CandidatesAtPos("test.tf", hcl.Pos{
 		Line:   2,
@@ -103,17 +102,16 @@ func TestDecoder_CandidateAtPos_computedAttributes(t *testing.T) {
 		},
 	}
 
-	d := NewDecoder()
-	d.SetSchema(bodySchema)
-
 	f, _ := hclsyntax.ParseConfig([]byte(`customblock "label1" {
   attr
 }
 `), "test.tf", hcl.InitialPos)
-	err := d.LoadFile("test.tf", f)
-	if err != nil {
-		t.Fatal(err)
-	}
+	d := testDirDecoder(t, &DirContext{
+		Schema: bodySchema,
+		Files: map[string]*hcl.File{
+			"test.tf": f,
+		},
+	})
 
 	candidates, err := d.CandidatesAtPos("test.tf", hcl.Pos{
 		Line:   2,
@@ -175,20 +173,18 @@ func TestDecoder_CandidateAtPos_incompleteBlocks(t *testing.T) {
 		},
 	}
 
-	d := NewDecoder()
-	d.maxCandidates = 1
-
-	d.SetSchema(bodySchema)
-
 	f, _ := hclsyntax.ParseConfig([]byte(`customblock "label1" {
   block1 {}
   block
 }
 `), "test.tf", hcl.InitialPos)
-	err := d.LoadFile("test.tf", f)
-	if err != nil {
-		t.Fatal(err)
-	}
+	d := testDirDecoder(t, &DirContext{
+		Schema: bodySchema,
+		Files: map[string]*hcl.File{
+			"test.tf": f,
+		},
+	})
+	d.maxCandidates = 1
 
 	candidates, err := d.CandidatesAtPos("test.tf", hcl.Pos{
 		Line:   3,
@@ -252,14 +248,15 @@ func TestDecoder_CandidateAtPos_duplicateNames(t *testing.T) {
 			},
 		},
 	}
-	d := NewDecoder()
-	d.SetSchema(bodySchema)
 
 	f, _ := hclsyntax.ParseConfig([]byte("\n"), "test.tf", hcl.InitialPos)
-	err := d.LoadFile("test.tf", f)
-	if err != nil {
-		t.Fatal(err)
-	}
+
+	d := testDirDecoder(t, &DirContext{
+		Schema: bodySchema,
+		Files: map[string]*hcl.File{
+			"test.tf": f,
+		},
+	})
 
 	candidates, err := d.CandidatesAtPos("test.tf", hcl.InitialPos)
 	if err != nil {

decoder/candidates.go

@@ -13,7 +13,7 @@ import (
 //
 // Schema is required in order to return any candidates and method will return
 // error if there isn't one.
-func (d *Decoder) CandidatesAtPos(filename string, pos hcl.Pos) (lang.Candidates, error) {
+func (d *DirDecoder) CandidatesAtPos(filename string, pos hcl.Pos) (lang.Candidates, error) {
 	f, err := d.fileByName(filename)
 	if err != nil {
 		return lang.ZeroCandidates(), err
@@ -24,10 +24,7 @@ func (d *Decoder) CandidatesAtPos(filename string, pos hcl.Pos) (lang.Candidates
 		return lang.ZeroCandidates(), err
 	}
 
-	d.rootSchemaMu.RLock()
-	defer d.rootSchemaMu.RUnlock()
-
-	if d.rootSchema == nil {
+	if d.ctx.Schema == nil {
 		return lang.ZeroCandidates(), &NoSchemaError{}
 	}
 
@@ -40,10 +37,10 @@ func (d *Decoder) CandidatesAtPos(filename string, pos hcl.Pos) (lang.Candidates
 		outerBodyRng = ob.Range()
 	}
 
-	return d.candidatesAtPos(rootBody, outerBodyRng, d.rootSchema, pos)
+	return d.candidatesAtPos(rootBody, outerBodyRng, d.ctx.Schema, pos)
 }
 
-func (d *Decoder) candidatesAtPos(body *hclsyntax.Body, outerBodyRng hcl.Range, bodySchema *schema.BodySchema, pos hcl.Pos) (lang.Candidates, error) {
+func (d *DirDecoder) candidatesAtPos(body *hclsyntax.Body, outerBodyRng hcl.Range, bodySchema *schema.BodySchema, pos hcl.Pos) (lang.Candidates, error) {
 	if bodySchema == nil {
 		return lang.ZeroCandidates(), nil
 	}
@@ -148,7 +145,7 @@ func (d *Decoder) candidatesAtPos(body *hclsyntax.Body, outerBodyRng hcl.Range,
 	return d.bodySchemaCandidates(body, bodySchema, rng, rng), nil
 }
 
-func (d *Decoder) isPosInsideAttrExpr(attr *hclsyntax.Attribute, pos hcl.Pos) bool {
+func (d *DirDecoder) isPosInsideAttrExpr(attr *hclsyntax.Attribute, pos hcl.Pos) bool {
 	if attr.Expr.Range().ContainsPos(pos) {
 		return true
 	}
@@ -180,7 +177,7 @@ func (d *Decoder) isPosInsideAttrExpr(attr *hclsyntax.Attribute, pos hcl.Pos) bo
 	return false
 }
 
-func (d *Decoder) nameTokenRangeAtPos(filename string, pos hcl.Pos) (hcl.Range, error) {
+func (d *DirDecoder) nameTokenRangeAtPos(filename string, pos hcl.Pos) (hcl.Range, error) {
 	rng := hcl.Range{
 		Filename: filename,
 		Start:    pos,
@@ -227,7 +224,7 @@ func nameTokenRangeAtPos(tokens hclsyntax.Tokens, pos hcl.Pos) (hcl.Range, error
 	return hcl.Range{}, fmt.Errorf("no token found at %s", stringPos(pos))
 }
 
-func (d *Decoder) labelTokenRangeAtPos(filename string, pos hcl.Pos) (hcl.Range, error) {
+func (d *DirDecoder) labelTokenRangeAtPos(filename string, pos hcl.Pos) (hcl.Range, error) {
 	rng := hcl.Range{
 		Filename: filename,
 		Start:    pos,