Fix highlighting of .0, .* attribute access and [*] brackets

src/_main.yml

@@ -105,6 +105,7 @@ repository:
       - include: "#brackets"
       - include: "#objects"
       - include: "#attribute_access"
+      - include: "#attribute_splat"
       - include: "#functions"
       - include: "#parens"
   literal_values:
@@ -227,13 +228,14 @@ repository:
     beginCaptures:
       "0":
         name: punctuation.section.brackets.begin.hcl
-    end: (\*?)\]
+    end: \]
     endCaptures:
       "0":
         name: punctuation.section.brackets.end.hcl
-      "1":
-        name: keyword.operator.splat.hcl
     patterns:
+      - match: \*
+        comment: Splat operator
+        name: keyword.operator.splat.hcl
       - include: "#comma"
       - include: "#comments"
       - include: "#inline_for_expression"
@@ -290,6 +292,7 @@ repository:
             name: keyword.operator.hcl
         patterns:
           - include: "#attribute_access"
+          - include: "#attribute_splat"
       - include: "#object_key_values"
   object_key_values:
     patterns:
@@ -366,24 +369,31 @@ repository:
       - include: "#comma"
       - include: "#local_identifiers"
   attribute_access:
-    begin: \.
+    begin: \.(?!\*)
     beginCaptures:
       "0":
         name: keyword.operator.accessor.hcl
-    end: "[[:alpha:]][[:alnum:]_-]*(\\[[0-9\\*]+\\])?"
-    comment: Matches a variable with an optional splat or index ([*]/[0])
+    end: '[[:alpha:]][\w-]*|\d*'
+    comment: Matches traversal attribute access such as .attr
     endCaptures:
       "0":
         patterns:
-          - match: \b(?!null|false|true)[[:alpha:]][[:alnum:]_-]*\b
-            comment: Attribute name including - and _
+          - match: (?!null|false|true)[[:alpha:]][\w-]*
+            comment: Attribute name
             name: variable.other.member.hcl
           - match: \d+
             comment: Optional attribute index
             name: constant.numeric.integer.hcl
-          - match: \*
-            comment: Optional attribute-only splat
-            name: keyword.operator.splat.hcl
+  attribute_splat:
+    begin: \.
+    end: \*
+    comment: Legacy attribute-only splat
+    beginCaptures:
+      "0":
+        name: keyword.operator.accessor.hcl
+    endCaptures:
+      "0":
+        name: keyword.operator.splat.hcl
   functions:
     begin: (\w+)(\()
     name: meta.function-call.hcl

syntaxes/hcl.tmGrammar.json

@@ -21,9 +21,9 @@
   ],
   "repository": {
     "attribute_access": {
-      "begin": "\\.",
-      "end": "[[:alpha:]][[:alnum:]_-]*(\\[[0-9\\*]+\\])?",
-      "comment": "Matches a variable with an optional splat or index ([*]/[0])",
+      "begin": "\\.(?!\\*)",
+      "end": "[[:alpha:]][\\w-]*|\\d*",
+      "comment": "Matches traversal attribute access such as .attr",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.accessor.hcl"
@@ -33,19 +33,14 @@
         "0": {
           "patterns": [
             {
-              "match": "\\b(?!null|false|true)[[:alpha:]][[:alnum:]_-]*\\b",
-              "comment": "Attribute name including - and _",
+              "match": "(?!null|false|true)[[:alpha:]][\\w-]*",
+              "comment": "Attribute name",
               "name": "variable.other.member.hcl"
             },
             {
               "match": "\\d+",
               "comment": "Optional attribute index",
               "name": "constant.numeric.integer.hcl"
-            },
-            {
-              "match": "\\*",
-              "comment": "Optional attribute-only splat",
-              "name": "keyword.operator.splat.hcl"
             }
           ]
         }
@@ -70,6 +65,21 @@
         }
       }
     },
+    "attribute_splat": {
+      "begin": "\\.",
+      "end": "\\*",
+      "comment": "Legacy attribute-only splat",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.accessor.hcl"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "keyword.operator.splat.hcl"
+        }
+      }
+    },
     "block": {
       "name": "meta.block.hcl",
       "begin": "(\\w+)([\\s\\\"\\-\\w]*)(\\{)",
@@ -131,7 +141,7 @@
     },
     "brackets": {
       "begin": "\\[",
-      "end": "(\\*?)\\]",
+      "end": "\\]",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.brackets.begin.hcl"
@@ -140,12 +150,14 @@
       "endCaptures": {
         "0": {
           "name": "punctuation.section.brackets.end.hcl"
-        },
-        "1": {
-          "name": "keyword.operator.splat.hcl"
         }
       },
       "patterns": [
+        {
+          "name": "keyword.operator.splat.hcl",
+          "match": "\\*",
+          "comment": "Splat operator"
+        },
         {
           "include": "#comma"
         },
@@ -223,6 +235,9 @@
         {
           "include": "#attribute_access"
         },
+        {
+          "include": "#attribute_splat"
+        },
         {
           "include": "#functions"
         },
@@ -573,6 +588,9 @@
           "patterns": [
             {
               "include": "#attribute_access"
+            },
+            {
+              "include": "#attribute_splat"
             }
           ]
         },

syntaxes/terraform.tmGrammar.json

@@ -22,9 +22,9 @@
   ],
   "repository": {
     "attribute_access": {
-      "begin": "\\.",
-      "end": "[[:alpha:]][[:alnum:]_-]*(\\[[0-9\\*]+\\])?",
-      "comment": "Matches a variable with an optional splat or index ([*]/[0])",
+      "begin": "\\.(?!\\*)",
+      "end": "[[:alpha:]][\\w-]*|\\d*",
+      "comment": "Matches traversal attribute access such as .attr",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.accessor.hcl"
@@ -34,19 +34,14 @@
         "0": {
           "patterns": [
             {
-              "match": "\\b(?!null|false|true)[[:alpha:]][[:alnum:]_-]*\\b",
-              "comment": "Attribute name including - and _",
+              "match": "(?!null|false|true)[[:alpha:]][\\w-]*",
+              "comment": "Attribute name",
               "name": "variable.other.member.hcl"
             },
             {
               "match": "\\d+",
               "comment": "Optional attribute index",
               "name": "constant.numeric.integer.hcl"
-            },
-            {
-              "match": "\\*",
-              "comment": "Optional attribute-only splat",
-              "name": "keyword.operator.splat.hcl"
             }
           ]
         }
@@ -71,6 +66,21 @@
         }
       }
     },
+    "attribute_splat": {
+      "begin": "\\.",
+      "end": "\\*",
+      "comment": "Legacy attribute-only splat",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.operator.accessor.hcl"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "keyword.operator.splat.hcl"
+        }
+      }
+    },
     "block": {
       "name": "meta.block.hcl",
       "begin": "(\\w+)([\\s\\\"\\-\\w]*)(\\{)",
@@ -137,7 +147,7 @@
     },
     "brackets": {
       "begin": "\\[",
-      "end": "(\\*?)\\]",
+      "end": "\\]",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.brackets.begin.hcl"
@@ -146,12 +156,14 @@
       "endCaptures": {
         "0": {
           "name": "punctuation.section.brackets.end.hcl"
-        },
-        "1": {
-          "name": "keyword.operator.splat.hcl"
         }
       },
       "patterns": [
+        {
+          "name": "keyword.operator.splat.hcl",
+          "match": "\\*",
+          "comment": "Splat operator"
+        },
         {
           "include": "#comma"
         },
@@ -229,6 +241,9 @@
         {
           "include": "#attribute_access"
         },
+        {
+          "include": "#attribute_splat"
+        },
         {
           "include": "#functions"
         },

tests/snapshot/hcl/expressions_splat.hcl

@@ -1,5 +1,13 @@
-[for o in var.list : o.id]
+attr = [for o in var.list : o.id]
 
-var.list[*].id
+attr = var.list[*].id
 
-var.list[*].interfaces[0].name
+attr = var.list[*].interfaces[0].name
+
+attr = var.list.*.id
+
+attr = "${var.list.*.id}"
+
+attr = "${var.list.*}"
+
+attr = var.list.*