AWS blocks (#69)

* Scope AWS ACL strings

* Scope AWS patterned blocks somewhat like classes

Author: michaelblyons

Terraform.sublime-syntax

@@ -289,6 +289,7 @@ contexts:
     - match: '{{char_escapes}}'
       comment: Character Escapes
       scope: constant.character.escape.terraform
+    - include: aws-acl
 
   # String Interpolation: ("${" | "${~") Expression ("}" | "~}"
   #
@@ -626,6 +627,21 @@ contexts:
   #
   # https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md#structural-elements
   block:
+    # Special case heuristic for the AWS two-term resources
+    - match: (\b(resource)\s+(")(aws_{{identifier}})(")\s+(")({{identifier}})("))\s*(\{)
+      captures:
+        1: meta.type.terraform
+        2: keyword.declaration.terraform
+        3: punctuation.definition.begin.terraform
+        4: support.type.aws
+        5: punctuation.definition.end.terraform
+        6: punctuation.definition.begin.terraform
+        7: entity.name.type.aws
+        8: punctuation.definition.end.terraform
+        9: punctuation.section.block.begin.terraform
+      push: block_body
+
+    # Generic
     - match: (?:\b({{terraform_known_blocks}})\b|({{identifier}}))(?=[\s\"\-[:word:]]*(\{))
       captures:
         1: keyword.declaration.terraform
@@ -656,6 +672,18 @@ contexts:
       scope: punctuation.section.block.end.terraform
       pop: true
 
+  aws-acl:
+    - match: (?=\barn:aws:)
+      push:
+        - meta_scope: variable.language.acl.terraform
+        - include: string_interpolation
+        - match: :|/
+          scope: punctuation.separator.sequence.terraform
+        - match: \*
+          scope: constant.other.wildcard.asterisk.terraform
+        - match: (?![\w-])
+          pop: true
+
   else_pop:
     - match: (?=\S)
       pop: true

syntax_test_terraform-vars.tfvars

@@ -66,6 +66,17 @@
 #                                  ^ punctuation.definition.string.end.terraform
 #                                   ^ -punctuation -string
 
+      "arn:aws:sns:us-east-1:123456789012:example-sns-topic-name"
+#     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.terraform string.quoted.double.terraform
+#     ^ punctuation.definition.string.begin.terraform
+#      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ variable.language.acl.terraform
+#         ^ punctuation.separator.sequence.terraform
+#             ^ punctuation.separator.sequence.terraform
+#                 ^ punctuation.separator.sequence.terraform
+#                           ^ punctuation.separator.sequence.terraform
+#                                        ^ punctuation.separator.sequence.terraform
+#                                                               ^ punctuation.definition.string.end.terraform
+
     a + b
 #    ^ -keyword -operator
 #     ^ keyword.operator.arithmetic.terraform

syntax_test_terraform.tf

@@ -2890,12 +2890,16 @@
 /////
 
     resource "aws_security_group" "example" {
-#   ^^^^^^^^ meta.type.terraform keyword.declaration.terraform
-#            ^ meta.type.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
-#             ^^^^^^^^^^^^^^^^^^^ meta.type.terraform string.quoted.double.terraform
-#                                 ^ meta.type.terraform string.quoted.double.terraform punctuation.definition.string.begin.terraform
-#                                  ^^^^^^^^ meta.type.terraform string.quoted.double.terraform
-#                                           ^ meta.type.terraform meta.block.terraform punctuation.section.block.begin.terraform
+#   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.block.terraform
+#   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.type.terraform
+#   ^^^^^^^^ keyword.declaration.terraform
+#            ^ punctuation.definition.begin.terraform
+#             ^^^^^^^^^^^^^^^^^^ support.type.aws
+#                               ^ punctuation.definition.end.terraform
+#                                 ^ punctuation.definition.begin.terraform
+#                                  ^^^^^^^ entity.name.type.aws
+#                                         ^ punctuation.definition.end.terraform
+#                                           ^ punctuation.section.block.begin.terraform
       name = "example"
 #     ^^^^ meta.block.terraform variable.declaration.terraform variable.other.readwrite.terraform
 #          ^ meta.block.terraform keyword.operator.assignment.terraform