tm-grammars 1.22.19 → 1.23.0

package/grammars/stylus.json

@@ -41,11 +41,11 @@
           "name": "punctuation.section.property-list.end.css"
         }
       },
-      "match": "(\\{)(\\})",
+      "match": "(\\{)(})",
       "name": "meta.brace.curly.css"
     },
     {
-      "match": "\\{|\\}",
+      "match": "[{}]",
       "name": "meta.brace.curly.css"
     },
     {
@@ -85,7 +85,7 @@
           ]
         },
         {
-          "begin": "\\s*((@)(extend[s]?)\\b)\\s*",
+          "begin": "\\s*((@)(extends?)\\b)\\s*",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.at-rule.extend.stylus"
@@ -150,7 +150,7 @@
           ]
         },
         {
-          "begin": "\\s*((@)keyframes)\\b\\s+([a-zA-Z_-][a-zA-Z0-9_-]*)",
+          "begin": "\\s*((@)keyframes)\\b\\s+([a-zA-Z_\\-][a-zA-Z0-9_\\-]*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.at-rule.keyframes.stylus"
@@ -167,7 +167,7 @@
         },
         {
           "begin": "(?=(\\b(\\d+%|from\\b|to\\b)))",
-          "end": "(?=(\\{|\\n))",
+          "end": "(?=([{\\n]))",
           "name": "meta.at-rule.keyframes.stylus",
           "patterns": [
             {
@@ -189,15 +189,15 @@
           "name": "meta.at-rule.media.stylus"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(width|scan|resolution|orientation|monochrome|min-width|min-resolution|min-monochrome|min-height|min-device-width|min-device-height|min-device-aspect-ratio|min-color-index|min-color|min-aspect-ratio|max-width|max-resolution|max-monochrome|max-height|max-device-width|max-device-height|max-device-aspect-ratio|max-color-index|max-color|max-aspect-ratio|height|grid|device-width|device-height|device-aspect-ratio|color-index|color|aspect-ratio)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w\\-])(width|scan|resolution|orientation|monochrome|min-width|min-resolution|min-monochrome|min-height|min-device-width|min-device-height|min-device-aspect-ratio|min-color-index|min-color|min-aspect-ratio|max-width|max-resolution|max-monochrome|max-height|max-device-width|max-device-height|max-device-aspect-ratio|max-color-index|max-color|max-aspect-ratio|height|grid|device-width|device-height|device-aspect-ratio|color-index|color|aspect-ratio)(?<=\\w)(?![\\w\\-])",
           "name": "support.type.property-name.media-feature.media.css"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(tv|tty|screen|projection|print|handheld|embossed|braille|aural|all)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w\\-])(tv|tty|screen|projection|print|handheld|embossed|braille|aural|all)(?<=\\w)(?![\\w\\-])",
           "name": "support.constant.media-type.media.css"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(portrait|landscape)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w\\-])(portrait|landscape)(?<=\\w)(?![\\w\\-])",
           "name": "support.constant.property-value.media-property.media.css"
         }
       ]
@@ -244,7 +244,7 @@
               "name": "punctuation.definition.constant.css"
             }
           },
-          "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"
         },
         {
@@ -305,7 +305,7 @@
     },
     "declaration": {
       "begin": "((?<=^)[^\\S\\n]+)|((?<=;)[^\\S\\n]*)|((?<=\\{)[^\\S\\n]*)",
-      "end": "(?=\\n)|(;)|(?=\\})|(\\n)",
+      "end": "(?=\\n)|(;)|(?=})|(\\n)",
       "endCaptures": {
         "2": {
           "name": "punctuation.terminator.rule.css"
@@ -314,7 +314,7 @@
       "name": "meta.property-list.css",
       "patterns": [
         {
-          "match": "(?<![\\w-])--(?:[-a-zA-Z_]|[^\\x00-\\x7F])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*",
+          "match": "(?<![\\w\\-])--[\\-a-zA-Z_[^\\x00-\\x7F]](?:[\\-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*",
           "name": "variable.css"
         },
         {
@@ -324,7 +324,7 @@
           "include": "#language_constants"
         },
         {
-          "match": "(?:(?<=^)[^\\S\\n]+(\\n))"
+          "match": "(?<=^)[^\\S\\n]+(\\n)"
         },
         {
           "captures": {
@@ -338,7 +338,7 @@
               "name": "variable.section.css"
             }
           },
-          "match": "\\G\\s*(counter-reset|counter-increment)(?:(:)|[^\\S\\n])[^\\S\\n]*([a-zA-Z_-][a-zA-Z0-9_-]*)",
+          "match": "\\G\\s*(counter-(?:reset|increment))(?:(:)|[^\\S\\n])[^\\S\\n]*([a-zA-Z_\\-][a-zA-Z0-9_\\-]*)",
           "name": "meta.property.counter.css"
         },
         {
@@ -351,7 +351,7 @@
               "name": "punctuation.separator.key-value.css"
             }
           },
-          "end": "(?=\\n|;|\\}|$)",
+          "end": "(?=[\\n;}]|$)",
           "name": "meta.property.filter.css",
           "patterns": [
             {
@@ -378,7 +378,7 @@
       "name": "support.constant.font-name.css"
     },
     "function": {
-      "begin": "(?=[a-zA-Z_-][a-zA-Z0-9_-]*\\()",
+      "begin": "(?=[a-zA-Z_\\-][a-zA-Z0-9_\\-]*\\()",
       "end": "(\\))",
       "endCaptures": {
         "1": {
@@ -400,7 +400,7 @@
           "name": "meta.function.misc.css",
           "patterns": [
             {
-              "match": "(?<=\\()[^\\)\\s]*(?=\\))",
+              "match": "(?<=\\()[^)\\s]*(?=\\))",
               "name": "string.css"
             },
             {
@@ -429,7 +429,7 @@
               "name": "variable.section.css"
             }
           },
-          "match": "(counter)(\\()([a-zA-Z_-][a-zA-Z0-9_-]*)(?=\\))",
+          "match": "(counter)(\\()([a-zA-Z_\\-][a-zA-Z0-9_\\-]*)(?=\\))",
           "name": "meta.function.misc.counter.css"
         },
         {
@@ -446,7 +446,7 @@
           "name": "meta.function.misc.counters.css",
           "patterns": [
             {
-              "match": "\\G[a-zA-Z_-][a-zA-Z0-9_-]*",
+              "match": "\\G[a-zA-Z_\\-][a-zA-Z0-9_\\-]*",
               "name": "variable.section.css"
             },
             {
@@ -475,11 +475,11 @@
           "name": "meta.function.misc.attr.css",
           "patterns": [
             {
-              "match": "\\G[a-zA-Z_-][a-zA-Z0-9_-]*",
+              "match": "\\G[a-zA-Z_\\-][a-zA-Z0-9_\\-]*",
               "name": "entity.other.attribute-name.attribute.css"
             },
             {
-              "match": "(?<=[a-zA-Z0-9_-])\\s*\\b(string|color|url|integer|number|length|em|ex|px|rem|vw|vh|vmin|vmax|mm|cm|in|pt|pc|angle|deg|grad|rad|time|s|ms|frequency|Hz|kHz|%)\\b",
+              "match": "(?<=[a-zA-Z0-9_\\-])\\s*\\b(string|color|url|integer|number|length|em|ex|px|rem|vw|vh|vmin|vmax|mm|cm|in|pt|pc|angle|deg|grad|rad|time|s|ms|frequency|Hz|kHz|%)\\b",
               "name": "support.type.attr.css"
             },
             {
@@ -694,7 +694,7 @@
           "name": "support.function.transform.css"
         },
         {
-          "begin": "([a-zA-Z_-][a-zA-Z0-9_-]*)(\\()",
+          "begin": "([a-zA-Z_\\-][a-zA-Z0-9_\\-]*)(\\()",
           "beginCaptures": {
             "1": {
               "name": "entity.name.function.stylus"
@@ -707,7 +707,7 @@
           "name": "meta.function.stylus",
           "patterns": [
             {
-              "match": "--(?:[-a-zA-Z_]|[^\\x00-\\x7F])(?:[-a-zA-Z0-9_]|[^\\x00-\\x7F]|\\\\(?:[0-9a-fA-F]{1,6}|.))*",
+              "match": "--[\\-a-zA-Z_[^\\x00-\\x7F]](?:[\\-a-zA-Z0-9_[^\\x00-\\x7F]]|\\\\(?:\\h{1,6}|.))*",
               "name": "variable.argument.stylus"
             },
             {
@@ -729,13 +729,13 @@
       ]
     },
     "interpolation": {
-      "begin": "(?:(\\{)[^\\S\\n]*)(?=[^;=]*[^\\S\\n]*\\})",
+      "begin": "(\\{)[^\\S\\n]*(?=[^;=]*[^\\S\\n]*})",
       "beginCaptures": {
         "1": {
           "name": "meta.brace.curly"
         }
       },
-      "end": "(?:[^\\S\\n]*(\\}))|\\n|$",
+      "end": "[^\\S\\n]*(})|\\n|$",
       "endCaptures": {
         "1": {
           "name": "meta.brace.curly"
@@ -785,7 +785,7 @@
               "name": "keyword.other.unit.css"
             }
           },
-          "match": "(?<!\\w|-)(?:(?:-|\\+)?(?:[0-9]+(?:\\.[0-9]+)?)|(?:\\.[0-9]+))((?:px|pt|ch|cm|mm|in|r?em|ex|pc|deg|g?rad|dpi|dpcm|dppx|fr|ms|s|turn|vh|vmax|vmin|vw)\\b|%)?",
+          "match": "(?<![\\w\\-])(?:[\\-+]?[0-9]+(?:\\.[0-9]+)?|\\.[0-9]+)((?:px|pt|ch|cm|mm|in|r?em|ex|pc|deg|g?rad|dpi|dpcm|dppx|fr|ms|s|turn|vh|vmax|vmin|vw)\\b|%)?",
           "name": "constant.numeric.css"
         }
       ]
@@ -793,7 +793,7 @@
     "operator": {
       "patterns": [
         {
-          "match": "((?:\\?|:|!|~|\\+|(\\s-\\s)|(?:\\*)?\\*|\\/|%|(\\.)?\\.\\.|<|>|(?:=|:|\\?|\\+|-|\\*|\\/|%|<|>)?=|!=)|\\b(?:in|is(?:nt)?|(?<!:)not|or|and)\\b)",
+          "match": "((?:[?:!~+]|(\\s-\\s)|\\*?\\*|[/%]|(\\.)?\\.\\.|[<>]|[=:?+\\-*/%<>]?=|!=)|\\b(?:in|is(?:nt)?|(?<!:)not|or|and)\\b)",
           "name": "keyword.operator.stylus"
         },
         {
@@ -802,7 +802,7 @@
       ]
     },
     "property": {
-      "begin": "(?:\\G\\s*(?:(-webkit-[-A-Za-z]+|-moz-[-A-Za-z]+|-o-[-A-Za-z]+|-ms-[-A-Za-z]+|-khtml-[-A-Za-z]+|zoom|z-index|y|x|wrap|word-wrap|word-spacing|word-break|word|width|widows|white-space-collapse|white-space|white|weight|volume|voice-volume|voice-stress|voice-rate|voice-pitch-range|voice-pitch|voice-family|voice-duration|voice-balance|voice|visibility|vertical-align|variant|user-select|up|unicode-bidi|unicode-range|unicode|trim|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform|touch-action|top-width|top-style|top-right-radius|top-left-radius|top-color|top|timing-function|text-wrap|text-transform|text-shadow|text-replace|text-rendering|text-overflow|text-outline|text-justify|text-indent|text-height|text-emphasis|text-decoration|text-align-last|text-align|text|target-position|target-new|target-name|target|table-layout|tab-size|style-type|style-position|style-image|style|string-set|stretch|stress|stacking-strategy|stacking-shift|stacking-ruby|stacking|src|speed|speech-rate|speech|speak-punctuation|speak-numeral|speak-header|speak|span|spacing|space-collapse|space|sizing|size-adjust|size|shadow|respond-to|rule-width|rule-style|rule-color|rule|ruby-span|ruby-position|ruby-overhang|ruby-align|ruby|rows|rotation-point|rotation|role|right-width|right-style|right-color|right|richness|rest-before|rest-after|rest|resource|resize|reset|replace|repeat|rendering-intent|rate|radius|quotes|punctuation-trim|punctuation|property|profile|presentation-level|presentation|position|pointer-events|point|play-state|play-during|play-count|pitch-range|pitch|phonemes|pause-before|pause-after|pause|page-policy|page-break-inside|page-break-before|page-break-after|page|padding-top|padding-right|padding-left|padding-bottom|padding|pack|overhang|overflow-y|overflow-x|overflow-style|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|origin|orientation|orient|ordinal-group|order|opacity|offset|numeral|new|nav-up|nav-right|nav-left|nav-index|nav-down|nav|name|move-to|model|mix-blend-mode|min-width|min-height|min|max-width|max-height|max|marquee-style|marquee-speed|marquee-play-count|marquee-direction|marquee|marks|mark-before|mark-after|mark|margin-top|margin-right|margin-left|margin-bottom|margin|mask-image|list-style-type|list-style-position|list-style-image|list-style|list|lines|line-stacking-strategy|line-stacking-shift|line-stacking-ruby|line-stacking|line-height|line-break|level|letter-spacing|length|left-width|left-style|left-color|left|label|justify-content|justify|iteration-count|inline-box-align|initial-value|initial-size|initial-before-align|initial-before-adjust|initial-after-align|initial-after-adjust|index|indent|increment|image-resolution|image-orientation|image|icon|hyphens|hyphenate-resource|hyphenate-lines|hyphenate-character|hyphenate-before|hyphenate-after|hyphenate|height|header|hanging-punctuation|gap|grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-start|grid-row|grid-row-end|grid-row-start|grid-template|grid-template-areas|grid-template-columns|grid-template-rows|row-gap|gap|font-kerning|font-language-override|font-weight|font-variant-caps|font-variant|font-style|font-synthesis|font-stretch|font-size-adjust|font-size|font-family|font|float-offset|float|flex-wrap|flex-shrink|flex-grow|flex-group|flex-flow|flex-direction|flex-basis|flex|fit-position|fit|fill|filter|family|empty-cells|emphasis|elevation|duration|drop-initial-value|drop-initial-size|drop-initial-before-align|drop-initial-before-adjust|drop-initial-after-align|drop-initial-after-adjust|drop|down|dominant-baseline|display-role|display-model|display|direction|delay|decoration-break|decoration|cursor|cue-before|cue-after|cue|crop|counter-reset|counter-increment|counter|count|content|columns|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|column-break-before|column-break-after|column|color-profile|color|collapse|clip|clear|character|caption-side|break-inside|break-before|break-after|break|box-sizing|box-shadow|box-pack|box-orient|box-ordinal-group|box-lines|box-flex-group|box-flex|box-direction|box-decoration-break|box-align|box|bottom-width|bottom-style|bottom-right-radius|bottom-left-radius|bottom-color|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-length|border-left-width|border-left-style|border-left-color|border-left|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|bookmark-target|bookmark-level|bookmark-label|bookmark|binding|bidi|before|baseline-shift|baseline|balance|background-blend-mode|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-break|background-attachment|background|azimuth|attachment|appearance|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-duration|animation-direction|animation-delay|animation-fill-mode|animation|alignment-baseline|alignment-adjust|alignment|align-self|align-last|align-items|align-content|align|after|adjust|will-change)|(writing-mode|text-anchor|stroke-width|stroke-opacity|stroke-miterlimit|stroke-linejoin|stroke-linecap|stroke-dashoffset|stroke-dasharray|stroke|stop-opacity|stop-color|shape-rendering|marker-start|marker-mid|marker-end|lighting-color|kerning|image-rendering|glyph-orientation-vertical|glyph-orientation-horizontal|flood-opacity|flood-color|fill-rule|fill-opacity|fill|enable-background|color-rendering|color-interpolation-filters|color-interpolation|clip-rule|clip-path)|([a-zA-Z_-][a-zA-Z0-9_-]*))(?!([^\\S\\n]*&)|([^\\S\\n]*\\{))(?=:|([^\\S\\n]+[^\\s])))",
+      "begin": "\\G\\s*(?:(-webkit-[\\-A-Za-z]+|-moz-[\\-A-Za-z]+|-o-[\\-A-Za-z]+|-ms-[\\-A-Za-z]+|-khtml-[\\-A-Za-z]+|zoom|z-index|[yx]|wrap|word-wrap|word-spacing|word-break|word|width|widows|white-space-collapse|white-space|white|weight|volume|voice-volume|voice-stress|voice-rate|voice-pitch-range|voice-pitch|voice-family|voice-duration|voice-balance|voice|visibility|vertical-align|variant|user-select|up|unicode-bidi|unicode-range|unicode|trim|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform|touch-action|top-width|top-style|top-right-radius|top-left-radius|top-color|top|timing-function|text-wrap|text-transform|text-shadow|text-replace|text-rendering|text-overflow|text-outline|text-justify|text-indent|text-height|text-emphasis|text-decoration|text-align-last|text-align|text|target-position|target-new|target-name|target|table-layout|tab-size|style-type|style-position|style-image|style|string-set|stretch|stress|stacking-strategy|stacking-shift|stacking-ruby|stacking|src|speed|speech-rate|speech|speak-punctuation|speak-numeral|speak-header|speak|span|spacing|space-collapse|space|sizing|size-adjust|size|shadow|respond-to|rule-width|rule-style|rule-color|rule|ruby-span|ruby-position|ruby-overhang|ruby-align|ruby|rows|rotation-point|rotation|role|right-width|right-style|right-color|right|richness|rest-before|rest-after|rest|resource|resize|reset|replace|repeat|rendering-intent|rate|radius|quotes|punctuation-trim|punctuation|property|profile|presentation-level|presentation|position|pointer-events|point|play-state|play-during|play-count|pitch-range|pitch|phonemes|pause-before|pause-after|pause|page-policy|page-break-inside|page-break-before|page-break-after|page|padding-top|padding-right|padding-left|padding-bottom|padding|pack|overhang|overflow-y|overflow-x|overflow-style|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|origin|orientation|orient|ordinal-group|order|opacity|offset|numeral|new|nav-up|nav-right|nav-left|nav-index|nav-down|nav|name|move-to|model|mix-blend-mode|min-width|min-height|min|max-width|max-height|max|marquee-style|marquee-speed|marquee-play-count|marquee-direction|marquee|marks|mark-before|mark-after|mark|margin-top|margin-right|margin-left|margin-bottom|margin|mask-image|list-style-type|list-style-position|list-style-image|list-style|list|lines|line-stacking-strategy|line-stacking-shift|line-stacking-ruby|line-stacking|line-height|line-break|level|letter-spacing|length|left-width|left-style|left-color|left|label|justify-content|justify|iteration-count|inline-box-align|initial-value|initial-size|initial-before-align|initial-before-adjust|initial-after-align|initial-after-adjust|index|indent|increment|image-resolution|image-orientation|image|icon|hyphens|hyphenate-resource|hyphenate-lines|hyphenate-character|hyphenate-before|hyphenate-after|hyphenate|height|header|hanging-punctuation|gap|grid|grid-area|grid-auto-columns|grid-auto-flow|grid-auto-rows|grid-column|grid-column-end|grid-column-start|grid-row|grid-row-end|grid-row-start|grid-template|grid-template-areas|grid-template-columns|grid-template-rows|row-gap|gap|font-kerning|font-language-override|font-weight|font-variant-caps|font-variant|font-style|font-synthesis|font-stretch|font-size-adjust|font-size|font-family|font|float-offset|float|flex-wrap|flex-shrink|flex-grow|flex-group|flex-flow|flex-direction|flex-basis|flex|fit-position|fit|fill|filter|family|empty-cells|emphasis|elevation|duration|drop-initial-value|drop-initial-size|drop-initial-before-align|drop-initial-before-adjust|drop-initial-after-align|drop-initial-after-adjust|drop|down|dominant-baseline|display-role|display-model|display|direction|delay|decoration-break|decoration|cursor|cue-before|cue-after|cue|crop|counter-reset|counter-increment|counter|count|content|columns|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|column-break-before|column-break-after|column|color-profile|color|collapse|clip|clear|character|caption-side|break-inside|break-before|break-after|break|box-sizing|box-shadow|box-pack|box-orient|box-ordinal-group|box-lines|box-flex-group|box-flex|box-direction|box-decoration-break|box-align|box|bottom-width|bottom-style|bottom-right-radius|bottom-left-radius|bottom-color|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-length|border-left-width|border-left-style|border-left-color|border-left|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|bookmark-target|bookmark-level|bookmark-label|bookmark|binding|bidi|before|baseline-shift|baseline|balance|background-blend-mode|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-break|background-attachment|background|azimuth|attachment|appearance|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-duration|animation-direction|animation-delay|animation-fill-mode|animation|alignment-baseline|alignment-adjust|alignment|align-self|align-last|align-items|align-content|align|after|adjust|will-change)|(writing-mode|text-anchor|stroke-width|stroke-opacity|stroke-miterlimit|stroke-linejoin|stroke-linecap|stroke-dashoffset|stroke-dasharray|stroke|stop-opacity|stop-color|shape-rendering|marker-start|marker-mid|marker-end|lighting-color|kerning|image-rendering|glyph-orientation-vertical|glyph-orientation-horizontal|flood-opacity|flood-color|fill-rule|fill-opacity|fill|enable-background|color-rendering|color-interpolation-filters|color-interpolation|clip-rule|clip-path)|([a-zA-Z_\\-][a-zA-Z0-9_\\-]*))(?!([^\\S\\n]*&)|([^\\S\\n]*\\{))(?=:|([^\\S\\n]+\\S))",
       "beginCaptures": {
         "1": {
           "name": "support.type.property-name.css"
@@ -814,7 +814,7 @@
           "name": "support.function.mixin.stylus"
         }
       },
-      "end": "(;)|(?=\\n|\\}|$)",
+      "end": "(;)|(?=[\\n}]|$)",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.rule.css"
@@ -836,7 +836,7 @@
           "name": "punctuation.separator.key-value.css"
         }
       },
-      "end": "(?=\\n|;|\\})",
+      "end": "(?=[\\n;}])",
       "endCaptures": {
         "1": {
           "name": "punctuation.terminator.rule.css"
@@ -848,7 +848,7 @@
           "include": "#property_values"
         },
         {
-          "match": "[^\\n]+?"
+          "match": "\\N+?"
         }
       ]
     },
@@ -867,11 +867,11 @@
           "include": "#language_constants"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(wrap-reverse|wrap|whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|unicase|underline|ultra-expanded|ultra-condensed|transparent|transform|top|titling-caps|thin|thick|text-top|text-bottom|text|tb-rl|table-row-group|table-row|table-header-group|table-footer-group|table-column-group|table-column|table-cell|table|sw-resize|super|strict|stretch|step-start|step-end|static|square|space-between|space-around|space|solid|soft-light|small-caps|separate|semi-expanded|semi-condensed|se-resize|scroll|screen|saturation|s-resize|running|rtl|row-reverse|row-resize|row|round|right|ridge|reverse|repeat-y|repeat-x|repeat|relative|progressive|progress|pre-wrap|pre-line|pre|pointer|petite-caps|paused|pan-x|pan-left|pan-right|pan-y|pan-up|pan-down|padding-box|overline|overlay|outside|outset|optimizeSpeed|optimizeLegibility|opacity|oblique|nw-resize|nowrap|not-allowed|normal|none|no-repeat|no-drop|newspaper|ne-resize|n-resize|multiply|move|middle|medium|max-height|manipulation|main-size|luminosity|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|local|list-item|linear(?!-)|line-through|line-edge|line|lighter|lighten|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline-block|inline|inherit|infinite|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|hue|horizontal|hidden|help|hard-light|hand|groove|geometricPrecision|forwards|flex-start|flex-end|flex|fixed|extra-expanded|extra-condensed|expanded|exclusion|ellipsis|ease-out|ease-in-out|ease-in|ease|e-resize|double|dotted|distribute-space|distribute-letter|distribute-all-lines|distribute|disc|disabled|difference|default|decimal|dashed|darken|currentColor|crosshair|cover|content-box|contain|condensed|column-reverse|column|color-dodge|color-burn|color|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|border-box|bolder|bold|block|bidi-override|below|baseline|balance|backwards|auto|antialiased|always|alternate-reverse|alternate|all-small-caps|all-scroll|all-petite-caps|all|absolute)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w\\-])(wrap-reverse|wrap|whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|unicase|underline|ultra-expanded|ultra-condensed|transparent|transform|top|titling-caps|thin|thick|text-top|text-bottom|text|tb-rl|table-row-group|table-row|table-header-group|table-footer-group|table-column-group|table-column|table-cell|table|sw-resize|super|strict|stretch|step-start|step-end|static|square|space-between|space-around|space|solid|soft-light|small-caps|separate|semi-expanded|semi-condensed|se-resize|scroll|screen|saturation|s-resize|running|rtl|row-reverse|row-resize|row|round|right|ridge|reverse|repeat-y|repeat-x|repeat|relative|progressive|progress|pre-wrap|pre-line|pre|pointer|petite-caps|paused|pan-x|pan-left|pan-right|pan-y|pan-up|pan-down|padding-box|overline|overlay|outside|outset|optimizeSpeed|optimizeLegibility|opacity|oblique|nw-resize|nowrap|not-allowed|normal|none|no-repeat|no-drop|newspaper|ne-resize|n-resize|multiply|move|middle|medium|max-height|manipulation|main-size|luminosity|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|local|list-item|linear(?!-)|line-through|line-edge|line|lighter|lighten|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline-block|inline|inherit|infinite|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|hue|horizontal|hidden|help|hard-light|hand|groove|geometricPrecision|forwards|flex-start|flex-end|flex|fixed|extra-expanded|extra-condensed|expanded|exclusion|ellipsis|ease-out|ease-in-out|ease-in|ease|e-resize|double|dotted|distribute-space|distribute-letter|distribute-all-lines|distribute|disc|disabled|difference|default|decimal|dashed|darken|currentColor|crosshair|cover|content-box|contain|condensed|column-reverse|column|color-dodge|color-burn|color|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|border-box|bolder|bold|block|bidi-override|below|baseline|balance|backwards|auto|antialiased|always|alternate-reverse|alternate|all-small-caps|all-scroll|all-petite-caps|all|absolute)(?<=\\w)(?![\\w\\-])",
           "name": "support.constant.property-value.css"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(start|sRGB|square|round|optimizeSpeed|optimizeQuality|nonzero|miter|middle|linearRGB|geometricPrecision |evenodd |end |crispEdges|butt|bevel)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w\\-])(start|sRGB|square|round|optimizeSpeed|optimizeQuality|nonzero|miter|middle|linearRGB|geometricPrecision |evenodd |end |crispEdges|butt|bevel)(?<=\\w)(?![\\w\\-])",
           "name": "support.constant.property-value.svg.css"
         },
         {
@@ -887,7 +887,7 @@
           "include": "#string"
         },
         {
-          "match": "\\!\\s*important",
+          "match": "!\\s*important",
           "name": "keyword.other.important.css"
         },
         {
@@ -907,7 +907,7 @@
           "include": "#variable"
         },
         {
-          "match": "(?<!^)(\\@[a-zA-Z_-][a-zA-Z0-9_-]*)",
+          "match": "(?<!^)(@[a-zA-Z_\\-][a-zA-Z0-9_\\-]*)",
           "name": "variable.property.stylus"
         }
       ]
@@ -915,15 +915,15 @@
     "selector": {
       "patterns": [
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(a|abbr|acronym|address|area|article|aside|audio|b|base|bdi|bdo|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|data|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|keygen|label|legend|li|link|main|map|mark|math|menu|menuitem|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|rb|rp|rt|rtc|ruby|s|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|svg|table|tbody|td|template|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video|wbr)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w\\-])(a|abbr|acronym|address|area|article|aside|audio|b|base|bdi|bdo|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|data|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|keygen|label|legend|li|link|main|map|mark|math|menu|menuitem|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|rb|rp|rt|rtc|ruby|s|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|svg|table|tbody|td|template|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video|wbr)(?<=\\w)(?![\\w\\-])",
           "name": "entity.name.tag.css"
         },
         {
-          "match": "(?:(?=\\w)(?<![\\w-]))(vkern|view|use|tspan|tref|title|textPath|text|symbol|switch|svg|style|stop|set|script|rect|radialGradient|polyline|polygon|pattern|path|mpath|missing-glyph|metadata|mask|marker|linearGradient|line|image|hkern|glyphRef|glyph|g|foreignObject|font-face-uri|font-face-src|font-face-name|font-face-format|font-face|font|filter|feTurbulence|feTile|feSpotLight|feSpecularLighting|fePointLight|feOffset|feMorphology|feMergeNode|feMerge|feImage|feGaussianBlur|feFuncR|feFuncG|feFuncB|feFuncA|feFlood|feDistantLight|feDisplacementMap|feDiffuseLighting|feConvolveMatrix|feComposite|feComponentTransfer|feColorMatrix|feBlend|ellipse|desc|defs|cursor|color-profile|clipPath|circle|animateTransform|animateMotion|animateColor|animate|altGlyphItem|altGlyphDef|altGlyph|a)(?:(?<=\\w)(?![\\w-]))",
+          "match": "(?=\\w)(?<![\\w\\-])(vkern|view|use|tspan|tref|title|textPath|text|symbol|switch|svg|style|stop|set|script|rect|radialGradient|polyline|polygon|pattern|path|mpath|missing-glyph|metadata|mask|marker|linearGradient|line|image|hkern|glyphRef|glyph|g|foreignObject|font-face-uri|font-face-src|font-face-name|font-face-format|font-face|font|filter|feTurbulence|feTile|feSpotLight|feSpecularLighting|fePointLight|feOffset|feMorphology|feMergeNode|feMerge|feImage|feGaussianBlur|feFuncR|feFuncG|feFuncB|feFuncA|feFlood|feDistantLight|feDisplacementMap|feDiffuseLighting|feConvolveMatrix|feComposite|feComponentTransfer|feColorMatrix|feBlend|ellipse|desc|defs|cursor|color-profile|clipPath|circle|animateTransform|animateMotion|animateColor|animate|altGlyphItem|altGlyphDef|altGlyph|a)(?<=\\w)(?![\\w\\-])",
           "name": "entity.name.tag.svg.css"
         },
         {
-          "match": "\\s*(\\,)\\s*",
+          "match": "\\s*(,)\\s*",
           "name": "meta.selector.stylus"
         },
         {
@@ -936,11 +936,11 @@
               "name": "entity.other.attribute-name.parent-selector-suffix.stylus"
             }
           },
-          "match": "\\s*(\\&)([a-zA-Z0-9_-]+)\\s*",
+          "match": "\\s*(&)([a-zA-Z0-9_\\-]+)\\s*",
           "name": "meta.selector.stylus"
         },
         {
-          "match": "\\s*(\\&)\\s*",
+          "match": "\\s*(&)\\s*",
           "name": "meta.selector.stylus"
         },
         {
@@ -949,7 +949,7 @@
               "name": "punctuation.definition.entity.css"
             }
           },
-          "match": "(\\.)[a-zA-Z0-9_-]+",
+          "match": "(\\.)[a-zA-Z0-9_\\-]+",
           "name": "entity.other.attribute-name.class.css"
         },
         {
@@ -958,7 +958,7 @@
               "name": "punctuation.definition.entity.css"
             }
           },
-          "match": "(#)[a-zA-Z][a-zA-Z0-9_-]*",
+          "match": "(#)[a-zA-Z][a-zA-Z0-9_\\-]*",
           "name": "entity.other.attribute-name.id.css"
         },
         {
@@ -1031,7 +1031,7 @@
               "name": "punctuation.section.function.css"
             }
           },
-          "match": "((:)nth-(?:(?:last-)?child|(?:last-)?of-type))(\\()(\\-?(?:\\d+n?|n)(?:\\+\\d+)?|even|odd)(\\))"
+          "match": "((:)nth-(?:(?:last-)?child|(?:last-)?of-type))(\\()(-?(?:\\d+n?|n)(?:\\+\\d+)?|even|odd)(\\))"
         },
         {
           "captures": {
@@ -1118,7 +1118,7 @@
               "name": "punctuation.definition.entity.css"
             }
           },
-          "match": "(?i)(\\[)\\s*(-?[_a-z\\\\[[:^ascii:]]][_a-z0-9\\-\\\\[[:^ascii:]]]*)(?:\\s*([~|^$*]?=)\\s*(?:(-?[_a-z\\\\[[:^ascii:]]][_a-z0-9\\-\\\\[[:^ascii:]]]*)|((?>(['\"])(?:[^\\\\]|\\\\.)*?(\\6)))))?\\s*(\\])",
+          "match": "(?i)(\\[)\\s*(-?[_a-z\\\\[:^ascii:]][_a-z0-9\\-\\\\[:^ascii:]]*)(?:\\s*([~|\\^$*]?=)\\s*(?:(-?[_a-z\\\\[:^ascii:]][_a-z0-9\\-\\\\[:^ascii:]]*)|((?>(['\"])(?:[^\\\\]|\\\\.)*?(\\6)))))?\\s*(])",
           "name": "meta.attribute-selector.css"
         },
         {
@@ -1147,7 +1147,7 @@
           "name": "string.quoted.double.css",
           "patterns": [
             {
-              "match": "\\\\([a-fA-F0-9]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.css"
             }
           ]
@@ -1168,7 +1168,7 @@
           "name": "string.quoted.single.css",
           "patterns": [
             {
-              "match": "\\\\([a-fA-F0-9]{1,6}|.)",
+              "match": "\\\\(\\h{1,6}|.)",
               "name": "constant.character.escape.css"
             }
           ]
@@ -1176,11 +1176,11 @@
       ]
     },
     "variable": {
-      "match": "(\\$[a-zA-Z_-][a-zA-Z0-9_-]*)",
+      "match": "(\\$[a-zA-Z_\\-][a-zA-Z0-9_\\-]*)",
       "name": "variable.stylus"
     },
     "variable_declaration": {
-      "begin": "^[^\\S\\n]*(\\$?[a-zA-Z_-][a-zA-Z0-9_-]*)[^\\S\\n]*(\\=|\\?\\=|\\:\\=)",
+      "begin": "^[^\\S\\n]*(\\$?[a-zA-Z_\\-][a-zA-Z0-9_\\-]*)[^\\S\\n]*(=|\\?=|:=)",
       "beginCaptures": {
         "1": {
           "name": "variable.stylus"
@@ -1189,7 +1189,7 @@
           "name": "keyword.operator.stylus"
         }
       },
-      "end": "(\\n)|(;)|(?=\\})",
+      "end": "(\\n)|(;)|(?=})",
       "endCaptures": {
         "2": {
           "name": "punctuation.terminator.rule.css"

package/grammars/svelte.json

@@ -379,14 +379,14 @@
       ]
     },
     "attributes-interpolated": {
-      "begin": "(?<!:|=)\\s*({)",
+      "begin": "(?<![:=])\\s*(\\{)",
       "captures": {
         "1": {
           "name": "entity.other.attribute-name.svelte"
         }
       },
       "contentName": "meta.embedded.expression.svelte source.ts",
-      "end": "(\\})",
+      "end": "(})",
       "patterns": [
         {
           "include": "source.ts"
@@ -448,7 +448,7 @@
               "name": "constant.numeric.decimal.svelte"
             }
           },
-          "match": "(?:(['\"])([0-9._]+[\\w%]{,4})(\\1))|(?:([0-9._]+[\\w%]{,4})(?=\\s|/?>))"
+          "match": "(['\"])([0-9._]+[\\w%]{0,4})(\\1)|([0-9._]+[\\w%]{0,4})(?=\\s|/?>)"
         },
         {
           "match": "([^\\s\"'=<>`/]|/(?!>))+",
@@ -530,7 +530,7 @@
     "destructuring": {
       "patterns": [
         {
-          "begin": "(?={)",
+          "begin": "(?=\\{)",
           "end": "(?<=})",
           "name": "meta.embedded.expression.svelte source.ts",
           "patterns": [
@@ -541,7 +541,7 @@
         },
         {
           "begin": "(?=\\[)",
-          "end": "(?<=\\])",
+          "end": "(?<=])",
           "name": "meta.embedded.expression.svelte source.ts",
           "patterns": [
             {
@@ -554,7 +554,7 @@
     "destructuring-const": {
       "patterns": [
         {
-          "begin": "(?={)",
+          "begin": "(?=\\{)",
           "end": "(?<=})",
           "name": "meta.embedded.expression.svelte source.ts",
           "patterns": [
@@ -565,7 +565,7 @@
         },
         {
           "begin": "(?=\\[)",
-          "end": "(?<=\\])",
+          "end": "(?<=])",
           "name": "meta.embedded.expression.svelte source.ts",
           "patterns": [
             {
@@ -585,7 +585,7 @@
             }
           },
           "contentName": "meta.embedded.expression.svelte source.ts",
-          "end": "\\}",
+          "end": "}",
           "endCaptures": {
             "0": {
               "name": "punctuation.section.embedded.end.svelte"
@@ -593,7 +593,7 @@
           },
           "patterns": [
             {
-              "begin": "\\G\\s*(?={)",
+              "begin": "\\G\\s*(?=\\{)",
               "end": "(?<=})",
               "patterns": [
                 {
@@ -623,8 +623,8 @@
           "include": "#interpolation"
         },
         {
-          "begin": "(?<=>|})",
-          "end": "(?=<|{)",
+          "begin": "(?<=[>}])",
+          "end": "(?=[<{])",
           "name": "text.svelte"
         }
       ]
@@ -643,7 +643,7 @@
       ]
     },
     "special-tags-block-begin": {
-      "begin": "({)\\s*(#([a-z]*))",
+      "begin": "(\\{)\\s*(#([a-z]*))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.svelte"
@@ -670,7 +670,7 @@
       ]
     },
     "special-tags-block-end": {
-      "begin": "({)\\s*(/([a-z]*))",
+      "begin": "(\\{)\\s*(/([a-z]*))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.svelte"
@@ -761,10 +761,20 @@
                   "name": "variable.other.constant.svelte"
                 }
               },
-              "end": "(?=\\=)"
+              "end": "(?=[:=])"
+            },
+            {
+              "begin": "(?=:)",
+              "end": "(?==)",
+              "name": "meta.type.annotation.svelte",
+              "patterns": [
+                {
+                  "include": "source.ts"
+                }
+              ]
             },
             {
-              "begin": "(?=\\=)",
+              "begin": "(?==)",
               "end": "(?=})",
               "name": "meta.embedded.expression.svelte source.ts",
               "patterns": [
@@ -782,7 +792,7 @@
             {
               "begin": "\\G\\s*?(?=\\S)",
               "contentName": "meta.embedded.expression.svelte source.ts",
-              "end": "(?=(?:(?:^\\s*|\\s+)(as))|\\s*(}|,))",
+              "end": "(?=(?:^\\s*|\\s+)(as)|\\s*([},]))",
               "patterns": [
                 {
                   "include": "source.ts"
@@ -790,7 +800,7 @@
               ]
             },
             {
-              "begin": "(as)|(?=}|,)",
+              "begin": "(as)|(?=[},])",
               "beginCaptures": {
                 "1": {
                   "name": "keyword.control.as.svelte"
@@ -894,7 +904,7 @@
       ]
     },
     "special-tags-void": {
-      "begin": "({)\\s*((?:[@:])(else\\s+if|[a-z]*))",
+      "begin": "(\\{)\\s*([@:](else\\s+if|[a-z]*))",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.block.begin.svelte"
@@ -907,7 +917,7 @@
           ]
         }
       },
-      "end": "\\}",
+      "end": "}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.block.end.svelte"
@@ -982,7 +992,7 @@
       "name": "meta.scope.tag.$2.svelte"
     },
     "tags-general-start": {
-      "begin": "(<)([^/\\s>/]*)",
+      "begin": "(<)([^/\\s>]*)",
       "beginCaptures": {
         "0": {
           "patterns": [
@@ -1075,7 +1085,7 @@
               "name": "entity.name.tag.svelte"
             }
           },
-          "match": "(svelte)(:)([a-z][\\w:-]*)"
+          "match": "(svelte)(:)([a-z][\\w:\\-]*)"
         },
         {
           "match": "slot",
@@ -1099,14 +1109,14 @@
               "name": "support.class.component.svelte"
             }
           },
-          "match": "([\\w]+(?:\\.[\\w]+)+)|([A-Z][\\w]+)"
+          "match": "(\\w+(?:\\.\\w+)+)|([A-Z]\\w+)"
         },
         {
-          "match": "[a-z][\\w0-9:]*-[\\w0-9:-]*",
+          "match": "[a-z][\\w0-9:]*-[\\w0-9:\\-]*",
           "name": "meta.tag.custom.svelte entity.name.tag.svelte"
         },
         {
-          "match": "[a-z][\\w0-9:-]*",
+          "match": "[a-z][\\w0-9:\\-]*",
           "name": "entity.name.tag.svelte"
         }
       ]
@@ -1134,7 +1144,7 @@
           ]
         }
       },
-      "match": "(<)([^/\\s>/]*)",
+      "match": "(<)([^/\\s>]*)",
       "name": "meta.tag.start.svelte"
     },
     "tags-void": {