Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable hooks for dynamic completion #123

Merged
merged 13 commits into from
Aug 1, 2022
Merged

Enable hooks for dynamic completion #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
866c70b
Add `CompletionHooks` to `AttributeSchema`
dbanck Jul 26, 2022
1b9e84f
Add comment about `AnyAttribute`
dbanck Jul 26, 2022
bca2b63
Add optional reslove hook to Candidate
dbanck Jul 26, 2022
913baec
Extend decoder context with completion hooks
dbanck Jul 26, 2022
8e03530
Execute hooks as part of attribue expr candidates
dbanck Jul 26, 2022
44b32f0
Add ResolveCandidate to decoder for resolve handler
dbanck Jul 27, 2022
4ecf38a
Improve quoting and empty/multiline expressions
dbanck Jul 27, 2022
8f7e931
Pass context in all existing tests
dbanck Jul 27, 2022
fea7291
Add tests for attr completion hooks
dbanck Jul 28, 2022
fabd130
Review feedback
dbanck Aug 1, 2022
6fc4055
Apply suggestions from code review
dbanck Aug 1, 2022
e88b32a
Review feedback
dbanck Aug 1, 2022
7a6e213
Fix "apply suggestion" error
dbanck Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions decoder/body_candidates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package decoder

import (
"context"
"testing"

"github.com/google/go-cmp/cmp"
Expand All @@ -12,6 +13,7 @@ import (
)

func TestDecoder_CandidateAtPos_incompleteAttributes(t *testing.T) {
ctx := context.Background()
bodySchema := &schema.BodySchema{
Blocks: map[string]*schema.BlockSchema{
"customblock": {
Expand Down Expand Up @@ -43,7 +45,7 @@ func TestDecoder_CandidateAtPos_incompleteAttributes(t *testing.T) {
})
d.maxCandidates = 1

candidates, err := d.CandidatesAtPos("test.tf", hcl.Pos{
candidates, err := d.CandidatesAtPos(ctx, "test.tf", hcl.Pos{
Line: 2,
Column: 7,
Byte: 29,
Expand Down Expand Up @@ -84,6 +86,7 @@ func TestDecoder_CandidateAtPos_incompleteAttributes(t *testing.T) {
}

func TestDecoder_CandidateAtPos_computedAttributes(t *testing.T) {
ctx := context.Background()
bodySchema := &schema.BodySchema{
Blocks: map[string]*schema.BlockSchema{
"customblock": {
Expand Down Expand Up @@ -113,7 +116,7 @@ func TestDecoder_CandidateAtPos_computedAttributes(t *testing.T) {
},
})

candidates, err := d.CandidatesAtPos("test.tf", hcl.Pos{
candidates, err := d.CandidatesAtPos(ctx, "test.tf", hcl.Pos{
Line: 2,
Column: 7,
Byte: 29,
Expand Down Expand Up @@ -154,6 +157,7 @@ func TestDecoder_CandidateAtPos_computedAttributes(t *testing.T) {
}

func TestDecoder_CandidateAtPos_incompleteBlocks(t *testing.T) {
ctx := context.Background()
bodySchema := &schema.BodySchema{
Blocks: map[string]*schema.BlockSchema{
"customblock": {
Expand Down Expand Up @@ -186,7 +190,7 @@ func TestDecoder_CandidateAtPos_incompleteBlocks(t *testing.T) {
})
d.maxCandidates = 1

candidates, err := d.CandidatesAtPos("test.tf", hcl.Pos{
candidates, err := d.CandidatesAtPos(ctx, "test.tf", hcl.Pos{
Line: 3,
Column: 8,
Byte: 42,
Expand Down Expand Up @@ -227,6 +231,7 @@ func TestDecoder_CandidateAtPos_incompleteBlocks(t *testing.T) {
}

func TestDecoder_CandidateAtPos_duplicateNames(t *testing.T) {
ctx := context.Background()
bodySchema := &schema.BodySchema{
Attributes: map[string]*schema.AttributeSchema{
"ingress": {
Expand Down Expand Up @@ -258,7 +263,7 @@ func TestDecoder_CandidateAtPos_duplicateNames(t *testing.T) {
},
})

candidates, err := d.CandidatesAtPos("test.tf", hcl.InitialPos)
candidates, err := d.CandidatesAtPos(ctx, "test.tf", hcl.InitialPos)
if err != nil {
t.Fatal(err)
}
Expand Down
13 changes: 7 additions & 6 deletions decoder/candidates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package decoder

import (
"context"
"fmt"

"github.com/hashicorp/hcl-lang/lang"
Expand All @@ -13,7 +14,7 @@ import (
//
// Schema is required in order to return any candidates and method will return
// error if there isn't one.
func (d *PathDecoder) CandidatesAtPos(filename string, pos hcl.Pos) (lang.Candidates, error) {
func (d *PathDecoder) CandidatesAtPos(ctx context.Context, filename string, pos hcl.Pos) (lang.Candidates, error) {
f, err := d.fileByName(filename)
if err != nil {
return lang.ZeroCandidates(), err
Expand All @@ -37,10 +38,10 @@ func (d *PathDecoder) CandidatesAtPos(filename string, pos hcl.Pos) (lang.Candid
outerBodyRng = ob.Range()
}

return d.candidatesAtPos(rootBody, outerBodyRng, d.pathCtx.Schema, pos)
return d.candidatesAtPos(ctx, rootBody, outerBodyRng, d.pathCtx.Schema, pos)
}

func (d *PathDecoder) candidatesAtPos(body *hclsyntax.Body, outerBodyRng hcl.Range, bodySchema *schema.BodySchema, pos hcl.Pos) (lang.Candidates, error) {
func (d *PathDecoder) candidatesAtPos(ctx context.Context, body *hclsyntax.Body, outerBodyRng hcl.Range, bodySchema *schema.BodySchema, pos hcl.Pos) (lang.Candidates, error) {
if bodySchema == nil {
return lang.ZeroCandidates(), nil
}
Expand All @@ -50,10 +51,10 @@ func (d *PathDecoder) candidatesAtPos(body *hclsyntax.Body, outerBodyRng hcl.Ran
for _, attr := range body.Attributes {
if d.isPosInsideAttrExpr(attr, pos) {
if aSchema, ok := bodySchema.Attributes[attr.Name]; ok {
return d.attrValueCandidatesAtPos(attr, aSchema, outerBodyRng, pos)
return d.attrValueCandidatesAtPos(ctx, attr, aSchema, outerBodyRng, pos)
}
if bodySchema.AnyAttribute != nil {
return d.attrValueCandidatesAtPos(attr, bodySchema.AnyAttribute, outerBodyRng, pos)
return d.attrValueCandidatesAtPos(ctx, attr, bodySchema.AnyAttribute, outerBodyRng, pos)
}

return lang.ZeroCandidates(), nil
Expand Down Expand Up @@ -132,7 +133,7 @@ func (d *PathDecoder) candidatesAtPos(body *hclsyntax.Body, outerBodyRng hcl.Ran
return lang.ZeroCandidates(), err
}

return d.candidatesAtPos(block.Body, outerBodyRng, mergedSchema, pos)
return d.candidatesAtPos(ctx, block.Body, outerBodyRng, mergedSchema, pos)
}
}
}
Expand Down
Loading