Skip to content

Add language constants to strings #67

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 31 additions & 3 deletions Terraform.sublime-syntax
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,12 @@ contexts:
# https://www.terraform.io/docs/language/expressions/types.html#literal-expressions
# https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md#literal-values
language_constants:
- match: \b(true|false|null)\b
comment: Language Constants
scope: constant.language.terraform
- match: \btrue\b
scope: constant.language.boolean.true.terraform
- match: \bfalse\b
scope: constant.language.boolean.false.terraform
- match: \bnull\b
scope: constant.language.null.terraform

# Numbers: Integers, fractions and exponents
#
Expand All @@ -246,6 +249,31 @@ contexts:
# https://www.terraform.io/docs/language/expressions/types.html
# https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md#template-expressions
string_literals:
- match: (")(true)(")
scope: string.quoted.double.terraform
captures:
1: punctuation.definition.string.begin.terraform
2: constant.language.boolean.true.terraform
3: punctuation.definition.string.end.terraform
- match: (")(false)(")
scope: string.quoted.double.terraform
captures:
1: punctuation.definition.string.begin.terraform
2: constant.language.boolean.false.terraform
3: punctuation.definition.string.end.terraform
- match: (")(none|null)(")
scope: string.quoted.double.terraform
captures:
1: punctuation.definition.string.begin.terraform
2: constant.language.null.terraform
3: punctuation.definition.string.end.terraform
- match: (")(-?)(\d+)(")
scope: string.quoted.double.terraform
captures:
1: punctuation.definition.string.begin.terraform
2: keyword.operator.arithmetic.terraform
3: meta.number.integer.terraform constant.numeric.value.terraform
4: punctuation.definition.string.end.terraform
- match: '"'
comment: Strings
scope: punctuation.definition.string.begin.terraform
Expand Down
2 changes: 1 addition & 1 deletion syntax_test_terraform-vars.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

true
# ^ -constant
# ^^^^ constant.language.terraform
# ^^^^ constant.language.boolean.true.terraform
# ^ -constant

444
Expand Down
22 changes: 16 additions & 6 deletions syntax_test_terraform.tf
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@

true
# ^ -constant
# ^^^^ constant.language.terraform
# ^^^^ constant.language.boolean.true.terraform
# ^ -constant

/////
Expand All @@ -98,7 +98,7 @@

false
# ^ -constant
# ^^^^^ constant.language.terraform
# ^^^^^ constant.language.boolean.false.terraform
# ^ -constant


Expand All @@ -108,7 +108,7 @@

null
# ^ -constant
# ^^^^ constant.language.terraform
# ^^^^ constant.language.null.terraform
# ^ -constant

/////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -327,9 +327,9 @@
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.terraform
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ source.terraform
# ^ keyword.operator.terraform
# ^^^^ meta.interpolation.terraform constant.language.terraform
# ^^^^ meta.interpolation.terraform constant.language.boolean.true.terraform
# ^ meta.interpolation.terraform keyword.operator.terraform
# ^^^^^ meta.interpolation.terraform constant.language.terraform
# ^^^^^ meta.interpolation.terraform constant.language.boolean.false.terraform
# ^ meta.interpolation.terraform punctuation.section.interpolation.end.terraform
# ^ string.quoted.double.terraform punctuation.definition.string.end.terraform

Expand Down Expand Up @@ -2399,9 +2399,19 @@
tobool(true)
# ^^^^^^ meta.function-call.terraform support.function.builtin.terraform
# ^ meta.function-call.terraform punctuation.section.parens.begin.terraform
# ^^^^ meta.function-call.terraform constant.language.terraform
# ^^^^ meta.function-call.terraform constant.language.boolean.true.terraform
# ^ meta.function-call.terraform punctuation.section.parens.end.terraform

tobool("true")
# ^^^^^^^^^^^^^^ meta.function-call.terraform
# ^^^^^^ support.function.builtin.terraform
# ^ punctuation.section.parens.begin.terraform
# ^^^^^^ string.quoted.double.terraform
# ^ punctuation.definition.string.begin.terraform
# ^^^^ constant.language.boolean.true.terraform
# ^ punctuation.definition.string.end.terraform
# ^ punctuation.section.parens.end.terraform

tolist(["a", "b", "c"])
# ^^^^^^ meta.function-call.terraform support.function.builtin.terraform
# ^ meta.function-call.terraform punctuation.section.parens.begin.terraform
Expand Down
Loading