Skip to content

Commit 0028ecc

Browse files
deathaxedeathaxe
committed
Merge branch 'master' into literals
2 parents 6bf545f + 8c1f80a commit 0028ecc

File tree

3 files changed

+43
-42
lines changed

3 files changed

+43
-42
lines changed

‎Terraform.sublime-syntax

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,16 @@ variables:
6565

6666
# Block types that are known to Terraform.
6767
#
68-
# resource: https://www.terraform.io/docs/language/resources/syntax.html
69-
# provider: https://www.terraform.io/docs/language/providers/configuration.html
70-
# variable: https://www.terraform.io/docs/language/values/variables.html
71-
# output: https://www.terraform.io/docs/language/values/outputs.html
72-
# locals: https://www.terraform.io/docs/language/values/locals.html
73-
# module: https://www.terraform.io/docs/language/modules/syntax.html
74-
# data: https://www.terraform.io/docs/language/data-sources/index.html
75-
# terraform: https://www.terraform.io/docs/language/settings/index.html#terraform-block-syntax
76-
terraform_known_blocks: resource|provider|variable|output|locals|module|data|terraform
68+
# data: https://developer.hashicorp.com/terraform/language/data-sources
69+
# ephemeral: https://developer.hashicorp.com/terraform/language/resources/ephemeral
70+
# locals: https://developer.hashicorp.com/terraform/language/values/locals
71+
# module: https://developer.hashicorp.com/terraform/language/modules/syntax
72+
# output: https://developer.hashicorp.com/terraform/language/values/outputs
73+
# provider: https://developer.hashicorp.com/terraform/language/providers/configuration
74+
# resource: https://developer.hashicorp.com/terraform/language/resources/syntax
75+
# terraform: https://developer.hashicorp.com/terraform/language/terraform#terraform-block-syntax
76+
# variable: https://developer.hashicorp.com/terraform/language/values/variables
77+
terraform_known_blocks: data|ephemeral|locals|module|output|provider|resource|terraform|variable
7778

7879
# Terraform built-in type keywords
7980
#
@@ -336,13 +337,13 @@ contexts:
336337
# https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md#operations
337338
operators:
338339
- match: \>\= # >=
339-
scope: keyword.operator.terraform
340+
scope: keyword.operator.comparison.terraform
340341
- match: \<\= # <=
341-
scope: keyword.operator.terraform
342+
scope: keyword.operator.comparison.terraform
342343
- match: \=\= # ==
343-
scope: keyword.operator.terraform
344+
scope: keyword.operator.comparison.terraform
344345
- match: \!\= # !=
345-
scope: keyword.operator.terraform
346+
scope: keyword.operator.comparison.terraform
346347
- match: \+ # +
347348
scope: keyword.operator.arithmetic.terraform
348349
- match: \- # -
@@ -360,15 +361,15 @@ contexts:
360361
- match: \! # !
361362
scope: keyword.operator.logical.terraform
362363
- match: \> # >
363-
scope: keyword.operator.terraform
364+
scope: keyword.operator.comparison.terraform
364365
- match: \< # <
365-
scope: keyword.operator.terraform
366+
scope: keyword.operator.comparison.terraform
366367
- match: \? # ?
367-
scope: keyword.operator.terraform
368+
scope: keyword.operator.ternary.terraform
368369
- match: \.\.\. # ...
369370
scope: keyword.operator.terraform
370371
- match: ':' # :
371-
scope: keyword.operator.terraform
372+
scope: keyword.operator.ternary.terraform
372373

373374
# Terraform "import" statements
374375
#

‎syntax_test_terraform-vars.tfvars

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@
7676
# ^ meta.function-call.terraform punctuation.section.parens.begin.terraform
7777
# ^^^^^^^^^ meta.function-call.terraform
7878
# ^ meta.function-call.terraform punctuation.section.parens.end.terraform
79-
# ^ keyword.operator.terraform
79+
# ^ keyword.operator.comparison.terraform
8080
# ^ constant.numeric.integer.terraform
81-
# ^ keyword.operator.terraform
81+
# ^ keyword.operator.ternary.terraform
8282
# ^ punctuation.section.brackets.begin.terraform
8383
# ^ constant.numeric.integer.terraform
8484
# ^ punctuation.section.brackets.end.terraform
85-
# ^ keyword.operator.terraform
85+
# ^ keyword.operator.ternary.terraform
8686

8787
[{a = 1}, {g = 2}]
8888
# ^ punctuation.section.brackets.begin.terraform

‎syntax_test_terraform.tf

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,9 @@
326326
# ^^ punctuation.section.interpolation.begin.terraform
327327
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.terraform
328328
# ^^^^^^^^^^^^^^^^^^^^^^^^^^ source.terraform
329-
# ^ keyword.operator.terraform
329+
# ^ keyword.operator.ternary.terraform
330330
# ^^^^ meta.interpolation.terraform constant.language.boolean.true.terraform
331-
# ^ meta.interpolation.terraform keyword.operator.terraform
331+
# ^ meta.interpolation.terraform keyword.operator.ternary.terraform
332332
# ^^^^^ meta.interpolation.terraform constant.language.boolean.false.terraform
333333
# ^ meta.interpolation.terraform punctuation.section.interpolation.end.terraform
334334
# ^ string.quoted.double.terraform punctuation.definition.string.end.terraform
@@ -495,7 +495,7 @@
495495
# ^^ meta.interpolation.terraform punctuation.section.interpolation.begin.terraform
496496
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.terraform
497497
# ^^ meta.interpolation.terraform keyword.control.terraform
498-
# ^^ meta.interpolation.terraform keyword.operator.terraform
498+
# ^^ meta.interpolation.terraform keyword.operator.comparison.terraform
499499
# ^ source.terraform meta.interpolation.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
500500
# ^^^^^^ source.terraform meta.interpolation.terraform string.quoted.double.terraform
501501
# ^ source.terraform meta.interpolation.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform
@@ -519,7 +519,7 @@
519519
# ^^ meta.interpolation.terraform punctuation.section.interpolation.begin.terraform
520520
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.interpolation.terraform
521521
# ^^ meta.interpolation.terraform keyword.control.terraform
522-
# ^^ meta.interpolation.terraform keyword.operator.terraform
522+
# ^^ meta.interpolation.terraform keyword.operator.comparison.terraform
523523
# ^ source.terraform meta.interpolation.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
524524
# ^^^^^^ source.terraform meta.interpolation.terraform string.quoted.double.terraform
525525
# ^ source.terraform meta.interpolation.terraform string.quoted.double.terraform punctuation.definition.string.end.terraform
@@ -576,32 +576,32 @@
576576

577577
a == b
578578
# ^ -keyword -operator
579-
# ^^ keyword.operator.terraform
579+
# ^^ keyword.operator.comparison.terraform
580580
# ^ -keyword -operator
581581

582582
a != b
583583
# ^ -keyword -operator
584-
# ^^ keyword.operator.terraform
584+
# ^^ keyword.operator.comparison.terraform
585585
# ^ -keyword -operator
586586

587587
a < b
588588
# ^ -keyword -operator
589-
# ^ keyword.operator.terraform
589+
# ^ keyword.operator.comparison.terraform
590590
# ^ -keyword -operator
591591

592592
a <= b
593593
# ^ -keyword -operator
594-
# ^^ keyword.operator.terraform
594+
# ^^ keyword.operator.comparison.terraform
595595
# ^ -keyword -operator
596596

597597
a > b
598598
# ^ -keyword -operator
599-
# ^ keyword.operator.terraform
599+
# ^ keyword.operator.comparison.terraform
600600
# ^ -keyword -operator
601601

602602
a >= b
603603
# ^ -keyword -operator
604-
# ^^ keyword.operator.terraform
604+
# ^^ keyword.operator.comparison.terraform
605605
# ^ -keyword -operator
606606

607607
/////
@@ -666,13 +666,13 @@
666666
# ^ meta.function-call.terraform punctuation.section.parens.begin.terraform
667667
# ^^^^^^^^^ meta.function-call.terraform
668668
# ^ meta.function-call.terraform punctuation.section.parens.end.terraform
669-
# ^ keyword.operator.terraform
669+
# ^ keyword.operator.comparison.terraform
670670
# ^ constant.numeric.integer.terraform
671-
# ^ keyword.operator.terraform
671+
# ^ keyword.operator.ternary.terraform
672672
# ^ punctuation.section.brackets.begin.terraform
673673
# ^ constant.numeric.integer.terraform
674674
# ^ punctuation.section.brackets.end.terraform
675-
# ^ keyword.operator.terraform
675+
# ^ keyword.operator.ternary.terraform
676676

677677
/////
678678
// Ellipsis
@@ -2617,10 +2617,10 @@
26172617
# ^^^^^^^^ variable.other.readwrite.terraform
26182618
# ^ punctuation.accessor.dot.terraform
26192619
# ^^^^^^^^^ variable.other.member.terraform
2620-
# ^^ keyword.operator.terraform
2620+
# ^^ keyword.operator.comparison.terraform
26212621
# ^ string.quoted.double.terraform punctuation.definition.string.begin.terraform
26222622
# ^ string.quoted.double.terraform punctuation.definition.string.end.terraform
2623-
# ^ keyword.operator.terraform
2623+
# ^ keyword.operator.ternary.terraform
26242624
# ^^^^ meta.function-call.terraform support.function.builtin.terraform
26252625
# ^ meta.function-call.terraform punctuation.section.parens.begin.terraform
26262626
# ^^^^^^^^ meta.function-call.terraform
@@ -2631,7 +2631,7 @@
26312631
# ^ meta.function-call.terraform punctuation.accessor.dot.terraform
26322632
# ^^^^^^^^^ meta.function-call.terraform variable.other.member.terraform
26332633
# ^ meta.function-call.terraform punctuation.section.parens.end.terraform
2634-
# ^ keyword.operator.terraform
2634+
# ^ keyword.operator.ternary.terraform
26352635
# ^^^^ meta.function-call.terraform support.function.builtin.terraform
26362636
# ^ meta.function-call.terraform punctuation.section.parens.begin.terraform
26372637
# ^^^^^^^^ meta.function-call.terraform
@@ -2663,18 +2663,18 @@
26632663
# ^^^^^^^^ variable.other.readwrite.terraform
26642664
# ^ punctuation.accessor.dot.terraform
26652665
# ^^^^^^^^^ variable.other.member.terraform
2666-
# ^^ keyword.operator.terraform
2666+
# ^^ keyword.operator.comparison.terraform
26672667
# ^ string.quoted.double.terraform punctuation.definition.string.begin.terraform
26682668
# ^ string.quoted.double.terraform punctuation.definition.string.end.terraform
2669-
# ^ keyword.operator.terraform
2669+
# ^ keyword.operator.ternary.terraform
26702670
# ^ punctuation.section.brackets.begin.terraform
26712671
# ^ punctuation.accessor.dot.terraform
26722672
# ^^^^^^^^^^ variable.other.member.terraform
26732673
# ^ punctuation.separator.terraform
26742674
# ^ punctuation.accessor.dot.terraform
26752675
# ^^^^^^^^^ variable.other.member.terraform
26762676
# ^ punctuation.section.brackets.end.terraform
2677-
# ^ keyword.operator.terraform
2677+
# ^ keyword.operator.ternary.terraform
26782678
# ^ punctuation.section.brackets.begin.terraform
26792679
# ^ punctuation.accessor.dot.terraform
26802680
# ^^^^^^^^^^ variable.other.member.terraform
@@ -2702,7 +2702,7 @@
27022702
# ^ meta.function-call.terraform punctuation.section.parens.end.terraform
27032703
# ^^ keyword.control.conditional.terraform
27042704
# ^ variable.other.readwrite.terraform
2705-
# ^^ keyword.operator.terraform
2705+
# ^^ keyword.operator.comparison.terraform
27062706
# ^ string.quoted.double.terraform punctuation.definition.string.begin.terraform
27072707
# ^ string.quoted.double.terraform punctuation.definition.string.end.terraform
27082708
# ^ punctuation.section.brackets.end.terraform
@@ -2732,7 +2732,7 @@
27322732
# ^ variable.other.readwrite.terraform
27332733
# ^^ keyword.control.conditional.terraform
27342734
# ^ variable.other.readwrite.terraform
2735-
# ^ keyword.operator.terraform
2735+
# ^ keyword.operator.comparison.terraform
27362736
# ^ constant.numeric.integer.terraform
27372737
# ^ punctuation.section.brackets.end.terraform
27382738

@@ -2813,7 +2813,7 @@
28132813
# ^^^ keyword.operator.terraform
28142814
# ^^ keyword.control.conditional.terraform
28152815
# ^ variable.other.readwrite.terraform
2816-
# ^^ keyword.operator.terraform
2816+
# ^^ keyword.operator.comparison.terraform
28172817
# ^ string.quoted.double.terraform punctuation.definition.string.begin.terraform
28182818
# ^ string.quoted.double.terraform punctuation.definition.string.end.terraform
28192819
# ^ punctuation.section.braces.end.terraform

0 commit comments

Comments
 (0)