tm-grammars 1.23.2 → 1.23.4

package/grammars/wit.json

@@ -112,7 +112,7 @@
     },
     "enum": {
       "applyEndPatternLast": 1,
-      "begin": "\\b(enum)\\b\\s+%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "begin": "\\b(enum)\\b\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.enum.enum-items.wit"
@@ -150,7 +150,7 @@
           "include": "#comment"
         },
         {
-          "match": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+          "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
           "name": "variable.other.enummember.id.enum-cases.wit"
         },
         {
@@ -209,7 +209,7 @@
     },
     "flags": {
       "applyEndPatternLast": 1,
-      "begin": "\\b(flags)\\s+%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "begin": "\\b(flags)\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.flags.flags-items.wit"
@@ -247,7 +247,7 @@
           "include": "#comment"
         },
         {
-          "match": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+          "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
           "name": "variable.other.enummember.id.flags-fields.wit"
         },
         {
@@ -261,7 +261,7 @@
     },
     "function": {
       "applyEndPatternLast": 1,
-      "begin": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(:)",
+      "begin": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(:)",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.id.func-item.wit"
@@ -338,16 +338,16 @@
           "name": "punctuation.brackets.angle.end.wit"
         }
       },
-      "match": "\\b(borrow)\\b(<)\\s*%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(>)",
+      "match": "\\b(borrow)\\b(<)\\s*%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(>)",
       "name": "meta.handle.ty.wit"
     },
     "identifier": {
-      "match": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+      "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
       "name": "entity.name.type.id.wit"
     },
     "interface": {
       "applyEndPatternLast": 1,
-      "begin": "^\\b(default\\s+)?(interface)\\s+%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "begin": "^\\b(default\\s+)?(interface)\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.default.interface-item.wit"
@@ -511,7 +511,7 @@
     },
     "named-type-list": {
       "applyEndPatternLast": 1,
-      "begin": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b\\s*(:)",
+      "begin": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b\\s*(:)",
       "beginCaptures": {
         "1": {
           "name": "variable.parameter.id.named-type.wit"
@@ -714,7 +714,7 @@
     },
     "record": {
       "applyEndPatternLast": 1,
-      "begin": "\\b(record)\\b\\s+%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "begin": "\\b(record)\\b\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.declaration.record.record-item.wit"
@@ -747,7 +747,7 @@
     },
     "record-fields": {
       "applyEndPatternLast": 1,
-      "begin": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b\\s*(:)",
+      "begin": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b\\s*(:)",
       "beginCaptures": {
         "1": {
           "name": "variable.declaration.id.record-fields.wit"
@@ -778,7 +778,7 @@
     },
     "resource": {
       "applyEndPatternLast": 1,
-      "begin": "\\b(resource)\\b\\s+%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)",
+      "begin": "\\b(resource)\\b\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.resource.wit"
@@ -949,7 +949,7 @@
           "name": "meta.interface.toplevel-use-item.wit",
           "patterns": [
             {
-              "match": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+              "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
               "name": "entity.name.type.declaration.interface.toplevel-use-item.wit"
             },
             {
@@ -961,7 +961,7 @@
                   "name": "constant.numeric.versioning.interface.toplevel-use-item.wit"
                 }
               },
-              "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z\\-][0-9a-zA-Z\\-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z\\-][0-9a-zA-Z\\-]*))*))?(?:\\+([0-9a-zA-Z\\-]+(?:\\.[0-9a-zA-Z\\-]+)*))?)",
+              "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)",
               "name": "meta.versioning.interface.toplevel-use-item.wit"
             }
           ]
@@ -1013,7 +1013,7 @@
     },
     "type-definition": {
       "applyEndPatternLast": 1,
-      "begin": "\\b(type)\\b\\s+%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(=)",
+      "begin": "\\b(type)\\b\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(=)",
       "beginCaptures": {
         "1": {
           "name": "keyword.declaration.type.type-item.wit storage.type.wit"
@@ -1110,7 +1110,7 @@
           "include": "#comment"
         },
         {
-          "match": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+          "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
           "name": "entity.name.type.declaration.use-names-item.use-item.wit"
         },
         {
@@ -1126,7 +1126,7 @@
       "name": "meta.use-path.wit",
       "patterns": [
         {
-          "match": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+          "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
           "name": "entity.name.namespace.id.use-path.wit"
         },
         {
@@ -1138,7 +1138,7 @@
               "name": "constant.numeric.versioning.id.use-path.wit"
             }
           },
-          "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z\\-][0-9a-zA-Z\\-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z\\-][0-9a-zA-Z\\-]*))*))?(?:\\+([0-9a-zA-Z\\-]+(?:\\.[0-9a-zA-Z\\-]+)*))?)",
+          "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)",
           "name": "meta.versioning.id.use-path.wit"
         },
         {
@@ -1149,7 +1149,7 @@
     },
     "variant": {
       "applyEndPatternLast": 1,
-      "begin": "\\b(variant)\\s+%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "begin": "\\b(variant)\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.variant.wit"
@@ -1185,7 +1185,7 @@
     },
     "variant-cases": {
       "applyEndPatternLast": 1,
-      "begin": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b\\s*(\\()",
+      "begin": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b\\s*(\\()",
       "beginCaptures": {
         "1": {
           "name": "variable.other.enummember.id.variant-cases.wit"
@@ -1220,7 +1220,7 @@
     },
     "world": {
       "applyEndPatternLast": 1,
-      "begin": "^\\b(default\\s+)?(world)\\s+%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
+      "begin": "^\\b(default\\s+)?(world)\\s+%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\s*(\\{)",
       "beginCaptures": {
         "1": {
           "name": "storage.modifier.default.world-item.wit"
@@ -1257,7 +1257,7 @@
               "name": "meta.id.export-item.wit",
               "patterns": [
                 {
-                  "match": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+                  "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
                   "name": "variable.other.constant.id.export-item.wit"
                 },
                 {
@@ -1269,7 +1269,7 @@
                       "name": "constant.numeric.versioning.id.export-item.wit"
                     }
                   },
-                  "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z\\-][0-9a-zA-Z\\-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z\\-][0-9a-zA-Z\\-]*))*))?(?:\\+([0-9a-zA-Z\\-]+(?:\\.[0-9a-zA-Z\\-]+)*))?)",
+                  "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)",
                   "name": "meta.versioning.id.export-item.wit"
                 }
               ]
@@ -1297,7 +1297,7 @@
               "name": "meta.id.import-item.wit",
               "patterns": [
                 {
-                  "match": "\\b%?((?<![\\-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
+                  "match": "\\b%?((?<![-\\w])([a-z][0-9a-z]*|[A-Z][0-9A-Z]*)((-)([a-z][0-9a-z]*|[A-Z][0-9A-Z]*))*)\\b",
                   "name": "variable.other.constant.id.import-item.wit"
                 },
                 {
@@ -1309,7 +1309,7 @@
                       "name": "constant.numeric.versioning.id.import-item.wit"
                     }
                   },
-                  "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z\\-][0-9a-zA-Z\\-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z\\-][0-9a-zA-Z\\-]*))*))?(?:\\+([0-9a-zA-Z\\-]+(?:\\.[0-9a-zA-Z\\-]+)*))?)",
+                  "match": "(@)((0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)",
                   "name": "meta.versioning.id.import-item.wit"
                 }
               ]

package/grammars/wolfram.json

@@ -141,7 +141,7 @@
     "escaped_characters": {
       "patterns": [
         {
-          "match": "\\\\[!%\\&()*+/@\\^_` ]",
+          "match": "\\\\[!%\\&()*+/@^_` ]",
           "name": "donothighlight.constant.character.escape"
         },
         {
@@ -402,7 +402,7 @@
           "include": "#symbols"
         },
         {
-          "match": "[!\\&'*+,\\-./:;<=>?@\\\\\\^|~]",
+          "match": "[!\\&'*+,\\-./:;<=>?@\\\\^|~]",
           "name": "invalid.illegal"
         }
       ]
@@ -507,15 +507,15 @@
     "numbers": {
       "patterns": [
         {
-          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[\\-+]?+\\d+",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -523,19 +523,19 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[\\-+]?+\\d+",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)\\*\\^[\\-+]?+\\d+",
+          "match": "2\\^\\^(?:[01]+(?:\\.(?!\\.)[01]*)?+|\\.(?!\\.)[01]+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -551,15 +551,15 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[\\-+]?+\\d+",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -567,19 +567,19 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[\\-+]?+\\d+",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)\\*\\^[\\-+]?+\\d+",
+          "match": "8\\^\\^(?:[01234567]+(?:\\.(?!\\.)[01234567]*)?+|\\.(?!\\.)[01234567]+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -595,15 +595,15 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[\\-+]?+\\d+",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -611,19 +611,19 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[\\-+]?+\\d+",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)\\*\\^[\\-+]?+\\d+",
+          "match": "16\\^\\^(?:\\h+(?:\\.(?!\\.)\\h*)?+|\\.(?!\\.)\\h+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -639,15 +639,15 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[\\-+]?+\\d+",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)``[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)``[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -655,19 +655,19 @@
           "name": "invalid.illegal"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[\\-+]?+\\d+",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+\\*\\^",
           "name": "invalid.illegal"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)`(?:[\\-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)`(?:[-+]?+(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+))?+",
           "name": "constant.numeric.wolfram"
         },
         {
-          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[\\-+]?+\\d+",
+          "match": "(?:\\d+(?:\\.(?!\\.)\\d*)?+|\\.(?!\\.)\\d+)\\*\\^[-+]?+\\d+",
           "name": "constant.numeric.wolfram"
         },
         {
@@ -779,7 +779,7 @@
           "name": "keyword.operator.wolfram"
         },
         {
-          "match": "[\\-+/*]",
+          "match": "[-+/*]",
           "name": "keyword.operator.arithmetic.wolfram"
         },
         {
@@ -823,7 +823,7 @@
           "name": "keyword.operator.Function.wolfram"
         },
         {
-          "match": "[>\\^.:@~]",
+          "match": "[>^.:@~]",
           "name": "keyword.operator.wolfram"
         }
       ]

package/grammars/xml.json

@@ -3,7 +3,7 @@
   "name": "xml",
   "patterns": [
     {
-      "begin": "(<\\?)\\s*([\\-_a-zA-Z0-9]+)",
+      "begin": "(<\\?)\\s*([-_a-zA-Z0-9]+)",
       "captures": {
         "1": {
           "name": "punctuation.definition.tag.xml"
@@ -16,7 +16,7 @@
       "name": "meta.tag.preprocessor.xml",
       "patterns": [
         {
-          "match": " ([a-zA-Z\\-]+)",
+          "match": " ([a-zA-Z-]+)",
           "name": "entity.other.attribute-name.xml"
         },
         {
@@ -28,7 +28,7 @@
       ]
     },
     {
-      "begin": "(<!)(DOCTYPE)\\s+([:a-zA-Z_][:a-zA-Z0-9_.\\-]*)",
+      "begin": "(<!)(DOCTYPE)\\s+([:a-zA-Z_][:a-zA-Z0-9_.-]*)",
       "captures": {
         "1": {
           "name": "punctuation.definition.tag.xml"
@@ -52,7 +52,7 @@
       "include": "#comments"
     },
     {
-      "begin": "(<)((?:([\\-_a-zA-Z0-9]+)(:))?([\\-_a-zA-Z0-9:]+))(?=(\\s[^>]*)?></\\2>)",
+      "begin": "(<)((?:([-_a-zA-Z0-9]+)(:))?([-_a-zA-Z0-9:]+))(?=(\\s[^>]*)?></\\2>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.xml"
@@ -70,7 +70,7 @@
           "name": "entity.name.tag.localname.xml"
         }
       },
-      "end": "(>)(</)((?:([\\-_a-zA-Z0-9]+)(:))?([\\-_a-zA-Z0-9:]+))(>)",
+      "end": "(>)(</)((?:([-_a-zA-Z0-9]+)(:))?([-_a-zA-Z0-9:]+))(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.xml"
@@ -102,7 +102,7 @@
       ]
     },
     {
-      "begin": "(</?)(?:([\\-\\w.]+)((:)))?([\\-\\w.:]+)",
+      "begin": "(</?)(?:([-\\w.]+)((:)))?([-\\w.:]+)",
       "captures": {
         "1": {
           "name": "punctuation.definition.tag.xml"
@@ -193,7 +193,7 @@
   ],
   "repository": {
     "EntityDecl": {
-      "begin": "(<!)(ENTITY)\\s+(%\\s+)?([:a-zA-Z_][:a-zA-Z0-9_.\\-]*)(\\s+(?:SYSTEM|PUBLIC)\\s+)?",
+      "begin": "(<!)(ENTITY)\\s+(%\\s+)?([:a-zA-Z_][:a-zA-Z0-9_.-]*)(\\s+(?:SYSTEM|PUBLIC)\\s+)?",
       "captures": {
         "1": {
           "name": "punctuation.definition.tag.xml"
@@ -291,7 +291,7 @@
           "name": "punctuation.definition.constant.xml"
         }
       },
-      "match": "(&)([:a-zA-Z_][:a-zA-Z0-9_.\\-]*|#[0-9]+|#x\\h+)(;)",
+      "match": "(&)([:a-zA-Z_][:a-zA-Z0-9_.-]*|#[0-9]+|#x\\h+)(;)",
       "name": "constant.character.entity.xml"
     },
     "internalSubset": {
@@ -324,7 +324,7 @@
           "name": "punctuation.definition.constant.xml"
         }
       },
-      "match": "(%)([:a-zA-Z_][:a-zA-Z0-9_.\\-]*)(;)",
+      "match": "(%)([:a-zA-Z_][:a-zA-Z0-9_.-]*)(;)",
       "name": "constant.character.parameter-entity.xml"
     },
     "singlequotedString": {
@@ -367,7 +367,7 @@
               "name": "entity.other.attribute-name.localname.xml"
             }
           },
-          "match": "(?:^|\\s+)(?:([\\-\\w.]+)((:)))?([\\-\\w.:]+)\\s*="
+          "match": "(?:^|\\s+)(?:([-\\w.]+)((:)))?([-\\w.:]+)\\s*="
         },
         {
           "include": "#doublequotedString"

package/grammars/xsl.json

@@ -39,7 +39,7 @@
               "name": "entity.other.attribute-name.localname.xml"
             }
           },
-          "match": " (?:([\\-_a-zA-Z0-9]+)((:)))?([a-zA-Z\\-]+)"
+          "match": " (?:([-_a-zA-Z0-9]+)((:)))?([a-zA-Z-]+)"
         },
         {
           "include": "#doublequotedString"

package/grammars/yaml.json

@@ -97,14 +97,14 @@
           ]
         },
         {
-          "begin": "(?=(?:[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:\\-]\\S)([^\\s:]|:\\S|\\s+(?![#\\s]))*\\s*:(\\s|$))",
+          "begin": "(?=(?:[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-]\\S)([^\\s:]|:\\S|\\s+(?![#\\s]))*\\s*:(\\s|$))",
           "end": "(?=\\s*$|\\s+#|\\s*:(\\s|$))",
           "patterns": [
             {
               "include": "#flow-scalar-plain-out-implicit-type"
             },
             {
-              "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:\\-]\\S",
+              "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-]\\S",
               "beginCaptures": {
                 "0": {
                   "name": "entity.name.tag.yaml"
@@ -123,7 +123,7 @@
       ]
     },
     "block-scalar": {
-      "begin": "(?:(\\|)|(>))([1-9])?([\\-+])?(.*\\n?)",
+      "begin": "(?:(\\|)|(>))([1-9])?([-+])?(.*\\n?)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.flow.block-scalar.literal.yaml"
@@ -216,7 +216,7 @@
               "name": "support.type.tag-prefix.yaml"
             }
           },
-          "match": "\\G(TAG)(?:[ \\t]+(!(?:[0-9A-Za-z\\-]*!)?)(?:[ \\t]+(!(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$,_.!~*'()\\[\\]])*|(?![,!\\[\\]{}])(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$,_.!~*'()\\[\\]])+))?)?"
+          "match": "\\G(TAG)(?:[ \\t]+(!(?:[0-9A-Za-z-]*!)?)(?:[ \\t]+(!(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$,_.!~*'()\\[\\]])*|(?![,!\\[\\]{}])(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$,_.!~*'()\\[\\]])+))?)?"
         },
         {
           "captures": {
@@ -346,7 +346,7 @@
           ]
         },
         {
-          "begin": "(?=(?:[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:\\-][^\\s\\[\\]{},])([^\\s:\\[\\]{},]|:[^\\s\\[\\]{},]|\\s+(?![#\\s]))*\\s*:(\\s|$))",
+          "begin": "(?=(?:[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-][^\\s\\[\\]{},])([^\\s:\\[\\]{},]|:[^\\s\\[\\]{},]|\\s+(?![#\\s]))*\\s*:(\\s|$))",
           "end": "(?=\\s*$|\\s+#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},])",
           "name": "meta.flow-pair.key.yaml",
           "patterns": [
@@ -354,7 +354,7 @@
               "include": "#flow-scalar-plain-in-implicit-type"
             },
             {
-              "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:\\-][^\\s\\[\\]{},]",
+              "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-][^\\s\\[\\]{},]",
               "beginCaptures": {
                 "0": {
                   "name": "entity.name.tag.yaml"
@@ -430,7 +430,7 @@
           "include": "#flow-scalar-plain-in-implicit-type"
         },
         {
-          "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:\\-][^\\s\\[\\]{},]",
+          "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-][^\\s\\[\\]{},]",
           "end": "(?=\\s*$|\\s+#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},])",
           "name": "string.unquoted.plain.in.yaml"
         }
@@ -462,7 +462,7 @@
               "name": "constant.language.merge.yaml"
             }
           },
-          "match": "(?:(null|Null|NULL|~)|([yY]|yes|Yes|YES|[nN]|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)|((?:[\\-+]?0b[0-1_]+|[\\-+]?0[0-7_]+|[\\-+]?(?:0|[1-9][0-9_]*)|[\\-+]?0x[_\\h]+|[\\-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+))|((?:[\\-+]?(?:[0-9][0-9_]*)?\\.[0-9.]*(?:[eE][\\-+][0-9]+)?|[\\-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[\\-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN)))|((?:\\d{4}-\\d{2}-\\d{2}|\\d{4}-\\d{1,2}-\\d{1,2}(?:[Tt]|[ \\t]+)\\d{1,2}:\\d{2}:\\d{2}(?:\\.\\d*)?(?:[ \\t]*Z|[\\-+]\\d{1,2}(?::\\d{1,2})?)?))|(=)|(<<))(?=\\s*$|\\s+#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},])"
+          "match": "(?:(null|Null|NULL|~)|([yY]|yes|Yes|YES|[nN]|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)|((?:[-+]?0b[0-1_]+|[-+]?0[0-7_]+|[-+]?(?:0|[1-9][0-9_]*)|[-+]?0x[_\\h]+|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+))|((?:[-+]?(?:[0-9][0-9_]*)?\\.[0-9.]*(?:[eE][-+][0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN)))|((?:\\d{4}-\\d{2}-\\d{2}|\\d{4}-\\d{1,2}-\\d{1,2}(?:[Tt]|[ \\t]+)\\d{1,2}:\\d{2}:\\d{2}(?:\\.\\d*)?(?:[ \\t]*Z|[-+]\\d{1,2}(?::\\d{1,2})?)?))|(=)|(<<))(?=\\s*$|\\s+#|\\s*:(\\s|$)|\\s*:[\\[\\]{},]|\\s*[\\[\\]{},])"
         }
       ]
     },
@@ -472,7 +472,7 @@
           "include": "#flow-scalar-plain-out-implicit-type"
         },
         {
-          "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:\\-]\\S",
+          "begin": "[^\\s\\-?:,\\[\\]{}#\\&*!|>'\"%@`]|[?:-]\\S",
           "end": "(?=\\s*$|\\s+#|\\s*:(\\s|$))",
           "name": "string.unquoted.plain.out.yaml"
         }
@@ -504,7 +504,7 @@
               "name": "constant.language.merge.yaml"
             }
           },
-          "match": "(?:(null|Null|NULL|~)|([yY]|yes|Yes|YES|[nN]|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)|((?:[\\-+]?0b[0-1_]+|[\\-+]?0[0-7_]+|[\\-+]?(?:0|[1-9][0-9_]*)|[\\-+]?0x[_\\h]+|[\\-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+))|((?:[\\-+]?(?:[0-9][0-9_]*)?\\.[0-9.]*(?:[eE][\\-+][0-9]+)?|[\\-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[\\-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN)))|((?:\\d{4}-\\d{2}-\\d{2}|\\d{4}-\\d{1,2}-\\d{1,2}(?:[Tt]|[ \\t]+)\\d{1,2}:\\d{2}:\\d{2}(?:\\.\\d*)?(?:[ \\t]*Z|[\\-+]\\d{1,2}(?::\\d{1,2})?)?))|(=)|(<<))(?=\\s*$|\\s+#|\\s*:(\\s|$))"
+          "match": "(?:(null|Null|NULL|~)|([yY]|yes|Yes|YES|[nN]|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)|((?:[-+]?0b[0-1_]+|[-+]?0[0-7_]+|[-+]?(?:0|[1-9][0-9_]*)|[-+]?0x[_\\h]+|[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+))|((?:[-+]?(?:[0-9][0-9_]*)?\\.[0-9.]*(?:[eE][-+][0-9]+)?|[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\\.[0-9_]*|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN)))|((?:\\d{4}-\\d{2}-\\d{2}|\\d{4}-\\d{1,2}-\\d{1,2}(?:[Tt]|[ \\t]+)\\d{1,2}:\\d{2}:\\d{2}(?:\\.\\d*)?(?:[ \\t]*Z|[-+]\\d{1,2}(?::\\d{1,2})?)?))|(=)|(<<))(?=\\s*$|\\s+#|\\s*:(\\s|$))"
         }
       ]
     },
@@ -603,7 +603,7 @@
           "match": "\\G((&))([^\\s\\[\\]/{},]+)(\\S+)?"
         },
         {
-          "match": "\\G!(?:<(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$,_.!~*'()\\[\\]])+>|(?:[0-9A-Za-z\\-]*!)?(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$_.~*'()])+|)(?=[ \\t]|$)",
+          "match": "\\G!(?:<(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$,_.!~*'()\\[\\]])+>|(?:[0-9A-Za-z-]*!)?(?:%\\h{2}|[0-9A-Za-z\\-#;/?:@\\&=+$_.~*'()])+|)(?=[ \\t]|$)",
           "name": "storage.type.tag-handle.yaml"
         },
         {

package/grammars/zenscript.json

@@ -6,7 +6,7 @@
   "name": "zenscript",
   "patterns": [
     {
-      "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+\\-])?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
+      "match": "\\b((0([xX])\\h*)|(([0-9]+\\.?[0-9]*)|(\\.[0-9]+))(([eE])([+-])?[0-9]+)?)([LlFfUuDd]|UL|ul)?\\b",
       "name": "constant.numeric.zenscript"
     },
     {