Apply string scopes to resource block identifiers

Author: FichteFoll

Terraform.sublime-syntax

@@ -701,17 +701,19 @@ contexts:
   # https://github.com/hashicorp/hcl2/blob/master/hcl/hclsyntax/spec.md#structural-elements
   block:
     # Special case heuristic for the AWS and friends two-term resources
-    - match: (\b(resource)\s+(")({{identifier}})(")\s+(")({{identifier}})("))\s*(\{)
+    - match: (\b(resource)\s+((")({{identifier}})("))\s+((")({{identifier}})(")))\s*(\{)
       captures:
         1: meta.type.terraform
         2: keyword.declaration.terraform
-        3: punctuation.definition.begin.terraform
-        4: support.type.terraform
-        5: punctuation.definition.end.terraform
-        6: punctuation.definition.begin.terraform
-        7: entity.name.type.terraform
-        8: punctuation.definition.end.terraform
-        9: meta.block.terraform punctuation.section.block.begin.terraform
+        3: meta.string.terraform string.quoted.double.terraform
+        4: punctuation.definition.string.begin.terraform
+        5: support.type.terraform
+        6: punctuation.definition.string.end.terraform
+        7: meta.string.terraform string.quoted.double.terraform
+        8: punctuation.definition.string.begin.terraform
+        9: entity.name.type.terraform
+        10: punctuation.definition.string.end.terraform
+        11: meta.block.terraform punctuation.section.block.begin.terraform
       push: block-body
     # Generic
     - match: (?:\b({{terraform_known_blocks}})\b|({{identifier}}))(?=[-\s\w"]*\{)

tests/syntax_test_scope.tf

@@ -2997,22 +2997,24 @@
 
     resource "aws_security_group" "example" {
 #   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.type.terraform
-#                                          ^ - meta.type - meta.block meta.block
-#                                           ^^ meta.block.terraform - meta.type
 #   ^^^^^^^^ keyword.declaration.terraform
-#            ^ punctuation.definition.begin.terraform
+#            ^^^^^^^^^^^^^^^^^^^^ meta.string.terraform string.quoted.double.terraform
+#            ^ punctuation.definition.string.begin.terraform
 #             ^^^^^^^^^^^^^^^^^^ support.type.terraform
-#                               ^ punctuation.definition.end.terraform
-#                                 ^ punctuation.definition.begin.terraform
+#                               ^ punctuation.definition.string.end.terraform
+#                                 ^^^^^^^^^ meta.string.terraform string.quoted.double.terraform
+#                                 ^ punctuation.definition.string.begin.terraform
 #                                  ^^^^^^^ entity.name.type.terraform
-#                                         ^ punctuation.definition.end.terraform
-#                                           ^ punctuation.section.block.begin.terraform
+#                                         ^ punctuation.definition.string.end.terraform
+#                                           ^ meta.block.terraform punctuation.section.block.begin.terraform
+
       name = "example"
-#    ^^^^^^^^^^^^^^^^^^ meta.block.terraform
+#     ^^^^^^^^^^^^^^^^ meta.block.terraform
 #     ^^^^ variable.declaration.terraform variable.other.readwrite.terraform
 #          ^ keyword.operator.assignment.terraform
-#            ^ string.quoted.double.terraform punctuation.definition.string.begin.terraform
-#             ^^^^^^^^ string.quoted.double.terraform
+#            ^^^^^^^^^ meta.string.terraform string.quoted.double.terraform
+#            ^ punctuation.definition.string.begin.terraform
+#                    ^ punctuation.definition.string.end.terraform
 
       dynamic "ingress" {
 #     ^^^^^^^^^^^^^^^^^ meta.block.terraform meta.type.terraform - meta.block meta.block