tm-grammars 1.22.18 → 1.23.0

package/grammars/proto.json

@@ -59,7 +59,7 @@
           "name": "entity.name.class.proto"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#reserved"
@@ -71,7 +71,7 @@
           "include": "#comments"
         },
         {
-          "begin": "([A-Za-z][A-Za-z0-9_]*)\\s*(=)\\s*(0[xX][0-9a-fA-F]+|[0-9]+)",
+          "begin": "([A-Za-z][A-Za-z0-9_]*)\\s*(=)\\s*(0[xX]\\h+|[0-9]+)",
           "beginCaptures": {
             "1": {
               "name": "variable.other.proto"
@@ -98,7 +98,7 @@
       ]
     },
     "field": {
-      "begin": "\\s*(optional|repeated|required)?\\s*\\b([\\w.]+)\\s+(\\w+)\\s*(=)\\s*(0[xX][0-9a-fA-F]+|[0-9]+)",
+      "begin": "\\s*(optional|repeated|required)?\\s*\\b([\\w.]+)\\s+(\\w+)\\s*(=)\\s*(0[xX]\\h+|[0-9]+)",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.proto"
@@ -130,7 +130,7 @@
     },
     "fieldOptions": {
       "begin": "\\[",
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#constants"
@@ -251,7 +251,7 @@
           "name": "entity.name.class.message.proto"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#reserved"
@@ -289,7 +289,7 @@
           "name": "entity.name.function"
         }
       },
-      "end": "\\}|(;)",
+      "end": "}|(;)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.proto"
@@ -311,7 +311,7 @@
       ]
     },
     "number": {
-      "match": "\\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))((e|E)(\\+|-)?[0-9]+)?)\\b",
+      "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+\\-])?[0-9]+)?)\\b",
       "name": "constant.numeric.proto"
     },
     "oneof": {
@@ -324,7 +324,7 @@
           "name": "variable.other.proto"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#optionStmt"
@@ -452,7 +452,7 @@
           "name": "entity.name.class.message.proto"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#comments"
@@ -470,12 +470,12 @@
       "name": "storage.type.proto"
     },
     "string": {
-      "match": "('([^']|\\')*')|(\"([^\"]|\\\")*\")",
+      "match": "('([[^']'])*')|(\"([[^\"]\"])*\")",
       "name": "string.quoted.double.proto"
     },
     "subMsgOption": {
       "begin": "\\{",
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#kv"

package/grammars/pug.json

@@ -3,7 +3,7 @@
   "name": "pug",
   "patterns": [
     {
-      "match": "^(!!!|doctype)(\\s*[a-zA-Z0-9-_]+)?",
+      "match": "^(!!!|doctype)(\\s*[a-zA-Z0-9\\-_]+)?",
       "name": "meta.tag.sgml.doctype.html"
     },
     {
@@ -240,7 +240,7 @@
               "name": "invalid.illegal.name.generic.filter.pug"
             },
             {
-              "match": "[\\w-]",
+              "match": "[\\w\\-]",
               "name": "constant.language.name.generic.filter.pug"
             },
             {
@@ -255,7 +255,7 @@
       ]
     },
     {
-      "begin": "^(\\s*)(?:(?=\\.$)|(?:(?=[\\w.#].*?\\.$)(?=(?:(?:(?:(?:(?:#[\\w-]+)|(?:\\.[\\w-]+))|(?:(?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))(?:(?:#[\\w-]+)|(?:\\.[\\w-]+)|(?:\\((?:[^()\\'\\\"]*(?:(?:\\'(?:[^\\']|(?:(?<!\\\\)\\\\\\'))*\\')|(?:\\\"(?:[^\\\"]|(?:(?<!\\\\)\\\\\\\"))*\\\")))*[^()]*\\))*)*)(?:(?:(?::\\s+)|(?<=\\)))(?:(?:(?:(?:#[\\w-]+)|(?:\\.[\\w-]+))|(?:(?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))(?:(?:#[\\w-]+)|(?:\\.[\\w-]+)|(?:\\((?:[^()\\'\\\"]*(?:(?:\\'(?:[^\\']|(?:(?<!\\\\)\\\\\\'))*\\')|(?:\\\"(?:[^\\\"]|(?:(?<!\\\\)\\\\\\\"))*\\\")))*[^()]*\\))*)*))*)\\.$)(?:(?:(#[\\w-]+)|(\\.[\\w-]+))|((?:[#!]\\{[^}]*\\})|(?:\\w(?:(?:[\\w:-]+[\\w-])|(?:[\\w-]*)))))))",
+      "begin": "^(\\s*)(?:(?=\\.$)|(?=[\\w.#].*?\\.$)(?=(?:(?:#[\\w\\-]+|\\.[\\w\\-]+)|(?:[#!]\\{[^}]*}|\\w(?:[\\w:\\-]+[\\w\\-]|[\\w\\-]*)))(?:#[\\w\\-]+|\\.[\\w\\-]+|(?:\\((?:[^()'\"]*(?:'(?:[^']|(?<!\\\\)\\\\')*'|\"(?:[^\"]|(?<!\\\\)\\\\\")*\"))*[^()]*\\))*)*(?:(?::\\s+|(?<=\\)))(?:(?:#[\\w\\-]+|\\.[\\w\\-]+)|(?:[#!]\\{[^}]*}|\\w(?:[\\w:\\-]+[\\w\\-]|[\\w\\-]*)))(?:#[\\w\\-]+|\\.[\\w\\-]+|(?:\\((?:[^()'\"]*(?:'(?:[^']|(?<!\\\\)\\\\')*'|\"(?:[^\"]|(?<!\\\\)\\\\\")*\"))*[^()]*\\))*)*)*\\.$)(?:(?:(#[\\w\\-]+)|(\\.[\\w\\-]+))|([#!]\\{[^}]*}|\\w(?:[\\w:\\-]+[\\w\\-]|[\\w\\-]*))))",
       "beginCaptures": {
         "2": {
           "name": "meta.selector.css entity.other.attribute-name.id.css.pug"
@@ -357,7 +357,7 @@
           "include": "#printed_expression"
         },
         {
-          "begin": "\\G(?=(#[^\\{\\w-])|[^\\w.#])",
+          "begin": "\\G(?=(#[^{\\w\\-])|[^\\w.#])",
           "end": "$",
           "patterns": [
             {
@@ -401,7 +401,7 @@
   "repository": {
     "babel_parens": {
       "begin": "\\(",
-      "end": "\\)|(({\\s*)?$)",
+      "end": "\\)|((\\{\\s*)?$)",
       "patterns": [
         {
           "include": "#babel_parens"
@@ -604,11 +604,11 @@
     "html_entity": {
       "patterns": [
         {
-          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)",
+          "match": "(&)([a-zA-Z0-9]+|#[0-9]+|#x\\h+)(;)",
           "name": "constant.character.entity.html.text.pug"
         },
         {
-          "match": "[<>&]",
+          "match": "[<>\\&]",
           "name": "invalid.illegal.html_entity.text.pug"
         }
       ]
@@ -623,7 +623,7 @@
           "name": "entity.name.function.pug"
         }
       },
-      "end": "(\\])",
+      "end": "(])",
       "name": "inline.pug",
       "patterns": [
         {
@@ -633,8 +633,8 @@
           "include": "#mixin_call"
         },
         {
-          "begin": "(?<!\\])(?=[\\w.#])|(:\\s*)",
-          "end": "(?=\\]|(:.)|=|\\s)",
+          "begin": "(?<!])(?=[\\w.#])|(:\\s*)",
+          "end": "(?=]|(:.)|[=\\s])",
           "name": "tag.inline.pug",
           "patterns": [
             {
@@ -678,11 +678,11 @@
     },
     "inline_pug_text": {
       "begin": "",
-      "end": "(?=\\])",
+      "end": "(?=])",
       "patterns": [
         {
           "begin": "\\[",
-          "end": "\\]",
+          "end": "]",
           "patterns": [
             {
               "include": "#inline_pug_text"
@@ -711,12 +711,12 @@
       "name": "invalid.illegal.tag.pug"
     },
     "interpolated_value": {
-      "begin": "(?<!\\\\)[#!]\\{(?=.*?\\})",
-      "end": "\\}",
+      "begin": "(?<!\\\\)[#!]\\{(?=.*?})",
+      "end": "}",
       "name": "string.interpolated.pug",
       "patterns": [
         {
-          "match": "{",
+          "match": "\\{",
           "name": "invalid.illegal.tag.pug"
         },
         {
@@ -726,7 +726,7 @@
     },
     "js_braces": {
       "begin": "\\{",
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#js_braces"
@@ -738,7 +738,7 @@
     },
     "js_brackets": {
       "begin": "\\[",
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#js_brackets"
@@ -761,7 +761,7 @@
       ]
     },
     "mixin_call": {
-      "begin": "((?:mixin\\s+)|\\+)([\\w-]+)",
+      "begin": "(mixin\\s+|\\+)([\\w\\-]+)",
       "beginCaptures": {
         "1": {
           "name": "storage.type.function.pug"
@@ -816,16 +816,16 @@
           "name": "punctuation.definition.parameters.begin.js"
         }
       },
-      "match": "(mixin\\s+)([\\w-]+)(?:(\\()\\s*((?:[a-zA-Z_]\\w*\\s*)(?:,\\s*[a-zA-Z_]\\w*\\s*)*)(\\)))?$"
+      "match": "(mixin\\s+)([\\w\\-]+)(?:(\\()\\s*([a-zA-Z_]\\w*\\s*(?:,\\s*[a-zA-Z_]\\w*\\s*)*)(\\)))?$"
     },
     "printed_expression": {
-      "begin": "(!?\\=)\\s*",
+      "begin": "(!?=)\\s*",
       "captures": {
         "1": {
           "name": "constant"
         }
       },
-      "end": "(?=\\])|$",
+      "end": "(?=])|$",
       "name": "source.js",
       "patterns": [
         {
@@ -879,7 +879,7 @@
         },
         {
           "begin": "=\\s*",
-          "end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>?/])|\\))",
+          "end": "$|(?=,|\\s+[^!%\\&*\\-+~|<>?/]|\\))",
           "name": "attribute_value",
           "patterns": [
             {
@@ -897,8 +897,8 @@
           ]
         },
         {
-          "begin": "(?<=[%&*\\-+~|<>:?/])\\s+",
-          "end": "$|(?=,|(?:\\s+[^!%&*\\-+~|<>?/])|\\))",
+          "begin": "(?<=[%\\&*\\-+~|<>:?/])\\s+",
+          "end": "$|(?=,|\\s+[^!%\\&*\\-+~|<>?/]|\\))",
           "name": "attribute_value2",
           "patterns": [
             {
@@ -923,11 +923,11 @@
           "name": "invalid.illegal.tag.pug"
         }
       },
-      "match": "\\.([^\\w-])?[\\w-]*",
+      "match": "\\.([^\\w\\-])?[\\w\\-]*",
       "name": "meta.selector.css entity.other.attribute-name.class.css.pug"
     },
     "tag_id": {
-      "match": "#[\\w-]+",
+      "match": "#[\\w\\-]+",
       "name": "meta.selector.css entity.other.attribute-name.id.css.pug"
     },
     "tag_mixin_attributes": {
@@ -950,17 +950,17 @@
       ]
     },
     "tag_name": {
-      "begin": "([#!]\\{(?=.*?\\}))|(\\w(([\\w:-]+[\\w-])|([\\w-]*)))",
+      "begin": "([#!]\\{(?=.*?}))|(\\w(([\\w:\\-]+[\\w\\-])|([\\w\\-]*)))",
       "end": "(\\G(?<!\\5[^\\w-]))|\\}|$",
       "name": "meta.tag.other entity.name.tag.pug",
       "patterns": [
         {
           "begin": "\\G(?<=\\{)",
-          "end": "(?=\\})",
+          "end": "(?=})",
           "name": "meta.tag.other entity.name.tag.pug",
           "patterns": [
             {
-              "match": "{",
+              "match": "\\{",
               "name": "invalid.illegal.tag.pug"
             },
             {
@@ -998,7 +998,7 @@
           "name": "variable.parameter.javascript.embedded.pug"
         }
       },
-      "end": "(?=\\])|(({\\s*)?$)",
+      "end": "(?=])|((\\{\\s*)?$)",
       "name": "source.js",
       "patterns": [
         {

package/grammars/puppet.json

@@ -3,8 +3,8 @@
   "fileTypes": [
     "pp"
   ],
-  "foldingStartMarker": "(^\\s*/\\*|(\\{|\\[|\\()\\s*$)",
-  "foldingStopMarker": "(\\*/|^\\s*(\\}|\\]|\\)))",
+  "foldingStartMarker": "(^\\s*/\\*|([{\\[(])\\s*$)",
+  "foldingStopMarker": "(\\*/|^\\s*([}\\])]))",
   "name": "puppet",
   "patterns": [
     {
@@ -28,7 +28,7 @@
           "name": "entity.name.type.class.puppet"
         }
       },
-      "end": "(?={)",
+      "end": "(?=\\{)",
       "name": "meta.definition.class.puppet",
       "patterns": [
         {
@@ -53,7 +53,7 @@
           "name": "entity.name.type.class.puppet"
         }
       },
-      "end": "(?={)",
+      "end": "(?=\\{)",
       "name": "meta.definition.class.puppet",
       "patterns": [
         {
@@ -63,11 +63,11 @@
               "name": "storage.modifier.puppet"
             }
           },
-          "end": "(?=\\(|{)",
+          "end": "(?=[({])",
           "name": "meta.definition.class.inherits.puppet",
           "patterns": [
             {
-              "match": "\\b((?:[-_A-Za-z0-9\".]+::)*[-_A-Za-z0-9\".]+)\\b",
+              "match": "\\b((?:[\\-_A-Za-z0-9\".]+::)*[\\-_A-Za-z0-9\".]+)\\b",
               "name": "support.type.puppet"
             }
           ]
@@ -93,7 +93,7 @@
           "name": "entity.name.type.plan.puppet"
         }
       },
-      "end": "(?={)",
+      "end": "(?=\\{)",
       "name": "meta.definition.plan.puppet",
       "patterns": [
         {
@@ -117,7 +117,7 @@
           "name": "entity.name.function.puppet"
         }
       },
-      "end": "(?={)",
+      "end": "(?=\\{)",
       "name": "meta.function.puppet",
       "patterns": [
         {
@@ -158,7 +158,7 @@
       "include": "#array"
     },
     {
-      "match": "((\\$?)\"?[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*\"?):(?=\\s+|$)",
+      "match": "((\\$?)\"?[a-zA-Z_\\x7F-ÿ][a-zA-Z0-9_\\x7F-ÿ]*\"?):(?=\\s+|$)",
       "name": "entity.name.section.puppet"
     },
     {
@@ -183,11 +183,11 @@
       "name": "constant.other.key.puppet"
     },
     {
-      "match": "(?<={)\\s*\\w+\\s*(?=})",
+      "match": "(?<=\\{)\\s*\\w+\\s*(?=})",
       "name": "constant.other.bareword.puppet"
     },
     {
-      "match": "\\b(alert|crit|debug|defined|emerg|err|escape|fail|failed|file|generate|gsub|info|notice|package|realize|search|tag|tagged|template|warning)\\b(?!.*{)",
+      "match": "\\b(alert|crit|debug|defined|emerg|err|escape|fail|failed|file|generate|gsub|info|notice|package|realize|search|tag|tagged|template|warning)\\b(?!.*\\{)",
       "name": "support.function.puppet"
     },
     {
@@ -214,7 +214,7 @@
           "name": "punctuation.definition.array.begin.puppet"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.array.end.puppet"
@@ -236,7 +236,7 @@
     "constants": {
       "patterns": [
         {
-          "match": "\\b(absent|directory|false|file|present|running|stopped|true)\\b(?!.*{)",
+          "match": "\\b(absent|directory|false|file|present|running|stopped|true)\\b(?!.*\\{)",
           "name": "constant.language.puppet"
         }
       ]
@@ -289,7 +289,7 @@
           "name": "punctuation.definition.hash.begin.puppet"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.hash.end.puppet"
@@ -312,13 +312,13 @@
     "heredoc": {
       "patterns": [
         {
-          "begin": "@\\([[:blank:]]*\"([^:\\/) \\t]+)\"[[:blank:]]*(:[[:blank:]]*[a-z][a-zA-Z0-9_+]*[[:blank:]]*)?(\\/[[:blank:]]*[tsrnL$]*)?[[:blank:]]*\\)",
+          "begin": "@\\(\\p{blank}*\"([^:/) \\t]+)\"\\p{blank}*(:\\p{blank}*[a-z][a-zA-Z0-9_+]*\\p{blank}*)?(/\\p{blank}*[tsrnL$]*)?\\p{blank}*\\)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.puppet"
             }
           },
-          "end": "^[[:blank:]]*(\\|[[:blank:]]*-|\\||-)?[[:blank:]]*\\1",
+          "end": "^\\p{blank}*(\\|\\p{blank}*-|[|\\-])?\\p{blank}*\\1",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.puppet"
@@ -335,13 +335,13 @@
           ]
         },
         {
-          "begin": "@\\([[:blank:]]*([^:\\/) \\t]+)[[:blank:]]*(:[[:blank:]]*[a-z][a-zA-Z0-9_+]*[[:blank:]]*)?(\\/[[:blank:]]*[tsrnL$]*)?[[:blank:]]*\\)",
+          "begin": "@\\(\\p{blank}*([^:/) \\t]+)\\p{blank}*(:\\p{blank}*[a-z][a-zA-Z0-9_+]*\\p{blank}*)?(/\\p{blank}*[tsrnL$]*)?\\p{blank}*\\)",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.puppet"
             }
           },
-          "end": "^[[:blank:]]*(\\|[[:blank:]]*-|\\||-)?[[:blank:]]*\\1",
+          "end": "^\\p{blank}*(\\|\\p{blank}*-|[|\\-])?\\p{blank}*\\1",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.puppet"
@@ -354,7 +354,7 @@
     "interpolated_puppet": {
       "patterns": [
         {
-          "begin": "(\\${)(\\d+)",
+          "begin": "(\\$\\{)(\\d+)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.embedded.begin.puppet"
@@ -378,7 +378,7 @@
           ]
         },
         {
-          "begin": "(\\${)(_[a-zA-Z0-9_]*)",
+          "begin": "(\\$\\{)(_[a-zA-Z0-9_]*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.embedded.begin.puppet"
@@ -402,7 +402,7 @@
           ]
         },
         {
-          "begin": "(\\${)(([a-z][a-z0-9_]*)?(?:::[a-z][a-z0-9_]*)*)",
+          "begin": "(\\$\\{)(([a-z][a-z0-9_]*)?(?:::[a-z][a-z0-9_]*)*)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.section.embedded.begin.puppet"
@@ -426,7 +426,7 @@
           ]
         },
         {
-          "begin": "\\${",
+          "begin": "\\$\\{",
           "beginCaptures": {
             "0": {
               "name": "punctuation.section.embedded.begin.puppet"
@@ -488,7 +488,7 @@
           "name": "punctuation.section.scope.puppet"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -505,7 +505,7 @@
           "name": "punctuation.section.scope.puppet"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -525,7 +525,7 @@
           "name": "punctuation.section.scope.puppet"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -542,7 +542,7 @@
           "name": "punctuation.section.scope.puppet"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -595,15 +595,15 @@
     "numbers": {
       "patterns": [
         {
-          "match": "(?<!\\w|\\d)([-+]?)(?i:0x)(?i:[0-9a-f])+(?!\\w|\\d)",
+          "match": "(?<![\\w\\d])([\\-+]?)(?i:0x)(?i:[0-9a-f])+(?![\\w\\d])",
           "name": "constant.numeric.hexadecimal.puppet"
         },
         {
-          "match": "(?<!\\w|\\.)([-+]?)(?<!\\d)\\d+(?i:e(\\+|-){0,1}\\d+){0,1}(?!\\w|\\d|\\.)",
+          "match": "(?<![\\w.])([\\-+]?)(?<!\\d)\\d+(?i:e([+\\-])?\\d+)?(?![\\w\\d.])",
           "name": "constant.numeric.integer.puppet"
         },
         {
-          "match": "(?<!\\w)([-+]?)\\d+\\.\\d+(?i:e(\\+|-){0,1}\\d+){0,1}(?!\\w|\\d)",
+          "match": "(?<!\\w)([\\-+]?)\\d+\\.\\d+(?i:e([+\\-])?\\d+)?(?![\\w\\d])",
           "name": "constant.numeric.integer.puppet"
         }
       ]
@@ -639,17 +639,17 @@
     "puppet-datatypes": {
       "patterns": [
         {
-          "match": "(?<![a-zA-Z\\$])([A-Z][a-zA-Z0-9_]*)(?![a-zA-Z0-9_])",
+          "match": "(?<![a-zA-Z$])([A-Z][a-zA-Z0-9_]*)(?![a-zA-Z0-9_])",
           "name": "storage.type.puppet"
         }
       ]
     },
     "regex-literal": {
-      "match": "(\\/)(.+?)(?:[^\\\\]\\/)",
+      "match": "(/)(.+?)[^\\\\]/",
       "name": "string.regexp.literal.puppet"
     },
     "resource-definition": {
-      "begin": "(?:^|\\b)(::[a-z][a-z0-9_]*|[a-z][a-z0-9_]*|(?:[a-z][a-z0-9_]*)?(?:::[a-z][a-z0-9_]*)+)\\s*({)\\s*",
+      "begin": "(?:^|\\b)(::[a-z][a-z0-9_]*|[a-z][a-z0-9_]*|(?:[a-z][a-z0-9_]*)?(?:::[a-z][a-z0-9_]*)+)\\s*(\\{)\\s*",
       "beginCaptures": {
         "1": {
           "name": "meta.definition.resource.puppet storage.type.puppet"
@@ -680,11 +680,11 @@
               "name": "punctuation.definition.variable.puppet"
             }
           },
-          "match": "((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=,|\\))",
+          "match": "((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)\\s*(?=[,)])",
           "name": "meta.function.argument.puppet"
         },
         {
-          "begin": "((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)(?:\\s*(=)\\s*)\\s*",
+          "begin": "((\\$+)[a-zA-Z_][a-zA-Z0-9_]*)\\s*(=)\\s*\\s*",
           "captures": {
             "1": {
               "name": "variable.other.puppet"
@@ -696,7 +696,7 @@
               "name": "keyword.operator.assignment.puppet"
             }
           },
-          "end": "(?=,|\\))",
+          "end": "(?=[,)])",
           "name": "meta.function.argument.puppet",
           "patterns": [
             {