tm-grammars 1.17.3 → 1.17.5

package/grammars/gdscript.json

@@ -14,7 +14,7 @@
   ],
   "repository": {
     "annotated_parameter": {
-      "begin": "(?x)\n\\s* ([a-zA-Z_]\\w*) \\s* (:)\\s* ([a-zA-Z_]\\w*)?\n",
+      "begin": "\\s*([a-zA-Z_]\\w*)\\s*(:)\\s*([a-zA-Z_]\\w*)?",
       "beginCaptures": {
         "1": {
           "name": "variable.parameter.function.language.gdscript"
@@ -498,7 +498,7 @@
       ]
     },
     "function_declaration": {
-      "begin": "(?x) \\s*\n(func) \\s+\n([a-zA-Z_]\\w*) \\s*\n(?=\\()",
+      "begin": "\\s*(func)\\s+([a-zA-Z_]\\w*)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.language.gdscript storage.type.function.gdscript"
@@ -560,7 +560,7 @@
           "match": "\\b(get):"
         },
         {
-          "begin": "(?x) \\s+\n(set) \\s*\n(?=\\()",
+          "begin": "\\s+(set)\\s*(?=\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.gdscript"
@@ -681,7 +681,7 @@
               "name": "punctuation.separator.continuation.line.gdscript"
             }
           },
-          "end": "(?x)\n(?=^\\s*$)\n|\n(?! (\\s* [rR]? (\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))\n|\n(\\G $)  (?# '\\G' is necessary for ST)\n)\n",
+          "end": "(?=^\\s*$)|(?!(\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))|(\\G$)(?#'\\G'isnecessaryforST))",
           "patterns": [
             {
               "include": "#base_expression"
@@ -849,7 +849,7 @@
               "name": "punctuation.separator.parameters.gdscript"
             }
           },
-          "match": "(?x)\n([a-zA-Z_]\\w*)\n\\s* (?: (,) | (?=[)#\\n=]))\n"
+          "match": "([a-zA-Z_]\\w*)\\s*(?:(,)|(?=[)#\\n=]))"
         },
         {
           "include": "#comment"
@@ -890,7 +890,7 @@
       "name": "variable.language.gdscript"
     },
     "signal_declaration": {
-      "begin": "(?x) \\s*\n(signal) \\s+\n([a-zA-Z_]\\w*) \\s*\n(?=\\()",
+      "begin": "\\s*(signal)\\s+([a-zA-Z_]\\w*)\\s*(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "keyword.language.gdscript storage.type.function.gdscript"
@@ -919,7 +919,7 @@
           "name": "entity.name.function.gdscript"
         }
       },
-      "match": "(?x) \\s*\n(signal) \\s+\n([a-zA-Z_]\\w*)(?=[\\n\\s])",
+      "match": "\\s*(signal)\\s+([a-zA-Z_]\\w*)(?=[\\n\\s])",
       "name": "meta.signal.gdscript"
     },
     "square_braces": {
@@ -954,7 +954,7 @@
     "statement_keyword": {
       "patterns": [
         {
-          "match": "(?x)\n\\b(?<!\\.)(\ncontinue | assert | break | elif | else | if | pass | return | while )\\b\n",
+          "match": "\\b(?<!\\.)(continue|assert|break|elif|else|if|pass|return|while)\\b",
           "name": "keyword.control.flow.gdscript"
         },
         {
@@ -967,7 +967,7 @@
               "name": "keyword.control.flow.gdscript"
             }
           },
-          "match": "(?x)\n^\\s*(\ncase | match\n)(?=\\s*([-+\\w\\d(\\[{'\":#]|$))\\b\n"
+          "match": "^\\s*(case|match)(?=\\s*([-+\\w\\d(\\[{'\":#]|$))\\b"
         }
       ]
     },
@@ -985,7 +985,7 @@
               "name": "storage.type.format.gdscript"
             }
           },
-          "match": "(?x)\n(\n{{ | }}\n| (?:\n{\n\\w* (\\.[[:alpha:]_]\\w* | \\[[^\\]'\"]+\\])*\n(![rsa])?\n( : \\w? [<>=^]? [-+ ]? \\#?\n\\d* ,? (\\.\\d+)? [bcdeEfFgGnosxX%]? )?\n})\n)\n",
+          "match": "({{|}}|(?:{\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:\\w?[<>=^]?[-+\\s]?\\#?\\d*,?(\\.\\d+)?[bcdeEfFgGnosxX%]?)?}))",
           "name": "meta.format.brace.gdscript"
         },
         {
@@ -1000,7 +1000,7 @@
               "name": "storage.type.format.gdscript"
             }
           },
-          "match": "(?x)\n(\n{\n\\w* (\\.[[:alpha:]_]\\w* | \\[[^\\]'\"]+\\])*\n(![rsa])?\n(:)\n[^'\"{}\\n]* (?:\n\\{ [^'\"}\\n]*? \\} [^'\"{}\\n]*\n)*\n}\n)\n",
+          "match": "({\\w*(\\.[[:alpha:]_]\\w*|\\[[^\\]'\"]+\\])*(![rsa])?(:)[^'\"{}\\n]*(?:\\{[^'\"}\\n]*?\\}[^'\"{}\\n]*)*})",
           "name": "meta.format.brace.gdscript"
         }
       ]
@@ -1011,7 +1011,7 @@
           "name": "constant.character.format.placeholder.other.gdscript"
         }
       },
-      "match": "(?x)\n(\n% (\\([\\w\\s]*\\))?\n[-+#0 ]*\n(\\d+|\\*)? (\\.(\\d+|\\*))?\n([hlL])?\n[diouxXeEfFgGcrsab%]\n)\n",
+      "match": "(%(\\([\\w\\s]*\\))?[-+#0\\s]*(\\d+|\\*)?(\\.(\\d+|\\*))?([hlL])?[diouxXeEfFgGcrsab%])",
       "name": "meta.format.percent.gdscript"
     },
     "strings": {

package/grammars/glimmer-js.json

@@ -780,7 +780,7 @@
           ]
         },
         {
-          "begin": "(?x)(\\b(?:\\w+\\.)*(?:hbs|html)\\s*)(`)",
+          "begin": "(\\b(?:\\w+\\.)*(?:hbs|html)\\s*)(`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.js"

package/grammars/glimmer-ts.json

@@ -780,7 +780,7 @@
           ]
         },
         {
-          "begin": "(?x)(\\b(?:\\w+\\.)*(?:hbs|html)\\s*)(`)",
+          "begin": "(\\b(?:\\w+\\.)*(?:hbs|html)\\s*)(`)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.tagged-template.js"

package/grammars/groovy.json

@@ -1266,11 +1266,11 @@
     "support-functions": {
       "patterns": [
         {
-          "match": "(?x)\\b(?:sprintf|print(?:f|ln)?)\\b",
+          "match": "\\b(?:sprintf|print(?:f|ln)?)\\b",
           "name": "support.function.print.groovy"
         },
         {
-          "match": "(?x)\\b(?:shouldFail|fail(?:NotEquals)?|ass(?:ume|ert(?:S(?:cript|ame)|N(?:ot(?:Same|\nNull)|ull)|Contains|T(?:hat|oString|rue)|Inspect|Equals|False|Length|\nArrayEquals)))\\b",
+          "match": "\\b(?:shouldFail|fail(?:NotEquals)?|ass(?:ume|ert(?:S(?:cript|ame)|N(?:ot(?:Same|Null)|ull)|Contains|T(?:hat|oString|rue)|Inspect|Equals|False|Length|ArrayEquals)))\\b",
           "name": "support.function.testing.groovy"
         }
       ]

package/grammars/hack.json

@@ -1009,7 +1009,7 @@
           ]
         },
         {
-          "begin": "(?x)\n\\s*((?:(?:final|abstract|public|private|protected|internal|static|async)\\s+)*)\n(function)\n(?:\\s+)\n(?:\n(__(?:call|construct|destruct|get|set|isset|unset|tostring|clone|set_state|sleep|wakeup|autoload|invoke|callStatic|dispose|disposeAsync)(?=[^a-zA-Z0-9_\\x7f-\\xff]))\n|\n([a-zA-Z0-9_]+)\n)",
+          "begin": "\\s*((?:(?:final|abstract|public|private|protected|internal|static|async)\\s+)*)(function)(?:\\s+)(?:(__(?:call|construct|destruct|get|set|isset|unset|tostring|clone|set_state|sleep|wakeup|autoload|invoke|callStatic|dispose|disposeAsync)(?=[^a-zA-Z0-9_\\x7f-\\xff]))|([a-zA-Z0-9_]+))",
           "beginCaptures": {
             "1": {
               "patterns": [
@@ -1074,7 +1074,7 @@
         },
         {
           "begin": "(?xi)\n\\s*\n(?=\n[a-z_0-9$\\\\]+(::)\n(?:\n([a-z_][a-z_0-9]*)\\s*\\(\n|\n((\\$+)[a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n|\n([a-z_\\x{7f}-\\x{ff}][a-z0-9_\\x{7f}-\\x{ff}]*)\n)?\n)",
-          "end": "(?x)\n(::)\n(?:\n([A-Za-z_][A-Za-z_0-9]*)\\s*\\(\n|\n((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n|\n([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n)?",
+          "end": "(::)(?:([A-Za-z_][A-Za-z_0-9]*)\\s*\\(|((\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)|([a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))?",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.class.php"
@@ -1392,7 +1392,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?x)\n(->)\n(?:\n([A-Za-z_][A-Za-z_0-9]*)\\s*\\(\n|\n((\\$+)?[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)\n)?"
+          "match": "(->)(?:([A-Za-z_][A-Za-z_0-9]*)\\s*\\(|((\\$+)?[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))?"
         }
       ]
     },
@@ -1488,7 +1488,7 @@
       ]
     },
     "regex-double-quoted": {
-      "begin": "(?x)\n(?<=re)\"/ (?=(\\\\.|[^\"/])++/[imsxeADSUXu]*\")",
+      "begin": "(?<=re)\"/(?=(\\\\.|[^\"/])++/[imsxeADSUXu]*\")",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.php"
@@ -1544,7 +1544,7 @@
       ]
     },
     "regex-single-quoted": {
-      "begin": "(?x)\n(?<=re)'/ (?=(\\\\.|[^'/])++/[imsxeADSUXu]*')",
+      "begin": "(?<=re)'/(?=(\\\\.|[^'/])++/[imsxeADSUXu]*')",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.php"
@@ -2281,7 +2281,7 @@
               "name": "punctuation.definition.variable.php"
             }
           },
-          "match": "(?x)\n(\\$+)\n[a-zA-Z_\\x{7f}-\\x{ff}]\n[a-zA-Z0-9_\\x{7f}-\\x{ff}]*?\n\\b",
+          "match": "(\\$+)[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*?\\b",
           "name": "variable.other.php"
         }
       ]
@@ -2346,7 +2346,7 @@
             }
           },
           "comment": "Simple syntax: $foo, $foo[0], $foo[$bar], $foo->bar",
-          "match": "(?x)\n((\\$)(?<name>[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))\n(?:\n(->)(\\g<name>)\n|\n(\\[)\n(?:(\\d+)|((\\$)\\g<name>)|(\\w+))\n(\\])\n)?"
+          "match": "((\\$)(?<name>[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*))(?:(->)(\\g<name>)|(\\[)(?:(\\d+)|((\\$)\\g<name>)|(\\w+))(\\]))?"
         },
         {
           "captures": {
@@ -2361,7 +2361,7 @@
             }
           },
           "comment": "Simple syntax with braces: \"foo${bar}baz\"",
-          "match": "(?x)\n((\\$\\{)(?<name>[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\}))"
+          "match": "((\\$\\{)(?<name>[a-zA-Z_\\x{7f}-\\x{ff}][a-zA-Z0-9_\\x{7f}-\\x{ff}]*)(\\}))"
         }
       ]
     },