tm-grammars 1.23.3 → 1.23.5

package/grammars/scala.json

@@ -280,11 +280,11 @@
           "name": "constant.numeric.scala"
         },
         {
-          "match": "\\b(([0-9][0-9_]*(\\.[0-9][0-9_]*)?)([eE]([+\\-])?[0-9][0-9_]*)?|[0-9][0-9_]*)[LlFfDd]?\\b",
+          "match": "\\b(([0-9][0-9_]*(\\.[0-9][0-9_]*)?)([eE]([+-])?[0-9][0-9_]*)?|[0-9][0-9_]*)[LlFfDd]?\\b",
           "name": "constant.numeric.scala"
         },
         {
-          "match": "(\\.[0-9][0-9_]*)([eE]([+\\-])?[0-9][0-9_]*)?[LlFfDd]?\\b",
+          "match": "(\\.[0-9][0-9_]*)([eE]([+-])?[0-9][0-9_]*)?[LlFfDd]?\\b",
           "name": "constant.numeric.scala"
         },
         {
@@ -327,7 +327,7 @@
               "name": "entity.name.function.declaration"
             }
           },
-          "match": "\\b(def)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
+          "match": "\\b(def)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
         },
         {
           "captures": {
@@ -338,7 +338,7 @@
               "name": "entity.name.class.declaration"
             }
           },
-          "match": "\\b(trait)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
+          "match": "\\b(trait)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
         },
         {
           "captures": {
@@ -352,7 +352,7 @@
               "name": "entity.name.class.declaration"
             }
           },
-          "match": "\\b(?:(case)\\s+)?(class|object|enum)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
+          "match": "\\b(?:(case)\\s+)?(class|object|enum)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
         },
         {
           "captures": {
@@ -363,7 +363,7 @@
               "name": "entity.name.type.declaration"
             }
           },
-          "match": "(?<!\\.)\\b(type)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
+          "match": "(?<!\\.)\\b(type)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
         },
         {
           "captures": {
@@ -374,7 +374,7 @@
               "name": "keyword.declaration.volatile.scala"
             }
           },
-          "match": "\\b(?:(val)|(var))\\b\\s*(?!/[/*])(?=(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)|`[^`]+`)?\\()"
+          "match": "\\b(?:(val)|(var))\\b\\s*(?!/[/*])(?=(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)?\\()"
         },
         {
           "captures": {
@@ -385,7 +385,7 @@
               "name": "variable.stable.declaration.scala"
             }
           },
-          "match": "\\b(val)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?(?!\")"
+          "match": "\\b(val)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?(?!\")"
         },
         {
           "captures": {
@@ -396,7 +396,7 @@
               "name": "variable.volatile.declaration.scala"
             }
           },
-          "match": "\\b(var)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?(?!\")"
+          "match": "\\b(var)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)(?:\\s*,\\s*(?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))*)?(?!\")"
         },
         {
           "captures": {
@@ -410,7 +410,7 @@
               "name": "entity.name.class.declaration"
             }
           },
-          "match": "\\b(package)\\s+(object)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
+          "match": "\\b(package)\\s+(object)\\b\\s*(?!/[/*])((?:(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`))?"
         },
         {
           "begin": "\\b(package)\\s+",
@@ -426,7 +426,7 @@
               "include": "#comments"
             },
             {
-              "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+))",
+              "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+))",
               "name": "entity.name.package.scala"
             },
             {
@@ -444,7 +444,7 @@
               "name": "entity.name.given.declaration"
             }
           },
-          "match": "\\b(given)\\b\\s*([_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|`[^`]+`)?"
+          "match": "\\b(given)\\b\\s*([_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|`[^`]+`)?"
         }
       ]
     },
@@ -475,11 +475,11 @@
           "name": "keyword.other.export.given.scala"
         },
         {
-          "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?",
+          "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?",
           "name": "entity.name.class.export.scala"
         },
         {
-          "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+))",
+          "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+))",
           "name": "entity.name.export.scala"
         },
         {
@@ -522,7 +522,7 @@
                   "name": "entity.name.export.renamed-to.scala"
                 }
               },
-              "match": "(given\\s)?\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)))\\s*(=>)\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)))\\s*"
+              "match": "(given\\s)?\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*(=>)\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*"
             },
             {
               "match": "\\b(given)\\b",
@@ -540,7 +540,7 @@
                   "name": "entity.name.export.scala"
                 }
               },
-              "match": "(given\\s+)?(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)))"
+              "match": "(given\\s+)?(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))"
             }
           ]
         }
@@ -580,11 +580,11 @@
           "name": "keyword.other.import.as.scala"
         },
         {
-          "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?",
+          "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?",
           "name": "entity.name.class.import.scala"
         },
         {
-          "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+))",
+          "match": "(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+))",
           "name": "entity.name.import.scala"
         },
         {
@@ -627,7 +627,7 @@
                   "name": "entity.name.import.renamed-to.scala"
                 }
               },
-              "match": "(given\\s)?\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)))\\s*(=>)\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)))\\s*"
+              "match": "(given\\s)?\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*(=>)\\s*(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))\\s*"
             },
             {
               "match": "\\b(given)\\b",
@@ -645,7 +645,7 @@
                   "name": "entity.name.import.scala"
                 }
               },
-              "match": "(given\\s+)?(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)))"
+              "match": "(given\\s+)?(?:([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)|(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))"
             }
           ]
         }
@@ -662,7 +662,7 @@
               "name": "entity.name.class"
             }
           },
-          "match": "\\b(extends|with|derives)\\b\\s*([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|`[^`]+`|(?=\\([^)]+=>)|(?=(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+))|(?=\"))?"
+          "match": "\\b(extends|with|derives)\\b\\s*([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|`[^`]+`|(?=\\([^)]+=>)|(?=(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+))|(?=\"))?"
         }
       ]
     },
@@ -677,7 +677,7 @@
     "inline": {
       "patterns": [
         {
-          "match": "\\b(inline)(?=\\s+((?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)|`[^`]+`)\\s*:)",
+          "match": "\\b(inline)(?=\\s+((?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)|`[^`]+`)\\s*:)",
           "name": "storage.modifier.other"
         },
         {
@@ -724,7 +724,7 @@
               "name": "entity.name.type.declaration"
             }
           },
-          "match": "^\\s*(end)\\s+(?:(new|extension)|([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?))(?=\\s*(/(?:/.*|\\*(?!.*\\*/\\s*\\S.*).*))?$)"
+          "match": "^\\s*(end)\\s+(?:(new|extension)|([A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?))(?=\\s*(/(?:/.*|\\*(?!.*\\*/\\s*\\S.*).*))?$)"
         },
         {
           "match": "\\b(catch|finally|try)\\b",
@@ -743,10 +743,10 @@
               "name": "entity.name.declaration"
             }
           },
-          "match": "^\\s*(end)\\s+(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+))?(?=\\s*(/(?:/.*|\\*(?!.*\\*/\\s*\\S.*).*))?$)"
+          "match": "^\\s*(end)\\s+(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+))?(?=\\s*(/(?:/.*|\\*(?!.*\\*/\\s*\\S.*).*))?$)"
         },
         {
-          "match": "([!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}\\\\]){3,}",
+          "match": "([!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}\\\\]){3,}",
           "name": "keyword.operator.scala"
         },
         {
@@ -768,7 +768,7 @@
               ]
             }
           },
-          "match": "([!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}\\\\]{2,}|_\\*)"
+          "match": "([!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}\\\\]{2,}|_\\*)"
         },
         {
           "captures": {
@@ -793,7 +793,7 @@
               ]
             }
           },
-          "match": "(?<!_)([!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}\\\\])"
+          "match": "(?<!_)([!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}\\\\])"
         }
       ]
     },
@@ -836,7 +836,7 @@
               "name": "variable.stable.declaration.scala"
             }
           },
-          "match": "\\s+(as)\\s+([_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?)\\b"
+          "match": "\\s+(as)\\s+([_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)\\b"
         }
       ]
     },
@@ -851,7 +851,7 @@
               "name": "meta.colon.scala"
             }
           },
-          "match": "(?<=[^._$a-zA-Z0-9])(`[^`]+`|[_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?)\\s*(:)\\s+"
+          "match": "(?<=[^._$a-zA-Z0-9])(`[^`]+`|[_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)\\s*(:)\\s+"
         }
       ]
     },
@@ -861,7 +861,7 @@
           "name": "entity.name.class"
         }
       },
-      "match": "(\\b([A-Z]\\w*)(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?)"
+      "match": "(\\b([A-Z]\\w*)(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)"
     },
     "scala-quoted-or-symbol": {
       "patterns": [
@@ -874,7 +874,7 @@
               "name": "constant.other.symbol.scala"
             }
           },
-          "match": "(')((?>(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)))(?!')"
+          "match": "(')((?>(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)))(?!')"
         },
         {
           "match": "'(?=\\s*\\{(?!'))",
@@ -905,7 +905,7 @@
           "name": "keyword.type.scala"
         }
       },
-      "match": "\\.(type)(?![A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[0-9])"
+      "match": "\\.(type)(?![A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[0-9])"
     },
     "storage-modifiers": {
       "patterns": [
@@ -1018,7 +1018,7 @@
           ]
         },
         {
-          "begin": "\\b([A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?)(\"\"\")",
+          "begin": "\\b([A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)(\"\"\")",
           "beginCaptures": {
             "1": {
               "name": "keyword.interpolation.scala"
@@ -1109,7 +1109,7 @@
           ]
         },
         {
-          "begin": "\\b([A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?)(\")",
+          "begin": "\\b([A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?)(\")",
           "beginCaptures": {
             "1": {
               "name": "keyword.interpolation.scala"
@@ -1175,7 +1175,7 @@
         "3": {
           "patterns": [
             {
-              "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@\\^|~\\p{Sm}\\p{So}]+)",
+              "match": "[A-Z\\p{Lt}\\p{Lu}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%\\&*+\\-/:<>=?@^|~\\p{Sm}\\p{So}]+)",
               "name": "entity.name.import.scala"
             },
             {
@@ -1252,7 +1252,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": "#xml-doublequotedString"
@@ -1271,13 +1271,13 @@
           "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"
     },
     "xml-literal": {
       "patterns": [
         {
-          "begin": "(<)((?:([_a-zA-Z0-9][_a-zA-Z0-9]*)((:)))?([_a-zA-Z0-9][\\-_a-zA-Z0-9:]*))(?=(\\s[^>]*)?></\\2>)",
+          "begin": "(<)((?:([_a-zA-Z0-9][_a-zA-Z0-9]*)((:)))?([_a-zA-Z0-9][-_a-zA-Z0-9:]*))(?=(\\s[^>]*)?></\\2>)",
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.tag.xml"
@@ -1295,7 +1295,7 @@
               "name": "entity.name.tag.localname.xml"
             }
           },
-          "end": "(>(<))/(?:([\\-_a-zA-Z0-9]+)((:)))?([\\-_a-zA-Z0-9:]*[_a-zA-Z0-9])(>)",
+          "end": "(>(<))/(?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9:]*[_a-zA-Z0-9])(>)",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.tag.xml"
@@ -1327,7 +1327,7 @@
           ]
         },
         {
-          "begin": "(</?)(?:([_a-zA-Z0-9][\\-_a-zA-Z0-9]*)((:)))?([_a-zA-Z0-9][\\-_a-zA-Z0-9:]*)(?=[^>]*?>)",
+          "begin": "(</?)(?:([_a-zA-Z0-9][-_a-zA-Z0-9]*)((:)))?([_a-zA-Z0-9][-_a-zA-Z0-9:]*)(?=[^>]*?>)",
           "captures": {
             "1": {
               "name": "punctuation.definition.tag.xml"

package/grammars/scheme.json

@@ -99,7 +99,7 @@
           "name": "support.function.with-side-effects.scheme"
         },
         {
-          "match": "(?<=([\\s(]))(>=?|<=?|[=*/+\\-])(?=([\\s(]))",
+          "match": "(?<=([\\s(]))(>=?|<=?|[=*/+-])(?=([\\s(]))",
           "name": "keyword.operator.arithmetic.scheme"
         },
         {
@@ -116,7 +116,7 @@
               "name": "punctuation.section.quoted.symbol.scheme"
             }
           },
-          "match": "(')\\s*(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@\\^_~]*)",
+          "match": "(')\\s*(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*)",
           "name": "constant.other.symbol.scheme"
         },
         {
@@ -224,7 +224,7 @@
           "include": "#comment"
         },
         {
-          "begin": "(?<=\\()(define)\\s+(\\()(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@\\^_~]*)((\\s+(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@\\^_~]*|[._]))*)\\s*(\\))",
+          "begin": "(?<=\\()(define)\\s+(\\()(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*)((\\s+(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*|[._]))*)\\s*(\\))",
           "captures": {
             "1": {
               "name": "keyword.control.scheme"
@@ -257,7 +257,7 @@
           ]
         },
         {
-          "begin": "(?<=\\()(lambda)\\s+(\\()((?:(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@\\^_~]*|[._])\\s+)*(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@\\^_~]*|[._])?)(\\))",
+          "begin": "(?<=\\()(lambda)\\s+(\\()((?:(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*|[._])\\s+)*(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*|[._])?)(\\))",
           "captures": {
             "1": {
               "name": "keyword.control.scheme"
@@ -287,7 +287,7 @@
           ]
         },
         {
-          "begin": "(?<=\\()(define)\\s(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@\\^_~]*)\\s*.*?",
+          "begin": "(?<=\\()(define)\\s(\\p{alnum}[[:alnum:]!$%\\&*+-./:<=>?@^_~]*)\\s*.*?",
           "captures": {
             "1": {
               "name": "keyword.control.scheme"

package/grammars/scss.json

@@ -289,10 +289,10 @@
               "name": "punctuation.definition.wildcard.scss"
             }
           },
-          "match": "\\b([\\w\\-]+)(\\*)"
+          "match": "\\b([\\w-]+)(\\*)"
         },
         {
-          "match": "\\b[\\w\\-]+\\b",
+          "match": "\\b[\\w-]+\\b",
           "name": "entity.name.function.scss"
         },
         {
@@ -409,7 +409,7 @@
     "at_rule_include": {
       "patterns": [
         {
-          "begin": "(?<=@include)\\s+(?:([\\w\\-]+)\\s*(\\.))?([\\w\\-]+)\\s*(\\()",
+          "begin": "(?<=@include)\\s+(?:([\\w-]+)\\s*(\\.))?([\\w-]+)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "variable.scss"
@@ -452,7 +452,7 @@
               "name": "entity.name.function.scss"
             }
           },
-          "match": "(?<=@include)\\s+(?:([\\w\\-]+)\\s*(\\.))?([\\w\\-]+)"
+          "match": "(?<=@include)\\s+(?:([\\w-]+)\\s*(\\.))?([\\w-]+)"
         },
         {
           "captures": {
@@ -489,7 +489,7 @@
               "name": "entity.name.function.scss"
             }
           },
-          "match": "(?<=@keyframes)\\s+((?:[_A-Za-z][\\-\\w]|-[_A-Za-z])[\\-\\w]*)"
+          "match": "(?<=@keyframes)\\s+((?:[_A-Za-z][-\\w]|-[_A-Za-z])[-\\w]*)"
         },
         {
           "begin": "(?<=@keyframes)\\s+(\")",
@@ -619,8 +619,8 @@
               "name": "meta.property-list.media-query.scss",
               "patterns": [
                 {
-                  "begin": "(?<![\\-a-z])(?=[\\-a-z])",
-                  "end": "$|(?![\\-a-z])",
+                  "begin": "(?<![-a-z])(?=[-a-z])",
+                  "end": "$|(?![-a-z])",
                   "name": "meta.property-name.media-query.scss",
                   "patterns": [
                     {
@@ -672,7 +672,7 @@
     "at_rule_mixin": {
       "patterns": [
         {
-          "begin": "(?<=@mixin)\\s+([\\w\\-]+)\\s*(\\()",
+          "begin": "(?<=@mixin)\\s+([\\w-]+)\\s*(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.scss"
@@ -700,7 +700,7 @@
               "name": "entity.name.function.scss"
             }
           },
-          "match": "(?<=@mixin)\\s+([\\w\\-]+)",
+          "match": "(?<=@mixin)\\s+([\\w-]+)",
           "name": "meta.at-rule.mixin.scss"
         },
         {
@@ -736,7 +736,7 @@
           ]
         },
         {
-          "begin": "(?<=@namespace)\\s+([\\w\\-]*)",
+          "begin": "(?<=@namespace)\\s+([\\w-]*)",
           "captures": {
             "1": {
               "name": "entity.name.namespace-prefix.scss"
@@ -788,7 +788,7 @@
     "at_rule_page": {
       "patterns": [
         {
-          "begin": "^\\s*((@)page)(?=[:\\s])\\s*([\\-:\\w]*)",
+          "begin": "^\\s*((@)page)(?=[:\\s])\\s*([-:\\w]*)",
           "captures": {
             "1": {
               "name": "keyword.control.at-rule.page.scss"
@@ -873,7 +873,7 @@
           "name": "keyword.control.operator"
         },
         {
-          "match": "\\b[\\w\\-]+\\b",
+          "match": "\\b[\\w-]+\\b",
           "name": "variable.scss"
         },
         {
@@ -1023,7 +1023,7 @@
       "name": "keyword.other.default.scss"
     },
     "constant_functions": {
-      "begin": "(?:([\\w\\-]+)(\\.))?([\\w\\-]+)(\\()",
+      "begin": "(?:([\\w-]+)(\\.))?([\\w-]+)(\\()",
       "beginCaptures": {
         "1": {
           "name": "variable.scss"
@@ -1130,7 +1130,7 @@
     "functions": {
       "patterns": [
         {
-          "begin": "([\\w\\-]+)(\\()\\s*",
+          "begin": "([\\w-]+)(\\()\\s*",
           "beginCaptures": {
             "1": {
               "name": "support.function.misc.scss"
@@ -1152,7 +1152,7 @@
           ]
         },
         {
-          "match": "([\\w\\-]+)",
+          "match": "([\\w-]+)",
           "name": "support.function.misc.scss"
         }
       ]
@@ -1233,7 +1233,7 @@
               "name": "punctuation.separator.key-value.scss"
             }
           },
-          "match": "\\b([\\w\\-]+)\\s*(:)"
+          "match": "\\b([\\w-]+)\\s*(:)"
         },
         {
           "match": ",",
@@ -1251,7 +1251,7 @@
       ]
     },
     "operators": {
-      "match": "[\\-+*/](?!\\s*[\\-+*/])",
+      "match": "[-+*/](?!\\s*[-+*/])",
       "name": "keyword.operator.css"
     },
     "parameters": {
@@ -1315,14 +1315,14 @@
           ]
         }
       },
-      "match": "(?<=&)((?:[\\-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|[$}])+)(?=$|[\\s,.#)\\[:{>+~|]|/\\*)",
+      "match": "(?<=&)((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|[$}])+)(?=$|[\\s,.#)\\[:{>+~|]|/\\*)",
       "name": "entity.other.attribute-name.parent-selector-suffix.css"
     },
     "properties": {
       "patterns": [
         {
-          "begin": "(?<![\\-a-z])(?=[\\-a-z])",
-          "end": "$|(?![\\-a-z])",
+          "begin": "(?<![-a-z])(?=[-a-z])",
+          "end": "$|(?![-a-z])",
           "name": "meta.property-name.scss",
           "patterns": [
             {
@@ -1566,7 +1566,7 @@
           "name": "string.quoted.single.attribute-value.scss"
         }
       },
-      "match": "(?i)(\\[)\\s*((?:[\\-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+?)(?:\\s*([~|\\^$*]?=)\\s*(?:((?:[\\-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+)|((\")(.*?)(\"))|((')(.*?)('))))?\\s*(])",
+      "match": "(?i)(\\[)\\s*((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+?)(?:\\s*([~|^$*]?=)\\s*(?:((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+)|((\")(.*?)(\"))|((')(.*?)('))))?\\s*(])",
       "name": "meta.attribute-selector.scss"
     },
     "selector_class": {
@@ -1590,7 +1590,7 @@
           ]
         }
       },
-      "match": "(\\.)((?:[\\-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+)(?=$|[\\s,#)\\[:{>+~|]|\\.[^$]|/\\*|;)",
+      "match": "(\\.)((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+)(?=$|[\\s,#)\\[:{>+~|]|\\.[^$]|/\\*|;)",
       "name": "entity.other.attribute-name.class.css"
     },
     "selector_custom": {
@@ -1618,7 +1618,7 @@
           ]
         }
       },
-      "match": "(#)((?:[\\-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+)(?=$|[\\s,#)\\[:{>+~|]|\\.[^$]|/\\*)",
+      "match": "(#)((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.?\\$|})+)(?=$|[\\s,#)\\[:{>+~|]|\\.[^$]|/\\*)",
       "name": "entity.other.attribute-name.id.css"
     },
     "selector_placeholder": {
@@ -1642,7 +1642,7 @@
           ]
         }
       },
-      "match": "(%)((?:[\\-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.\\$|[$}])+)(?=;|$|[\\s,#)\\[:{>+~|]|\\.[^$]|/\\*)",
+      "match": "(%)((?:[-a-zA-Z_0-9[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.)|#\\{|\\.\\$|[$}])+)(?=;|$|[\\s,#)\\[:{>+~|]|\\.[^$]|/\\*)",
       "name": "entity.other.attribute-name.placeholder.css"
     },
     "selector_pseudo_class": {
@@ -1799,7 +1799,7 @@
       ]
     },
     "variable_setting": {
-      "begin": "(?=\\$[\\w\\-]+\\s*:)",
+      "begin": "(?=\\$[\\w-]+\\s*:)",
       "contentName": "meta.definition.variable.scss",
       "end": ";",
       "endCaptures": {
@@ -1809,7 +1809,7 @@
       },
       "patterns": [
         {
-          "match": "\\$[\\w\\-]+(?=\\s*:)",
+          "match": "\\$[\\w-]+(?=\\s*:)",
           "name": "variable.scss"
         },
         {
@@ -1861,10 +1861,10 @@
               "name": "variable.scss"
             }
           },
-          "match": "\\b([\\w\\-]+)(\\.)(\\$[\\w\\-]+)\\b"
+          "match": "\\b([\\w-]+)(\\.)(\\$[\\w-]+)\\b"
         },
         {
-          "match": "(\\$|--)[A-Za-z0-9_\\-]+\\b",
+          "match": "(\\$|--)[A-Za-z0-9_-]+\\b",
           "name": "variable.scss"
         }
       ]