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

Rename TokenTypeCapsule to TokenTypeComplex #1529

Merged
merged 3 commits into from
Dec 22, 2023
Merged

Rename TokenTypeCapsule to TokenTypeComplex #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a745dbb
Rename TokenTypeCapsule to TokenTypeComplex
jpogran Dec 19, 2023
700fa74
Update to hcl-lang@latest
jpogran Dec 20, 2023
5829c14
Update docs
jpogran Dec 20, 2023
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
2 changes: 1 addition & 1 deletion docs/syntax-highlighting.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Fallback types are chosen based on meaningful semantic mapping and default theme
| `hcl-mapKey` | `parameter` |
| `hcl-keyword` | `variable` |
| `hcl-traversalStep` | `variable` |
| `hcl-typeCapsule` | `function` |
| `hcl-typeComplex` | `function` |
| `hcl-typePrimitive` | `keyword` |
| `hcl-functionName` | `function` |

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/hashicorp/go-uuid v1.0.3
github.com/hashicorp/go-version v1.6.0
github.com/hashicorp/hc-install v0.6.2
github.com/hashicorp/hcl-lang v0.0.0-20231130100155-255545969c6e
github.com/hashicorp/hcl-lang v0.0.0-20231220152752-07605a991838
github.com/hashicorp/hcl/v2 v2.19.1
github.com/hashicorp/terraform-exec v0.19.0
github.com/hashicorp/terraform-json v0.18.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
github.com/hashicorp/hcl-lang v0.0.0-20231130100155-255545969c6e h1:Hiqu/XjMVBc8Etbjr10p6koz5BuF9YVhyQcNQ5w1WU4=
github.com/hashicorp/hcl-lang v0.0.0-20231130100155-255545969c6e/go.mod h1:hwP+cyrOdujv2bNXUgm+OrVsvOfAltMmbQx+WFu9PWM=
github.com/hashicorp/hcl-lang v0.0.0-20231220152752-07605a991838 h1:/a/tFMThsyO++bJPd+9/kTV5xojfTrVPLh5mSlQd9wU=
github.com/hashicorp/hcl-lang v0.0.0-20231220152752-07605a991838/go.mod h1:yZkskHa0HSpPecxmoiLTuyXmxI9knxQOA+DGMgyOurM=
github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI=
github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE=
github.com/hashicorp/terraform-exec v0.19.0 h1:FpqZ6n50Tk95mItTSS9BjeOVUb4eg81SpgVtZNNtFSM=
Expand Down
4 changes: 2 additions & 2 deletions internal/lsp/token_encoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ func (te *TokenEncoder) resolveTokenType(token lang.SemanticToken) (semtok.Token
case lang.TokenTraversalStep:
return te.firstSupportedTokenType(
semtok.TokenType(lang.TokenTraversalStep), semtok.TokenTypeVariable)
case lang.TokenTypeCapsule:
case lang.TokenTypeComplex:
return te.firstSupportedTokenType(
semtok.TokenType(lang.TokenTypeCapsule), semtok.TokenTypeFunction)
semtok.TokenType(lang.TokenTypeComplex), semtok.TokenTypeFunction)
case lang.TokenTypePrimitive:
return te.firstSupportedTokenType(
semtok.TokenType(lang.TokenTypePrimitive), semtok.TokenTypeKeyword)
Expand Down