tm-grammars 1.22.18 → 1.23.0

package/grammars/plsql.json

@@ -25,11 +25,11 @@
       "name": "comment.line.double-dash.oracle"
     },
     {
-      "match": "(?i)(?:^\\s*)rem(?:\\s+.*$)",
+      "match": "(?i)^\\s*rem\\s+.*$",
       "name": "comment.line.sqlplus.oracle"
     },
     {
-      "match": "(?i)(?:^\\s*)prompt(?:\\s+.*$)",
+      "match": "(?i)^\\s*prompt\\s+.*$",
       "name": "comment.line.sqlplus-prompt.oracle"
     },
     {
@@ -80,11 +80,11 @@
           "name": "entity.name.function.oracle"
         }
       },
-      "match": "(?i)^\\s*(function|procedure)\\s+\"?([-a-z0-9_]+)\"?",
+      "match": "(?i)^\\s*(function|procedure)\\s+\"?([\\-a-z0-9_]+)\"?",
       "name": "meta.procedure.oracle"
     },
     {
-      "match": "[!<>:]?=|<>|<|>|\\+|(?<!\\.)\\*|-|(?<!^)/|\\|\\|",
+      "match": "[!<>:]?=|<>|[<>+]|(?<!\\.)\\*|-|(?<!^)/|\\|\\|",
       "name": "keyword.operator.oracle"
     },
     {
@@ -108,7 +108,7 @@
       "name": "support.function.oracle"
     },
     {
-      "match": "(?i)\\b(sql|sqlcode)\\b",
+      "match": "(?i)\\b(sql(?:|code))\\b",
       "name": "variable.language.oracle"
     },
     {
@@ -152,11 +152,11 @@
       "name": "keyword.other.pragma.oracle"
     },
     {
-      "match": "(?i)\\b(p(i|o|io)_[-a-z0-9_]+)\\b",
+      "match": "(?i)\\b(p([io]|io)_[\\-a-z0-9_]+)\\b",
       "name": "variable.parameter.oracle"
     },
     {
-      "match": "(?i)\\b(l_[-a-z0-9_]+)\\b",
+      "match": "(?i)\\b(l_[\\-a-z0-9_]+)\\b",
       "name": "variable.other.oracle"
     },
     {
@@ -180,7 +180,7 @@
       "name": "keyword.other.ddl.oracle"
     },
     {
-      "match": "(?i)\\b(with|select|from|where|order\\s+(siblings\\s+)?by|group\\s+by|rollup|cube|((left|right|cross|natural)\\s+(outer\\s+)?)?join|on|asc|desc|update|set|insert|into|values|delete|distinct|union|minus|intersect|having|limit|table|between|like|of|row|(range|rows)\\s+between|nulls\\s+first|nulls\\s+last|before|after|all|any|exists|rownum|cursor|returning|over|partition\\s+by|merge|using|matched|pivot|unpivot)\\b",
+      "match": "(?i)\\b(with|select|from|where|order\\s+(siblings\\s+)?by|group\\s+by|rollup|cube|((left|right|cross|natural)\\s+(outer\\s+)?)?join|on|asc|desc|update|set|insert|into|values|delete|distinct|union|minus|intersect|having|limit|table|between|like|of|row|(r(?:ange|ows))\\s+between|nulls\\s+first|nulls\\s+last|before|after|all|any|exists|rownum|cursor|returning|over|partition\\s+by|merge|using|matched|pivot|unpivot)\\b",
       "name": "keyword.other.sql.oracle"
     },
     {
@@ -206,7 +206,7 @@
           "name": "support.class.oracle"
         }
       },
-      "match": "(?i)\\b((htf|htp)\\.(\\w+))\\b",
+      "match": "(?i)\\b((ht[fp])\\.(\\w+))\\b",
       "name": "support.function.oracle"
     },
     {
@@ -219,7 +219,7 @@
       "name": "support.function.user-defined.oracle"
     },
     {
-      "match": "(?i)\\b(raise|raise_application_error)\\b",
+      "match": "(?i)\\b(raise(?:|_application_error))\\b",
       "name": "support.function.oracle"
     },
     {

package/grammars/po.json

@@ -8,7 +8,7 @@
   "name": "po",
   "patterns": [
     {
-      "begin": "^(?=(msgid(_plural)?|msgctxt)\\s*\"[^\"])|^\\s*$",
+      "begin": "^(?:(?=(msg(?:id(_plural)?|ctxt))\\s*\"[^\"])|\\s*$)",
       "end": "\\z",
       "patterns": [
         {
@@ -66,7 +66,7 @@
           ]
         },
         {
-          "begin": "^(msgstr)(?:(\\[)(\\d+)(\\]))?\\s+",
+          "begin": "^(msgstr)(?:(\\[)(\\d+)(]))?\\s+",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.msgstr.po"
@@ -98,7 +98,7 @@
           ]
         },
         {
-          "begin": "^(msgctxt)(?:(\\[)(\\d+)(\\]))?\\s+",
+          "begin": "^(msgctxt)(?:(\\[)(\\d+)(]))?\\s+",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.msgctxt.po"
@@ -169,7 +169,7 @@
                       "name": "entity.name.type.flag.po"
                     }
                   },
-                  "match": "(?:\\G|,\\s*)((?:fuzzy)|(?:no-)?(?:c|objc|sh|lisp|elisp|librep|scheme|smalltalk|java|csharp|awk|object-pascal|ycp|tcl|perl|perl-brace|php|gcc-internal|qt|boost)-format)"
+                  "match": "(?:\\G|,\\s*)(fuzzy|(?:no-)?(?:c|objc|sh|lisp|elisp|librep|scheme|smalltalk|java|csharp|awk|object-pascal|ycp|tcl|perl|perl-brace|php|gcc-internal|qt|boost)-format)"
                 }
               ]
             },

package/grammars/polar.json

@@ -81,15 +81,15 @@
     "number": {
       "patterns": [
         {
-          "match": "\\b[+-]?\\d+(?:(\\.)\\d+(?:e[+-]?\\d+)?|(?:e[+-]?\\d+))\\b",
+          "match": "\\b[+\\-]?\\d+(?:(\\.)\\d+(?:e[+\\-]?\\d+)?|e[+\\-]?\\d+)\\b",
           "name": "constant.numeric.float"
         },
         {
-          "match": "\\b(\\+|\\-)[\\d]+\\b",
+          "match": "\\b([+\\-])\\d+\\b",
           "name": "constant.numeric.integer"
         },
         {
-          "match": "\\b[\\d]+\\b",
+          "match": "\\b\\d+\\b",
           "name": "constant.numeric.natural"
         }
       ]
@@ -101,7 +101,7 @@
           "name": "entity.name.type.resource"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "constant.other.object-literal",
       "patterns": [
         {
@@ -121,10 +121,10 @@
           "name": "keyword.control"
         }
       },
-      "match": "(\\+|-|\\*|\\/|<|>|=|!)"
+      "match": "([+\\-*/<>=!])"
     },
     "resource-block": {
-      "begin": "(?<resourceType>[a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]+)*){0}((?:(resource|actor)\\s+(\\g<resourceType>)(?:\\s+(extends)\\s+(\\g<resourceType>(?:\\s*,\\s*\\g<resourceType>)*)\\s*,?\\s*)?)|(global))\\s*{",
+      "begin": "(?<resourceType>[a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z0-9_]+)*){0}((resource|actor)\\s+(\\g<resourceType>)(?:\\s+(extends)\\s+(\\g<resourceType>(?:\\s*,\\s*\\g<resourceType>)*)\\s*,?\\s*)?|(global))\\s*\\{",
       "beginCaptures": {
         "3": {
           "name": "keyword.control"
@@ -147,7 +147,7 @@
           "name": "keyword.control"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.resource-block",
       "patterns": [
         {
@@ -156,7 +156,7 @@
         },
         {
           "begin": "\\{",
-          "end": "\\}",
+          "end": "}",
           "name": "meta.relation-declaration",
           "patterns": [
             {
@@ -281,7 +281,7 @@
         },
         {
           "begin": "\\[",
-          "end": "\\]",
+          "end": "]",
           "name": "meta.bracket.list",
           "patterns": [
             {
@@ -295,7 +295,7 @@
         },
         {
           "begin": "\\{",
-          "end": "\\}",
+          "end": "}",
           "name": "meta.bracket.dict",
           "patterns": [
             {
@@ -329,7 +329,7 @@
           "name": "string.quoted.double"
         }
       },
-      "end": "\\}",
+      "end": "}",
       "name": "meta.test-block",
       "patterns": [
         {
@@ -339,7 +339,7 @@
               "name": "keyword.control"
             }
           },
-          "end": "\\}",
+          "end": "}",
           "name": "meta.test-setup",
           "patterns": [
             {
@@ -357,7 +357,7 @@
           "include": "#rule"
         },
         {
-          "match": "\\b(assert|assert_not)\\b",
+          "match": "\\b(assert(?:|_not))\\b",
           "name": "keyword.other"
         },
         {

package/grammars/postcss.json

@@ -58,37 +58,37 @@
           "name": "keyword.control.at-rule.css.postcss"
         }
       },
-      "end": "(?=\\n|\\(|{|;)",
+      "end": "(?=[\\n({;])",
       "name": "support.function.name.postcss.library"
     },
     {
-      "begin": "@mixin|@function",
+      "begin": "@(?:mixin|function)",
       "captures": {
         "0": {
           "name": "keyword.control.at-rule.css.postcss"
         }
       },
-      "end": "$\\n?|(?=\\(|{)",
+      "end": "$\\n?|(?=[({])",
       "name": "support.function.name.postcss.no-completions",
       "patterns": [
         {
-          "match": "[\\w-]+",
+          "match": "[\\w\\-]+",
           "name": "entity.name.function"
         }
       ]
     },
     {
-      "match": "(?<=@import)\\s[\\w/.*-]+",
+      "match": "(?<=@import)\\s[\\w/.*\\-]+",
       "name": "string.quoted.double.css.postcss"
     },
     {
       "begin": "@",
-      "end": "$\\n?|\\s(?!(all|braille|embossed|handheld|print|projection|screen|speech|tty|tv|if|only|not)(\\s|,))|(?=;)",
+      "end": "$\\n?|\\s(?!(all|braille|embossed|handheld|print|projection|screen|speech|tty|tv|if|only|not)([\\s,]))|(?=;)",
       "name": "keyword.control.at-rule.css.postcss"
     },
     {
       "begin": "#",
-      "end": "$\\n?|(?=\\s|,|;|\\(|\\)|\\.|\\[|{|>)",
+      "end": "$\\n?|(?=[\\s,;().\\[{>])",
       "name": "entity.other.attribute-name.id.css.postcss",
       "patterns": [
         {
@@ -100,8 +100,8 @@
       ]
     },
     {
-      "begin": "\\.|(?<=&)(-|_)",
-      "end": "$\\n?|(?=\\s|,|;|\\(|\\)|\\[|{|>)",
+      "begin": "\\.|(?<=&)([\\-_])",
+      "end": "$\\n?|(?=[\\s,;()\\[{>])",
       "name": "entity.other.attribute-name.class.css.postcss",
       "patterns": [
         {
@@ -114,7 +114,7 @@
     },
     {
       "begin": "\\[",
-      "end": "\\]",
+      "end": "]",
       "name": "entity.other.attribute-selector.postcss",
       "patterns": [
         {
@@ -124,18 +124,18 @@
           "include": "#single-quoted"
         },
         {
-          "match": "\\^|\\$|\\*|~",
+          "match": "[\\^$*~]",
           "name": "keyword.other.regex.postcss"
         }
       ]
     },
     {
-      "match": "(?<=\\]|\\)|not\\(|\\*|>|>\\s):[a-z:-]+|(::|:-)[a-z:-]+",
+      "match": "(?<=[\\])]|not\\(|[*>]|>\\s):[a-z:\\-]+|(:[:\\-])[a-z:\\-]+",
       "name": "entity.other.attribute-name.pseudo-class.css.postcss"
     },
     {
       "begin": ":",
-      "end": "$\\n?|(?=;|\\s\\(|and\\(|{|}|\\),)",
+      "end": "$\\n?|(?=;|\\s\\(|and\\(|[{}]|\\),)",
       "name": "meta.property-list.css.postcss",
       "patterns": [
         {
@@ -195,8 +195,8 @@
       "include": "#function-content"
     },
     {
-      "begin": "(?<!\\-|\\()\\b(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video|main|svg|rect|ruby|center|circle|ellipse|line|polyline|polygon|path|text|u|x)\\b(?!-|\\)|:\\s)|&",
-      "end": "(?=\\s|,|;|\\(|\\)|\\.|\\[|{|>|-|_)",
+      "begin": "(?<![\\-(])\\b(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video|main|svg|rect|ruby|center|circle|ellipse|line|polyline|polygon|path|text|[ux])\\b(?![\\-)]|:\\s)|&",
+      "end": "(?=[\\s,;().\\[{>\\-_])",
       "name": "entity.name.tag.css.postcss.symbol",
       "patterns": [
         {
@@ -211,7 +211,7 @@
       "include": "#operator"
     },
     {
-      "match": "[a-z-]+((?=:|#{))",
+      "match": "[a-z\\-]+((?=:|#\\{))",
       "name": "support.type.property-name.css.postcss"
     },
     {
@@ -223,12 +223,12 @@
   ],
   "repository": {
     "comment-tag": {
-      "begin": "{{",
+      "begin": "\\{\\{",
       "end": "}}",
       "name": "comment.tags.postcss",
       "patterns": [
         {
-          "match": "[\\w-]+",
+          "match": "[\\w\\-]+",
           "name": "comment.tag.postcss"
         }
       ]
@@ -262,7 +262,7 @@
       "name": "keyword.other.important.css.postcss"
     },
     "function": {
-      "match": "(?<=[\\s|\\(|,|:])(?!url|format|attr)[\\w-][\\w-]*(?=\\()",
+      "match": "(?<=[\\s|(,:])(?!url|format|attr)[\\w\\-][\\w\\-]*(?=\\()",
       "name": "support.function.name.postcss"
     },
     "function-content": {
@@ -270,11 +270,11 @@
       "name": "string.quoted.double.css.postcss"
     },
     "function-content-var": {
-      "match": "(?<=var\\()[\\w-]+(?=\\))",
+      "match": "(?<=var\\()[\\w\\-]+(?=\\))",
       "name": "variable.parameter.postcss"
     },
     "interpolation": {
-      "begin": "#{",
+      "begin": "#\\{",
       "end": "}",
       "name": "support.function.interpolation.postcss",
       "patterns": [
@@ -299,11 +299,11 @@
       ]
     },
     "numeric": {
-      "match": "(-|\\.)?[0-9]+(\\.[0-9]+)?",
+      "match": "([\\-.])?[0-9]+(\\.[0-9]+)?",
       "name": "constant.numeric.css.postcss"
     },
     "operator": {
-      "match": "\\+|\\s-\\s|\\s-(?=\\$)|(?<=\\()-(?=\\$)|\\s-(?=\\()|\\*|/|%|=|!|<|>|~",
+      "match": "\\+|\\s-\\s|\\s-(?=\\$)|(?<=\\()-(?=\\$)|\\s-(?=\\()|[*/%=!<>~]",
       "name": "keyword.operator.postcss"
     },
     "parent-selector": {
@@ -312,19 +312,19 @@
     },
     "placeholder-selector": {
       "begin": "(?<!\\d)%(?!\\d)",
-      "end": "$\\n?|\\s|(?=;|{)",
+      "end": "$\\n?|\\s|(?=[;{])",
       "name": "entity.other.attribute-name.placeholder-selector.postcss"
     },
     "property-value": {
-      "match": "[\\w-]+",
+      "match": "[\\w\\-]+",
       "name": "meta.property-value.css.postcss, support.constant.property-value.css.postcss"
     },
     "pseudo-class": {
-      "match": ":[a-z:-]+",
+      "match": ":[a-z:\\-]+",
       "name": "entity.other.attribute-name.pseudo-class.css.postcss"
     },
     "quoted-interpolation": {
-      "begin": "#{",
+      "begin": "#\\{",
       "end": "}",
       "name": "support.function.interpolation.postcss",
       "patterns": [
@@ -347,7 +347,7 @@
       "name": "support.type.property-name.css.postcss"
     },
     "rgb-value": {
-      "match": "(#)([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\\b",
+      "match": "(#)(\\h{3}|\\h{6})\\b",
       "name": "constant.other.color.rgb-value.css.postcss"
     },
     "single-quoted": {
@@ -361,15 +361,15 @@
       ]
     },
     "unit": {
-      "match": "(?<=[\\d]|})(ch|cm|deg|dpcm|dpi|dppx|em|ex|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vmax|vmin|vw|%)",
+      "match": "(?<=[\\d}])(ch|cm|deg|dpcm|dpi|dppx|em|ex|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vmax|vmin|vw|%)",
       "name": "keyword.other.unit.css.postcss"
     },
     "variable": {
-      "match": "\\$[\\w-]+",
+      "match": "\\$[\\w\\-]+",
       "name": "variable.parameter.postcss"
     },
     "variable-root-css": {
-      "match": "(?<!&)--[\\w-]+",
+      "match": "(?<!&)--[\\w\\-]+",
       "name": "variable.parameter.postcss"
     }
   },

package/grammars/powerquery.json

@@ -83,17 +83,17 @@
           "match": "(#|\\h{4}|\\h{8}|cr|lf|tab)(?:,(#|\\h{4}|\\h{8}|cr|lf|tab))*"
         },
         {
-          "match": "[^\\)]",
+          "match": "[^)]",
           "name": "invalid.illegal.escapesequence.powerquery"
         }
       ]
     },
     "FloatNumber": {
-      "match": "(\\d*\\.)?\\d+(e|E)(\\+|-)?\\d+",
+      "match": "(\\d*\\.)?\\d+([eE])([+\\-])?\\d+",
       "name": "constant.numeric.float.powerquery"
     },
     "HexNumber": {
-      "match": "0(x|X)\\h+",
+      "match": "0([xX])\\h+",
       "name": "constant.numeric.integer.hexadecimal.powerquery"
     },
     "Identifier": {
@@ -105,7 +105,7 @@
           "name": "entity.name.powerquery"
         }
       },
-      "match": "(?:(?<![\\._\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Nd}\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}])(@?)([_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}][_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Nd}\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}]*(?:\\.[_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}][_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\p{Nd}\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}])*)\\b)"
+      "match": "(?<![._\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\d\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}])(@?)([_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}][_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\d\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}]*(?:\\.[_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}][_\\p{Lu}\\p{Ll}\\p{Lt}\\p{Lm}\\p{Lo}\\p{Nl}\\d\\p{Pc}\\p{Mn}\\p{Mc}\\p{Cf}])*)\\b"
     },
     "ImplicitVariable": {
       "match": "\\b_\\b",
@@ -133,7 +133,7 @@
           "name": "constant.language.intrinsicvariable.powerquery"
         }
       },
-      "match": "(?<![\\d\\w])(#sections|#shared)\\b"
+      "match": "(?<![\\d\\w])(#s(?:ections|hared))\\b"
     },
     "Keywords": {
       "captures": {
@@ -153,7 +153,7 @@
           "name": "keyword.powerquery"
         }
       },
-      "match": "\\b(?:(and|or|not)|(if|then|else)|(try|otherwise)|(as|each|in|is|let|meta|type|error)|(section|shared))\\b"
+      "match": "\\b(?:(and|or|not)|(if|then|else)|(try|otherwise)|(as|each|in|is|let|meta|type|error)|(s(?:ection|hared)))\\b"
     },
     "LineComment": {
       "match": "//.*",
@@ -214,7 +214,7 @@
           "name": "constant.language.numeric.float.powerquery"
         }
       },
-      "match": "(?<![\\d\\w])(#infinity|#nan)\\b"
+      "match": "(?<![\\d\\w])(#(?:infinity|nan))\\b"
     },
     "Operators": {
       "captures": {
@@ -240,7 +240,7 @@
           "name": "keyword.operator.optional.powerquery"
         }
       },
-      "match": "(=>)|(=)|(<>|<|>|<=|>=)|(&)|(\\+|-|\\*|\\/)|(!)|(\\?)"
+      "match": "(=>)|(=)|(<>|[<>]|<=|>=)|(&)|([+\\-*/])|(!)|(\\?)"
     },
     "Punctuation": {
       "captures": {
@@ -260,7 +260,7 @@
           "name": "punctuation.section.braces.end.powerquery"
         }
       },
-      "match": "(,)|(\\()|(\\))|({)|(})"
+      "match": "(,)|(\\()|(\\))|(\\{)|(})"
     },
     "QuotedIdentifier": {
       "begin": "#\"",
@@ -294,7 +294,7 @@
         }
       },
       "contentName": "meta.recordexpression.powerquery",
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.brackets.end.powerquery"