tm-grammars 1.22.18 → 1.23.0

package/grammars/pascal.json

@@ -61,7 +61,7 @@
           "name": "string.regexp"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "string.regexp"
     },
     {
@@ -73,7 +73,7 @@
       "name": "constant.numeric.pascal"
     },
     {
-      "match": "\\$[0-9a-fA-F]{1,16}\\b",
+      "match": "\\$\\h{1,16}\\b",
       "name": "constant.numeric.hex.pascal"
     },
     {
@@ -122,7 +122,7 @@
           "name": "punctuation.definition.comment.pascal"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "comment.block.pascal.two"
     },
     {
@@ -147,7 +147,7 @@
       ]
     },
     {
-      "match": "\\#\\d+",
+      "match": "#\\d+",
       "name": "string.other.pascal"
     }
   ],

package/grammars/perl.json

@@ -30,7 +30,7 @@
     {
       "applyEndPatternLast": 1,
       "begin": "\\b(?=qr\\s*[^\\s\\w])",
-      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;\\,\\#\\{\\}\\)]|\\s*$))",
+      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;,#{})]|\\s*$))",
       "endCaptures": {
         "1": {
           "name": "string.regexp.compile.perl"
@@ -53,7 +53,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "string.regexp.compile.nested_braces.perl",
           "patterns": [
             {
@@ -77,7 +77,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.compile.nested_brackets.perl",
           "patterns": [
             {
@@ -129,7 +129,7 @@
           "name": "string.regexp.compile.nested_parens.perl",
           "patterns": [
             {
-              "match": "\\$(?=[^\\s\\w\\\\'\\{\\[\\(\\<])"
+              "match": "\\$(?=[^\\s\\w\\\\'{\\[(<])"
             },
             {
               "include": "#escaped_char"
@@ -161,7 +161,7 @@
           ]
         },
         {
-          "begin": "(qr)\\s*([^\\s\\w'\\{\\[\\(\\<])",
+          "begin": "(qr)\\s*([^\\s\\w'{\\[(<])",
           "captures": {
             "0": {
               "name": "punctuation.definition.string.perl"
@@ -174,7 +174,7 @@
           "name": "string.regexp.compile.simple-delimiter.perl",
           "patterns": [
             {
-              "match": "\\$(?=[^\\s\\w'\\{\\[\\(\\<])",
+              "match": "\\$(?=[^\\s\\w'{\\[(<])",
               "name": "keyword.control.anchor.perl"
             },
             {
@@ -192,8 +192,8 @@
     },
     {
       "applyEndPatternLast": 1,
-      "begin": "(?<!\\{|\\+|\\-)\\b(?=m\\s*[^\\sa-zA-Z0-9])",
-      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;\\,\\#\\{\\}\\)]|\\s*$))",
+      "begin": "(?<![{+\\-])\\b(?=m\\s*[^\\sa-zA-Z0-9])",
+      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;,#{})]|\\s*$))",
       "endCaptures": {
         "1": {
           "name": "string.regexp.find-m.perl"
@@ -216,7 +216,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "string.regexp.find-m.nested_braces.perl",
           "patterns": [
             {
@@ -240,7 +240,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.find-m.nested_brackets.perl",
           "patterns": [
             {
@@ -321,7 +321,7 @@
           ]
         },
         {
-          "begin": "\\G(?<!\\{|\\+|\\-)(m)(?!_)\\s*([^\\sa-zA-Z0-9'\\{\\[\\(\\<])",
+          "begin": "\\G(?<![{+\\-])(m)(?!_)\\s*([^\\sa-zA-Z0-9'{\\[(<])",
           "captures": {
             "0": {
               "name": "punctuation.definition.string.perl"
@@ -334,7 +334,7 @@
           "name": "string.regexp.find-m.simple-delimiter.perl",
           "patterns": [
             {
-              "match": "\\$(?=[^\\sa-zA-Z0-9'\\{\\[\\(\\<])",
+              "match": "\\$(?=[^\\sa-zA-Z0-9'{\\[(<])",
               "name": "keyword.control.anchor.perl"
             },
             {
@@ -350,7 +350,7 @@
                   "name": "punctuation.definition.character-class.begin.perl"
                 }
               },
-              "end": "\\]",
+              "end": "]",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.definition.character-class.end.perl"
@@ -359,7 +359,7 @@
               "name": "constant.other.character-class.set.perl",
               "patterns": [
                 {
-                  "match": "\\$(?=[^\\s\\w'\\{\\[\\(\\<])",
+                  "match": "\\$(?=[^\\s\\w'{\\[(<])",
                   "name": "keyword.control.anchor.perl"
                 },
                 {
@@ -376,8 +376,8 @@
     },
     {
       "applyEndPatternLast": 1,
-      "begin": "\\b(?=(?<!\\&)(s)(\\s+\\S|\\s*[;\\,\\{\\}\\(\\)\\[<]|$))",
-      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;\\,\\{\\}\\)\\]>]|\\s*$))",
+      "begin": "\\b(?=(?<!&)(s)(\\s+\\S|\\s*[;,{}()\\[<]|$))",
+      "end": "((([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;,{})\\]>]|\\s*$))",
       "endCaptures": {
         "1": {
           "name": "string.regexp.replace.perl"
@@ -400,7 +400,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "string.regexp.nested_braces.perl",
           "patterns": [
             {
@@ -421,7 +421,7 @@
               "name": "support.function.perl"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.nested_brackets.perl",
           "patterns": [
             {
@@ -481,7 +481,7 @@
               "name": "punctuation.definition.string.perl"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "string.regexp.format.nested_braces.perl",
           "patterns": [
             {
@@ -502,7 +502,7 @@
               "name": "punctuation.definition.string.perl"
             }
           },
-          "end": "\\]",
+          "end": "]",
           "name": "string.regexp.format.nested_brackets.perl",
           "patterns": [
             {
@@ -598,8 +598,8 @@
       ]
     },
     {
-      "begin": "\\b(?=s([^\\sa-zA-Z0-9\\[({<]).*\\1([egimosxradlupcn]*)([\\}\\)\\;\\,]|\\s+))",
-      "end": "((([egimosxradlupcn]*)))(?=([\\}\\)\\;\\,]|\\s+|\\s*$))",
+      "begin": "\\b(?=s([^\\sa-zA-Z0-9\\[({<]).*\\1([egimosxradlupcn]*)([});,]|\\s+))",
+      "end": "((([egimosxradlupcn]*)))(?=([});,]|\\s+|\\s*$))",
       "endCaptures": {
         "1": {
           "name": "string.regexp.replace.perl"
@@ -735,7 +735,7 @@
       ]
     },
     {
-      "begin": "(?<=\\(|\\{|~|&|\\||if|unless|^)\\s*((\\/))",
+      "begin": "(?<=[({~\\&|]|if|unless|^)\\s*((/))",
       "beginCaptures": {
         "1": {
           "name": "string.regexp.find.perl"
@@ -745,7 +745,7 @@
         }
       },
       "contentName": "string.regexp.find.perl",
-      "end": "((\\1([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;\\,\\#\\{\\}\\)]|\\s*$))",
+      "end": "((\\1([egimosxradlupcn]*)))(?=(\\s+\\S|\\s*[;,#{})]|\\s*$))",
       "endCaptures": {
         "1": {
           "name": "string.regexp.find.perl"
@@ -759,7 +759,7 @@
       },
       "patterns": [
         {
-          "match": "\\$(?=\\/)",
+          "match": "\\$(?=/)",
           "name": "keyword.control.anchor.perl"
         },
         {
@@ -779,7 +779,7 @@
       "match": "\\b(\\w+)\\s*(?==>)"
     },
     {
-      "match": "(?<={)\\s*\\w+\\s*(?=})",
+      "match": "(?<=\\{)\\s*\\w+\\s*(?=})",
       "name": "constant.other.bareword.perl"
     },
     {
@@ -806,7 +806,7 @@
           "name": "storage.type.method.perl"
         }
       },
-      "match": "\\b(sub)(?:\\s+([-a-zA-Z0-9_]+))?\\s*(?:\\([\\$\\@\\*;]*\\))?[^\\w\\{]",
+      "match": "\\b(sub)(?:\\s+([\\-a-zA-Z0-9_]+))?\\s*(?:\\([$@*;]*\\))?[^\\w{]",
       "name": "meta.function.perl"
     },
     {
@@ -861,11 +861,11 @@
       "name": "string.regexp.replace.perl"
     },
     {
-      "match": "\\b(__FILE__|__LINE__|__PACKAGE__|__SUB__)\\b",
+      "match": "\\b(__(?:FILE__|LINE__|PACKAGE__|SUB__))\\b",
       "name": "constant.language.perl"
     },
     {
-      "begin": "\\b(__DATA__|__END__)\\n?",
+      "begin": "\\b(__(?:DATA__|END__))\\n?",
       "beginCaptures": {
         "1": {
           "name": "constant.language.perl"
@@ -888,7 +888,7 @@
       "name": "storage.modifier.perl"
     },
     {
-      "match": "(?<!\\w)\\-[rwxoRWXOezsfdlpSbctugkTBMAC]\\b",
+      "match": "(?<!\\w)-[rwxoRWXOezsfdlpSbctugkTBMAC]\\b",
       "name": "keyword.operator.filetest.perl"
     },
     {
@@ -903,7 +903,7 @@
       "include": "#heredoc"
     },
     {
-      "begin": "\\bqq\\s*([^\\(\\{\\[\\<\\w\\s])",
+      "begin": "\\bqq\\s*([^({\\[<\\w\\s])",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
@@ -926,7 +926,7 @@
       ]
     },
     {
-      "begin": "\\bqx\\s*([^'\\(\\{\\[\\<\\w\\s])",
+      "begin": "\\bqx\\s*([^'({\\[<\\w\\s])",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
@@ -992,7 +992,7 @@
       ]
     },
     {
-      "begin": "(?<!->)\\bqw?\\s*([^\\(\\{\\[\\<\\w\\s])",
+      "begin": "(?<!->)\\bqw?\\s*([^({\\[<\\w\\s])",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
@@ -1083,7 +1083,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1109,7 +1109,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1129,13 +1129,13 @@
       ]
     },
     {
-      "begin": "\\bqq\\s*\\<",
+      "begin": "\\bqq\\s*<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1187,7 +1187,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1213,7 +1213,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1233,13 +1233,13 @@
       ]
     },
     {
-      "begin": "\\bqx\\s*\\<",
+      "begin": "\\bqx\\s*<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1285,7 +1285,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1305,7 +1305,7 @@
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1319,13 +1319,13 @@
       ]
     },
     {
-      "begin": "\\bqw?\\s*\\<",
+      "begin": "\\bqw?\\s*<",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.perl"
         }
       },
-      "end": "\\>",
+      "end": ">",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.perl"
@@ -1398,7 +1398,7 @@
           "name": "punctuation.section.scope.end.perl"
         }
       },
-      "match": "(\\{)(\\})"
+      "match": "(\\{)(})"
     },
     {
       "captures": {
@@ -1424,27 +1424,27 @@
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\g(?:\\{(?:\\w*|-\\d+)\\}|\\d+)",
+          "match": "\\\\g(?:\\{(?:\\w*|-\\d+)}|\\d+)",
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\k(?:\\{\\w*\\}|<\\w*>|'\\w*')",
+          "match": "\\\\k(?:\\{\\w*}|<\\w*>|'\\w*')",
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\N\\{[^\\}]*\\}",
+          "match": "\\\\N\\{[^}]*}",
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\o\\{\\d*\\}",
+          "match": "\\\\o\\{\\d*}",
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\(?:p|P)(?:\\{\\w*\\}|P)",
+          "match": "\\\\[pP](?:\\{\\w*}|P)",
           "name": "constant.character.escape.perl"
         },
         {
-          "match": "\\\\x(?:[0-9a-zA-Z]{2}|\\{\\w*\\})?",
+          "match": "\\\\x(?:[0-9a-zA-Z]{2}|\\{\\w*})?",
           "name": "constant.character.escape.perl"
         },
         {
@@ -1772,7 +1772,7 @@
           }
         },
         {
-          "begin": "((((<<(~)?) *\\\\)((?![=\\d\\$\\( ])[^;,'\"`\\s\\)]*)()))(.*)\\n?",
+          "begin": "((((<<(~)?) *\\\\)((?![=\\d$( ])[^;,'\"`\\s)]*)()))(.*)\\n?",
           "beginCaptures": {
             "1": {
               "name": "string.unquoted.heredoc.raw.perl"
@@ -2484,7 +2484,7 @@
           ]
         },
         {
-          "begin": "((((<<(~)?) *)((?![=\\d\\$\\( ])[^;,'\"`\\s\\)]*)()))(.*)\\n?",
+          "begin": "((((<<(~)?) *)((?![=\\d$( ])[^;,'\"`\\s)]*)()))(.*)\\n?",
           "beginCaptures": {
             "1": {
               "name": "string.unquoted.heredoc.interpolated.perl"
@@ -2601,7 +2601,7 @@
           "name": "punctuation.section.scope.perl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -2618,7 +2618,7 @@
           "name": "punctuation.section.scope.perl"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -2638,7 +2638,7 @@
           "name": "punctuation.section.scope.perl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -2655,7 +2655,7 @@
           "name": "punctuation.section.scope.perl"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "patterns": [
         {
           "include": "#escaped_char"
@@ -2726,7 +2726,7 @@
       "end": "\\)",
       "patterns": [
         {
-          "match": "\\$(?=[^\\s\\w'\\{\\[\\(\\<])",
+          "match": "\\$(?=[^\\s\\w'{\\[(<])",
           "name": "keyword.control.anchor.perl"
         },
         {
@@ -2757,7 +2757,7 @@
             }
           },
           "contentName": "text.embedded.html.basic",
-          "end": "^(=end)\\s+(html)|^(?==cut)",
+          "end": "^(?:(=end)\\s+(html)|(?==cut))",
           "endCaptures": {
             "1": {
               "name": "storage.type.class.pod.perl"
@@ -2909,7 +2909,7 @@
               "name": "punctuation.definition.variable.perl"
             }
           },
-          "match": "(\\$)[_ab\\*\\.\\/\\|,\\\\;#%=\\-~^:?!\\$<>\\(\\)\\[\\]@](?![A-Za-z0-9_])",
+          "match": "(\\$)[_ab*./|,\\\\;#%=\\-~\\^:?!$<>()\\[\\]@](?![A-Za-z0-9_])",
           "name": "variable.other.predefined.perl"
         },
         {
@@ -2927,7 +2927,7 @@
               "name": "punctuation.definition.variable.perl"
             }
           },
-          "match": "([\\$\\@\\%](#)?)([a-zA-Zx7f-xff\\$]|::)([a-zA-Z0-9_x7f-xff\\$]|::)*\\b",
+          "match": "([$@%](#)?)([a-zA-Zx7f-xf$]|::)([a-zA-Z0-9_x7f-xf$]|::)*\\b",
           "name": "variable.other.readwrite.global.perl"
         },
         {
@@ -2939,7 +2939,7 @@
               "name": "punctuation.definition.variable.perl"
             }
           },
-          "match": "(\\$\\{)(?:[a-zA-Zx7f-xff\\$]|::)(?:[a-zA-Z0-9_x7f-xff\\$]|::)*(\\})",
+          "match": "(\\$\\{)(?:[a-zA-Zx7f-xf$]|::)(?:[a-zA-Z0-9_x7f-xf$]|::)*(})",
           "name": "variable.other.readwrite.global.perl"
         },
         {
@@ -2948,7 +2948,7 @@
               "name": "punctuation.definition.variable.perl"
             }
           },
-          "match": "([\\$\\@\\%](#)?)[0-9_]\\b",
+          "match": "([$@%](#)?)[0-9_]\\b",
           "name": "variable.other.readwrite.global.special.perl"
         }
       ]