github-linguist 5.3.3 → 6.0.0

data/grammars/source.stata.json

@@ -1,122 +1,115 @@
 {
-  "fileTypes": [
-    "do",
-    "ado",
-    "mata"
-  ],
-  "foldingStartMarker": "\\{\\s*$",
-  "foldingStopMarker": "^\\s*\\}",
-  "keyEquivalent": "^~S",
   "name": "Stata",
+  "scopeName": "source.stata",
   "patterns": [
     {
+      "name": "string.quoted.double.stata",
       "begin": "\"",
+      "end": "\"",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.stata"
         }
       },
-      "end": "\"",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.stata"
         }
-      },
-      "name": "string.quoted.double.stata"
+      }
     },
     {
+      "name": "string.quoted.double.compound.stata",
       "begin": "`\"",
+      "end": "\"'",
+      "patterns": [
+        {
+          "include": "#cdq_string_content"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.string.begin.stata"
         }
       },
-      "end": "\"'",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.string.end.stata"
         }
-      },
-      "name": "string.quoted.double.compound.stata",
-      "patterns": [
-        {
-          "include": "#cdq_string_content"
-        }
-      ]
+      }
     },
     {
+      "name": "comment.block.stata",
       "begin": "/\\*",
+      "end": "\\*/",
+      "patterns": [
+        {
+          "include": "#cb_content"
+        }
+      ],
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.begin.stata"
         }
       },
-      "end": "\\*/",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.stata"
         }
-      },
-      "name": "comment.block.stata",
-      "patterns": [
-        {
-          "include": "#cb_content"
-        }
-      ]
+      }
     },
     {
+      "name": "comment.line.star.stata",
+      "match": "^\\s*(\\*).*$\\n?",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.stata"
         }
-      },
-      "match": "^\\s*(\\*).*$\\n?",
-      "name": "comment.line.star.stata"
+      }
     },
     {
+      "name": "comment.line.triple-slash.stata",
+      "match": "(///).*$\\n?",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.stata"
         }
-      },
-      "match": "(///).*$\\n?",
-      "name": "comment.line.triple-slash.stata"
+      }
     },
     {
+      "name": "comment.line.double-slash.stata",
+      "match": "(//).*$\\n?",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.stata"
         }
-      },
-      "match": "(//).*$\\n?",
-      "name": "comment.line.double-slash.stata"
+      }
     },
     {
-      "match": "\\+|\\-|\\*|\\^",
-      "name": "keyword.operator.arithmetic.stata"
+      "name": "keyword.operator.arithmetic.stata",
+      "match": "\\+|\\-|\\*|\\^"
     },
     {
-      "comment": "match division operator but not path separator",
-      "match": "(?<![a-zA-Z.])/(?![a-zA-Z.]|$)",
-      "name": "keyword.operator.arithmetic.stata"
+      "name": "keyword.operator.arithmetic.stata",
+      "match": "(?\u003c![a-zA-Z.])/(?![a-zA-Z.]|$)"
     },
     {
-      "match": "\\&|\\||!|~",
-      "name": "keyword.operator.logical.stata"
+      "name": "keyword.operator.logical.stata",
+      "match": "\\\u0026|\\||!|~"
     },
     {
-      "match": "<|>|<\\=|>\\=|\\=\\=|!\\=|~\\=",
-      "name": "keyword.operator.comparison.stata"
+      "name": "keyword.operator.comparison.stata",
+      "match": "\u003c|\u003e|\u003c\\=|\u003e\\=|\\=\\=|!\\=|~\\="
     },
     {
-      "match": "\\=",
-      "name": "keyword.operator.assignment.stata"
+      "name": "keyword.operator.assignment.stata",
+      "match": "\\="
     },
     {
-      "match": "\\b(while|forv(a|al|alu|alue|alues)?|continue)\\b",
-      "name": "keyword.control.flow.stata"
+      "name": "keyword.control.flow.stata",
+      "match": "\\b(while|forv(a|al|alu|alue|alues)?|continue)\\b"
     },
     {
+      "match": "\\b(foreach)\\s+[a-zA-Z0-9_]+\\s+(in|of loc(a|al)?|of glo(b|ba|bal)?|of var(l|li|lis|list)?|of new(l|li|lis|list)?|of num(l|li|lis|list)?)\\b",
       "captures": {
         "1": {
           "name": "keyword.control.flow.stata"
@@ -124,34 +117,34 @@
         "2": {
           "name": "keyword.control.flow.stata"
         }
-      },
-      "match": "\\b(foreach)\\s+[a-zA-Z0-9_]+\\s+(in|of loc(a|al)?|of glo(b|ba|bal)?|of var(l|li|lis|list)?|of new(l|li|lis|list)?|of num(l|li|lis|list)?)\\b"
+      }
     },
     {
+      "match": "^\\s*(if|else if|else)\\b",
       "captures": {
         "1": {
           "name": "keyword.control.flow.stata"
         }
-      },
-      "match": "^\\s*(if|else if|else)\\b"
+      }
     },
     {
+      "match": "^\\s*(gl(o|ob|oba|obal)?|loc(a|al)?|tempvar|tempname|tempfile)\\b",
       "captures": {
         "1": {
           "name": "storage.type.macro.stata"
         }
-      },
-      "match": "^\\s*(gl(o|ob|oba|obal)?|loc(a|al)?|tempvar|tempname|tempfile)\\b"
+      }
     },
     {
+      "match": "^\\s*(sca(l|la|lar)?(\\s+de(f|fi|fin|fine)?)?)\\s+(?!(drop|dir?|l(i|is|ist)?)\\s+)",
       "captures": {
         "1": {
           "name": "storage.type.scalar.stata"
         }
-      },
-      "match": "^\\s*(sca(l|la|lar)?(\\s+de(f|fi|fin|fine)?)?)\\s+(?!(drop|dir?|l(i|is|ist)?)\\s+)"
+      }
     },
     {
+      "match": "(^|:|{|qui(e|et|etl|etly)?\\s+|n(o|oi|ois|oisi|oisil|oisily)?\\s+)\\s*(by(s|so|sor|sort)?)((\\s|,)[^:]*)?(?=:)",
       "captures": {
         "4": {
           "name": "keyword.control.flow.stata"
@@ -159,23 +152,21 @@
         "5": {
           "name": "keyword.control.flow.stata"
         }
-      },
-      "match": "(^|:|{|qui(e|et|etl|etly)?\\s+|n(o|oi|ois|oisi|oisil|oisily)?\\s+)\\s*(by(s|so|sor|sort)?)((\\s|,)[^:]*)?(?=:)"
+      }
     },
     {
+      "match": "(^|:|{|qui(e|et|etl|etly)?\\s+|n(o|oi|ois|oisi|oisil|oisily)?\\s+)\\s*((g(e|en|ene|ener|enera|enerat|enerate)?)|replace|egen)\\b",
       "captures": {
         "4": {
           "name": "storage.type.variable.stata"
         }
-      },
-      "match": "(^|:|{|qui(e|et|etl|etly)?\\s+|n(o|oi|ois|oisi|oisil|oisily)?\\s+)\\s*((g(e|en|ene|ener|enera|enerat|enerate)?)|replace|egen)\\b"
+      }
     },
     {
-      "begin": "^\\s*mata:?\\s*$",
-      "comment": "won't match single-line Mata statements",
+      "name": "meta.embedded.block.mata",
       "contentName": "source.mata",
+      "begin": "^\\s*mata:?\\s*$",
       "end": "^\\s*end\\s*$\\n?",
-      "name": "meta.embedded.block.mata",
       "patterns": [
         {
           "include": "source.mata"
@@ -202,7 +193,5 @@
         }
       ]
     }
-  },
-  "scopeName": "source.stata",
-  "uuid": "4011DD24-A5DD-4723-AE6B-65042218AB1F"
-}
+  }
+}

data/grammars/source.strings.json

@@ -1,53 +1,49 @@
 {
-  "fileTypes": [
-    "strings"
-  ],
   "name": "Strings File",
+  "scopeName": "source.strings",
   "patterns": [
     {
+      "name": "comment.block.strings",
       "begin": "/\\*",
+      "end": "\\*/",
       "captures": {
         "0": {
           "name": "punctuation.definition.comment.strings"
         }
-      },
-      "end": "\\*/",
-      "name": "comment.block.strings"
+      }
     },
     {
+      "name": "string.quoted.double.strings",
       "begin": "\"",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.begin.strings"
-        }
-      },
       "end": "\"",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.string.end.strings"
-        }
-      },
-      "name": "string.quoted.double.strings",
       "patterns": [
         {
-          "match": "\\\\(\\\\|[abefnrtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-zA-Z0-9]+)",
-          "name": "constant.character.escape.strings"
+          "name": "constant.character.escape.strings",
+          "match": "\\\\(\\\\|[abefnrtv'\"?]|[0-3]\\d{0,2}|[4-7]\\d?|x[a-zA-Z0-9]+)"
         },
         {
-          "match": "\\\\.",
-          "name": "invalid.illegal.unknown-escape.strings"
+          "name": "invalid.illegal.unknown-escape.strings",
+          "match": "\\\\."
         },
         {
-          "match": "(?x)%\n\t\t\t\t\t\t(\\d+\\$)?                             # field (argument #)\n\t\t\t\t\t\t[#0\\- +']*                           # flags\n\t\t\t\t\t\t[,;:_]?                              # separator character (AltiVec)\n\t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)?              # minimum field width\n\t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?         # precision\n\t\t\t\t\t\t(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\n\t\t\t\t\t\t[@diouxXDOUeEfFgGaACcSspn%]          # conversion type\n\t\t\t\t\t",
-          "name": "constant.other.placeholder.strings"
+          "name": "constant.other.placeholder.strings",
+          "match": "(?x)%\n\t\t\t\t\t\t(\\d+\\$)?                             # field (argument #)\n\t\t\t\t\t\t[#0\\- +']*                           # flags\n\t\t\t\t\t\t[,;:_]?                              # separator character (AltiVec)\n\t\t\t\t\t\t((-?\\d+)|\\*(-?\\d+\\$)?)?              # minimum field width\n\t\t\t\t\t\t(\\.((-?\\d+)|\\*(-?\\d+\\$)?)?)?         # precision\n\t\t\t\t\t\t(hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)? # length modifier\n\t\t\t\t\t\t[@diouxXDOUeEfFgGaACcSspn%]          # conversion type\n\t\t\t\t\t"
         },
         {
-          "match": "%",
-          "name": "invalid.illegal.placeholder.c"
+          "name": "invalid.illegal.placeholder.c",
+          "match": "%"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.strings"
         }
-      ]
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.strings"
+        }
+      }
     }
-  ],
-  "scopeName": "source.strings",
-  "uuid": "429E2DB7-EB4F-4B34-A4DF-DBFD3336C581"
-}
+  ]
+}

data/grammars/source.stylus.json

@@ -1,223 +1,278 @@
 {
   "name": "Stylus",
   "scopeName": "source.stylus",
-  "fileTypes": [
-    "styl",
-    "stylus"
-  ],
-  "foldingStartMarker": "\\{\\s*$",
-  "foldingStopMarker": "^\\s*\\}",
-  "uuid": "5739E0FB-A2C0-4CB4-AB89-AFFFFD1F3FA1",
-  "repository": {
-    "string-quoted": {
+  "patterns": [
+    {
+      "include": "#comments"
+    },
+    {
+      "begin": "^\\s*(@(?:import|charset|css|font-face|(?:-webkit-)?keyframes)(?:\\s+([\\w-]+))?)\\b",
+      "end": "$|;|(?=\\{)",
       "patterns": [
         {
-          "match": "'[^']*'",
-          "name": "string.quoted.single.stylus"
+          "include": "#string-quoted"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.at-rule.other.stylus"
         },
+        "2": {
+          "name": "variable.other.animation-name.stylus"
+        }
+      }
+    },
+    {
+      "begin": "^\\s*(@media)\\s*",
+      "end": "$|(?=\\{)",
+      "patterns": [
+        {
+          "include": "#media-query"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.at-rule.media.stylus"
+        }
+      }
+    },
+    {
+      "begin": "(?x)\n(?\u003c=^|;|})\n\\s*\n(?=\n    [\\[\\]'\".\\w$-]+\n    \\s*\n    ([?:]?=)\n    (?![^\\[]*\\])\n)\n",
+      "end": "$|;",
+      "patterns": [
         {
-          "match": "\"[^\"]*\"",
-          "name": "string.quoted.double.stylus"
+          "include": "#expression"
         }
       ]
     },
-    "variable": {
-      "match": "([\\w$-]+\\b)",
-      "name": "variable.other.stylus"
+    {
+      "include": "#iteration"
     },
-    "hash-definition": {
-      "begin": "\\{",
+    {
+      "include": "#conditionals"
+    },
+    {
+      "include": "#return"
+    },
+    {
+      "name": "meta.function-call.stylus",
+      "begin": "(?x)            # multi-line regex definition mode\n\n^(\\s*)          # starts at the beginning of line\n([\\w$-]+)       # identifier (name)\n(\\()            # start of argument list\n(?=\n    .*?\n    \\)\\s*\\{     # we see a curly brace afterwards\n)               # which means this is a function definition\n",
+      "end": "(\\))",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
       "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.start.stylus"
+        "2": {
+          "name": "entity.name.function.stylus"
+        },
+        "3": {
+          "name": "punctuation.definition.parameters.start.stylus"
         }
       },
-      "end": "\\}",
       "endCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.end.stylus"
+        "1": {
+          "name": "punctuation.definition.parameters.end.stylus"
+        }
+      }
+    },
+    {
+      "name": "meta.function-call.stylus",
+      "begin": "(?x)                # multi-line regex definition mode\n(\n\n    (^|;)           # starts at the beginning of line or at a ;\n    \\s*\n    (\\+?\\s*         # for block mixins\n     [\\w$-]+)       # identifier (name)\n    (\\()            # start of argument list\n    (?=\n        .*?\n        \\)\\s*;?\\s*  # if there are only spaces and semicolons\n        $|;         # then this a\n    )\n)\n",
+      "end": "(\\))",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
+      "beginCaptures": {
+        "3": {
+          "name": "entity.other.attribute-name.mixin.stylus"
+        },
+        "4": {
+          "name": "punctuation.definition.parameters.start.stylus"
         }
       },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.parameters.end.stylus"
+        }
+      }
+    },
+    {
+      "name": "meta.selector.stylus",
+      "begin": "(?x) # multi-line regex definition mode\n(^|(?\u003c=\\*/|\\}))\\s*\n(?=\n    font(?!\n        \\s*:\\s\n        |\n        -\n        |\n        .*?\n        (?:\n            \\/|normal|bold|light(er?)|serif|sans|monospace|\n            \\b\\d+(?:\\b|px|r?em|%)|\n            var\\s*\\(|\n            ['\"][^\\]]*$\n        )\n    ) | # we need to distinguish between tag and property `cursor`\n    cursor(?!\n        \\s*[:;]\\s\n        |\n        -\n        |\n        .*?\n        (?:\n            (?:url\\s*\\()|\n            (?:-moz-|-webkit-|-ms-)?\n            (?:auto|default|none|context-menu|help|pointer|progress|\n            wait|cell|crosshair|text|vertical-text|alias|copy|\n            move|no-drop|not-allowed|e-resize|n-resize|ne-resize|\n            nw-resize|s-resize|se-resize|sw-resize|w-resize|\n            ew-resize|ns-resize|nesw-resize|nwse-resize|col-resize|\n            row-resize|all-scroll|zoom-in|zoom-out|grab|grabbing\n            normal|bold|light(er?)|serif|sans|monospace)\n        )\n    ) | (\n        (\n        altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|\n        animateMotion|animateTransform|circle|clipPath|color-profile|\n        defs|desc|ellipse|feBlend|feColorMatrix|\n        feComponentTransfer|feComposite|feConvolveMatrix|\n        feDiffuseLighting|feDisplacementMap|feDistantLight|feFlood|\n        feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feImage|feMerge|\n        feMergeNode|feMorphology|feOffset|fePointLight|\n        feSpecularLighting|feSpotLight|feTile|feTurbulence|filter|\n        font-face|font-face-format|font-face-name|font-face-src|\n        font-face-uri|foreignObject|g|glyph|glyphRef|hkern|image|line|\n        linearGradient|marker|mask|metadata|missing-glyph|mpath|path|\n        pattern|polygon|polyline|radialGradient|rect|set|stop|svg|\n        switch|symbol|text|textPath|tref|tspan|use|view|vkern|\n        a|abbr|acronym|address|applet|area|article|aside|audio|b|base|\n        basefont|bdi|bdo|bgsound|big|blink|blockquote|body|br|button|\n        canvas|caption|center|cite|code|col|colgroup|data|\n        datalist|dd|decorator|del|details|dfn|dir|div|dl|dt|element|\n        em|embed|fieldset|figcaption|figure|footer|form|frame|\n        frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|\n        img|input|ins|isindex|kbd|keygen|label|legend|li|link|listing|\n        main|map|mark|marquee|menu|menuitem|meta|meter|nav|nobr|\n        noframes|noscript|object|ol|optgroup|option|output|p|param|\n        plaintext|pre|progress|q|rp|rt|ruby|s|samp|script|section|\n        select|shadow|small|source|spacer|span|strike|strong|style|\n        sub|summary|sup|table|tbody|td|template|textarea|tfoot|th|\n        thead|time|title|tr|track|tt|u|ul|var|video|wbr|xmp)\n\n        \\s*([\\s,.#\\[]|:[^\\s]|(?=\\{|$))\n\n    ) | (\n        [:~\u003e\\[*\\/]       # symbols but they are valid for selector\n\n    ) | (\n\n        \\+\\s*[\\w$-]+\\b\\s*      # are an identifier starting with $\n        (?!\\()              # and they can't have anything besides\n\n    ) | (                    # for animtions\n\n        \\d+(\\.\\d+)?%|(from|to)\\b\n\n    ) | (                   # Placeholder selectors\n\n        \\$[\\w$-]+\\b\\s*      # are an identifier starting with $\n        (?=$|\\{)            # and they can't have anything besides\n\n    ) | (                   # CSS class\n\n        \\.[a-zA-Z0-9_-]+\n\n    ) | (                   # CSS id\n\n        \\#[a-zA-Z0-9_-]+\n\n    ) | (                   # Reference to parent\n\n        ([\\w\\d_-]+)?        # matching any word right before \u0026\n        (\u0026)             # \u0026 itself, escaped because of plist\n        ([\\w\\d_-]+)?        # matching any word right after \u0026\n    )\n)\n",
+      "end": "\n|$|(?=\\{\\s*\\}.*$)|(?=\\{.*?[:;])|(?=\\{)(?!.+\\}.*$)",
       "patterns": [
         {
-          "include": "#single-line-comment"
+          "include": "#comma"
         },
         {
-          "begin": "(?x)\n(?:\n    ([\\w$-]+)\n    |\n    ('[^']*')\n    |\n    (\"[^\"]*\")\n)\n\\s*\n(:)\n\\s*\n",
-          "beginCaptures": {
-            "1": {
-              "name": "support.type.property-name.stylus"
-            },
-            "2": {
-              "name": "string.quoted.single.stylus"
-            },
-            "3": {
-              "name": "string.quoted.double.stylus"
-            },
-            "4": {
-              "name": "punctuation.separator.key-value.stylus"
-            }
-          },
+          "name": "entity.other.animation-keyframe.stylus",
+          "match": "\\d+(\\.\\d+)?%|from|to"
+        },
+        {
+          "include": "#selector-components"
+        },
+        {
+          "name": "entity.other.attribute-name.stylus",
+          "match": "."
+        }
+      ]
+    },
+    {
+      "begin": "(?x)                # multi-line regex definition mode\n(?\u003c=^|;|{)\\s*    # starts after begining of line, '{' or ';''\n(?=                 # lookahead for\n    (\n     [a-zA-Z0-9_-]  # then a letter\n     |              # or\n     (\\{(.*?)\\})    # interpolation\n     |              # or\n     (/\\*.*?\\*/)    # comment\n    )+\n\n    \\s*[:\\s]\\s*     # value is separted by colon or space\n\n    (?!(\\s*\\{))     # if there are only spaces afterwards\n\n    (?!\n        [^}]*?      # checking for an unclosed curly braces on this\n        \\{          # line because if one exists it means that\n        [^}]*       # this is a selector and not a property\n        ($|\\})\n    )\n)\n",
+      "end": "(?=\\}|;)|(?\u003c!,)\\s*\\n",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#interpolation"
+        },
+        {
+          "begin": "(?\u003c!^|;|{)\\s*(?:(:)|\\s)",
+          "end": "(;)|(?=\\})|(?=(?\u003c!\\,)\\s*\\n)",
           "patterns": [
+            {
+              "include": "#comments"
+            },
             {
               "include": "#expression"
             }
           ],
-          "end": "(;)|(?=\\}|$)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.separator.key-value.stylus"
+            }
+          },
           "endCaptures": {
             "1": {
-              "name": "punctuation.terminator.statement.stylus"
+              "name": "punctuation.terminator.rule.stylus"
             }
           }
-        }
-      ],
-      "name": "meta.hash.stylus"
-    },
-    "hash-access": {
-      "begin": "(?=[\\w$-]+(?:\\.|\\[[^\\]=]*\\]))",
-      "end": "(?=[^''\"\"\\[\\]\\w.$-]|\\s|$)",
-      "patterns": [
-        {
-          "match": "\\.",
-          "name": "punctuation.delimiter.hash.stylus"
-        },
-        {
-          "match": "\\[",
-          "name": "punctuation.definition.entity.start.stylus"
         },
         {
-          "match": "\\]",
-          "name": "punctuation.definition.entity.end.stylus"
+          "name": "support.type.vendor-prefix.stylus",
+          "match": "-(moz|o|ms|webkit|khtml)-"
         },
         {
-          "include": "#string-quoted"
-        },
-        {
-          "include": "#variable"
+          "name": "meta.property-name.stylus support.type.property-name.stylus",
+          "match": "."
         }
-      ],
-      "name": "meta.hash-access.stylus"
-    },
-    "escape": {
-      "match": "\\\\.",
-      "name": "constant.character.escape.stylus"
+      ]
     },
-    "interpolation": {
-      "begin": "\\{",
-      "end": "\\}",
-      "beginCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.start.stylus"
-        }
-      },
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.section.embedded.end.stylus"
-        }
-      },
+    {
+      "begin": "@extends?\\s",
+      "end": "(?=$|;)",
       "patterns": [
         {
-          "include": "#expression"
+          "include": "#selector-components"
         }
       ],
-      "name": "stylus.embedded.source"
+      "beginCaptures": {
+        "0": {
+          "name": "keyword.language.stylus"
+        }
+      }
     },
-    "language-constants": {
-      "match": "\\b(true|false|null)\\b",
-      "name": "constant.language.stylus"
+    {
+      "include": "#string-quoted"
     },
-    "language-operators": {
-      "match": "((?:\\?|:|!|~|\\+|-|(?:\\*)?\\*|\\/|%|(\\.)?\\.\\.|<|>|(?:=|:|\\?|\\+|-|\\*|\\/|%|<|>)?=|!=)|\\b(?:in|is(?:nt)?|(?<!:)not)\\b)",
-      "name": "keyword.operator.stylus"
+    {
+      "include": "#escape"
     },
-    "language-keywords": {
+    {
+      "include": "#language-constants"
+    },
+    {
+      "include": "#language-operators"
+    },
+    {
+      "include": "#language-keywords"
+    },
+    {
+      "include": "#property-reference"
+    },
+    {
+      "include": "#function-call"
+    },
+    {
+      "name": "punctuation.section.start.stylus",
+      "match": "\\{"
+    },
+    {
+      "name": "punctuation.section.end.stylus",
+      "match": "\\}"
+    }
+  ],
+  "repository": {
+    "attribute-selector": {
+      "name": "meta.attribute-selector.stylus",
+      "begin": "\\[(?=[^\\]]*\\])",
+      "end": "\\]",
       "patterns": [
         {
-          "match": "(\\b|\\s)(return|else)\\b",
-          "name": "keyword.control.stylus"
+          "begin": "(?\u003c=\\[)|(?\u003c=\\{)",
+          "end": "(?=[|~=\\]\\s])",
+          "patterns": [
+            {
+              "include": "#interpolation"
+            },
+            {
+              "match": ".",
+              "captures": {
+                "0": {
+                  "name": "entity.other.attribute-name.stylus"
+                }
+              }
+            }
+          ]
         },
         {
-          "match": "(\\b|\\s)(!important|in|is defined|is a)\\b",
-          "name": "keyword.other.stylus"
+          "include": "#interpolation"
         },
         {
-          "match": "\\barguments\\b",
-          "name": "variable.language.stylus"
-        }
-      ]
-    },
-    "language-property-value-constants": {
-      "match": "\\b(absolute|all(-scroll)?|always|armenian|auto|avoid|baseline|below|bidi-override|block|bold(er)?|(border|content|padding)-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|crosshair|cursive|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fantasy|fixed|geometricPrecision|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|monospace|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|optimize(Legibility|Quality|Speed)|outset|outside|overline|pointer|pre(-(wrap|line))?|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|(sans-)?serif|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|sub|super|sw-resize|table(-(row|cell|footer-group|header-group))?|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical(-(ideographic|text))?|visible(Painted|Fill|Stroke)?|w-resize|wait|whitespace|zero|smaller|larger|((xx?-)?(small(er)?|large(r)?))|painted|fill|stroke)\\b",
-      "name": "constant.property-value.stylus"
-    },
-    "numeric-values": {
-      "patterns": [
-        {
+          "match": "([|~]?=)",
           "captures": {
             "1": {
-              "name": "punctuation.definition.constant.stylus"
-            },
-            "2": {
-              "name": "constant.other.color.rgb-value.red.stylus"
-            },
-            "3": {
-              "name": "constant.other.color.rgb-value.green.stylus"
-            },
-            "4": {
-              "name": "constant.other.color.rgb-value.blue.stylus"
-            },
-            "5": {
-              "name": "constant.other.color.rgb-value.alpha.stylus"
-            },
-            "6": {
-              "name": "constant.other.color.rgb-value.red.stylus"
-            },
-            "7": {
-              "name": "constant.other.color.rgb-value.green.stylus"
-            },
-            "8": {
-              "name": "constant.other.color.rgb-value.blue.stylus"
-            },
-            "9": {
-              "name": "constant.other.color.rgb-value.alpha.stylus"
+              "name": "keyword.operator.stylus"
             }
-          },
-          "match": "(?x) # multi-line regex definition mode\n(\\#)(?:\n        ([0-9a-fA-F])\n        ([0-9a-fA-F])\n        ([0-9a-fA-F])\n        ([0-9a-fA-F])?\n|       ([0-9a-fA-F]{2})\n        ([0-9a-fA-F]{2})\n        ([0-9a-fA-F]{2})\n        ([0-9a-fA-F]{2})?\n)\\b\n",
-          "name": "constant.other.color.rgb-value.stylus"
+          }
         },
         {
+          "include": "#string-quoted"
+        },
+        {
+          "match": ".",
           "captures": {
-            "1": {
-              "name": "keyword.other.unit.stylus"
+            "0": {
+              "name": "string.unquoted.stylus"
             }
-          },
-          "match": "(?x)                    # multi-line regex definition mode\n(?:-|\\+)?               # negative / positive\n(?:\n    (?:\n        [0-9]+          # integer part\n        (?:\\.[0-9]+)?   # fraction\n    ) |\n    (?:\\.[0-9]+)        # fraction without leading zero\n)\n((?:                    # units\n    px|pt|ch|cm|mm|in|\n    r?em|ex|pc|vw|vh|vmin|vmax|deg|\n    g?rad|turn|dpi|dpcm|dppx|m?s|k?Hz\n)\\b|%)?\n",
-          "name": "constant.numeric.stylus"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.entity.start.stylus"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.entity.end.stylus"
+        }
+      }
     },
     "color-values": {
       "patterns": [
         {
-          "match": "\\b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\\b",
-          "name": "constant.color.w3c-standard-color-name.stylus"
+          "name": "constant.color.w3c-standard-color-name.stylus",
+          "match": "\\b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\\b"
         },
         {
           "begin": "(hsla?|rgba?)\\s*(\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.language.function.misc.stylus"
-            },
-            "2": {
-              "name": "punctuation.definition.parameters.start.stylus"
-            }
-          },
           "end": "\\)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.parameters.end.stylus"
-            }
-          },
           "patterns": [
             {
               "match": "(?x) # multi-line regex definition mode\n\\b\n(?:0*((?:1?[0-9]{1,2})|(?:2(?:[0-4][0-9]|5[0-5])))\\s*(,)\\s*)\n(?:0*((?:1?[0-9]{1,2})|(?:2(?:[0-4][0-9]|5[0-5])))\\s*(,)\\s*)\n(?:0*((?:1?[0-9]{1,2})|(?:2(?:[0-4][0-9]|5[0-5])))\\b)\n",
@@ -273,7 +328,20 @@
             {
               "include": "#numeric-values"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.language.function.misc.stylus"
+            },
+            "2": {
+              "name": "punctuation.definition.parameters.start.stylus"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.parameters.end.stylus"
+            }
+          }
         },
         {
           "include": "#numeric-values"
@@ -281,8 +349,43 @@
       ]
     },
     "comma": {
-      "match": "\\s*,\\s*",
-      "name": "punctuation.delimiter.comma.stylus"
+      "name": "punctuation.delimiter.comma.stylus",
+      "match": "\\s*,\\s*"
+    },
+    "comments": {
+      "patterns": [
+        {
+          "include": "#single-line-comment"
+        },
+        {
+          "name": "comment.block.stylus",
+          "begin": "\\/\\*",
+          "end": "\\*\\/",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.comment.stylus"
+            }
+          }
+        }
+      ]
+    },
+    "conditionals": {
+      "begin": "(^\\s*|\\s+)(if|unless|else)(?=[\\s({]|$)\\s*",
+      "end": "(?=$|\\{)",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
+      "beginCaptures": {
+        "2": {
+          "name": "keyword.control.stylus"
+        }
+      }
+    },
+    "escape": {
+      "name": "constant.character.escape.stylus",
+      "match": "\\\\."
     },
     "expression": {
       "patterns": [
@@ -339,12 +442,15 @@
         }
       ]
     },
-    "property-reference": {
-      "match": "@[a-z-]+",
-      "name": "variable.other.property.stylus"
-    },
-    "url": {
-      "begin": "(url)\\s*(\\()",
+    "function-call": {
+      "name": "meta.function-call.stylus",
+      "begin": "([\\w$-]+)(\\()",
+      "end": "(\\))",
+      "patterns": [
+        {
+          "include": "#expression"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "entity.function-name.stylus"
@@ -353,162 +459,162 @@
           "name": "punctuation.definition.parameters.start.stylus"
         }
       },
-      "end": "(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.parameters.end.stylus"
         }
-      },
+      }
+    },
+    "hash-access": {
+      "name": "meta.hash-access.stylus",
+      "begin": "(?=[\\w$-]+(?:\\.|\\[[^\\]=]*\\]))",
+      "end": "(?=[^''\"\"\\[\\]\\w.$-]|\\s|$)",
       "patterns": [
         {
-          "include": "#string-quoted"
+          "name": "punctuation.delimiter.hash.stylus",
+          "match": "\\."
         },
         {
-          "include": "#language-constants"
+          "name": "punctuation.definition.entity.start.stylus",
+          "match": "\\["
         },
         {
-          "include": "#language-property-value-constants"
+          "name": "punctuation.definition.entity.end.stylus",
+          "match": "\\]"
         },
         {
-          "include": "#property-reference"
+          "include": "#string-quoted"
         },
         {
           "include": "#variable"
         }
-      ],
-      "name": "meta.function-call.stylus"
+      ]
     },
-    "function-call": {
-      "begin": "([\\w$-]+)(\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "entity.function-name.stylus"
-        },
-        "2": {
-          "name": "punctuation.definition.parameters.start.stylus"
-        }
-      },
-      "end": "(\\))",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.parameters.end.stylus"
-        }
-      },
+    "hash-definition": {
+      "name": "meta.hash.stylus",
+      "begin": "\\{",
+      "end": "\\}",
       "patterns": [
         {
-          "include": "#expression"
+          "include": "#single-line-comment"
+        },
+        {
+          "begin": "(?x)\n(?:\n    ([\\w$-]+)\n    |\n    ('[^']*')\n    |\n    (\"[^\"]*\")\n)\n\\s*\n(:)\n\\s*\n",
+          "end": "(;)|(?=\\}|$)",
+          "patterns": [
+            {
+              "include": "#expression"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "support.type.property-name.stylus"
+            },
+            "2": {
+              "name": "string.quoted.single.stylus"
+            },
+            "3": {
+              "name": "string.quoted.double.stylus"
+            },
+            "4": {
+              "name": "punctuation.separator.key-value.stylus"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.terminator.statement.stylus"
+            }
+          }
         }
       ],
-      "name": "meta.function-call.stylus"
-    },
-    "iteration": {
-      "begin": "(^\\s*|\\s+)(for)\\s+(?=.*?\\s+in\\s+)",
       "beginCaptures": {
-        "2": {
-          "name": "keyword.control.stylus"
+        "0": {
+          "name": "punctuation.section.embedded.start.stylus"
         }
       },
-      "end": "$|\\{",
-      "patterns": [
-        {
-          "include": "#expression"
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.embedded.end.stylus"
         }
-      ]
+      }
     },
-    "conditionals": {
-      "begin": "(^\\s*|\\s+)(if|unless|else)(?=[\\s({]|$)\\s*",
-      "beginCaptures": {
-        "2": {
-          "name": "keyword.control.stylus"
-        }
-      },
-      "end": "(?=$|\\{)",
+    "interpolation": {
+      "name": "stylus.embedded.source",
+      "begin": "\\{",
+      "end": "\\}",
       "patterns": [
         {
           "include": "#expression"
         }
-      ]
-    },
-    "return": {
-      "begin": "^\\s*(return)",
+      ],
       "beginCaptures": {
-        "1": {
-          "name": "keyword.control.stylus"
+        "0": {
+          "name": "punctuation.section.embedded.start.stylus"
         }
       },
-      "end": "(;)|(?=$)",
       "endCaptures": {
-        "1": {
-          "name": "punctuation.terminator.statement.stylus"
+        "0": {
+          "name": "punctuation.section.embedded.end.stylus"
         }
-      },
+      }
+    },
+    "iteration": {
+      "begin": "(^\\s*|\\s+)(for)\\s+(?=.*?\\s+in\\s+)",
+      "end": "$|\\{",
       "patterns": [
         {
           "include": "#expression"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "2": {
+          "name": "keyword.control.stylus"
+        }
+      }
     },
-    "media-query-properties": {
+    "language-constants": {
+      "name": "constant.language.stylus",
+      "match": "\\b(true|false|null)\\b"
+    },
+    "language-keywords": {
       "patterns": [
         {
-          "match": "\\s*:\\s*",
-          "captures": {
-            "0": {
-              "name": "punctuation.separator.key-value.stylus"
-            }
-          }
+          "name": "keyword.control.stylus",
+          "match": "(\\b|\\s)(return|else)\\b"
         },
         {
-          "match": "(?x)\n(\n    ((min|max)-)?\n    (\n        ((device-)?(height|width|aspect-ratio))|\n        (color(-index)?)|monochrome|resolution\n    )\n)|grid|scan|orientation\n",
-          "captures": {
-            "0": {
-              "name": "support.type.property-name.media.stylus"
-            }
-          }
+          "name": "keyword.other.stylus",
+          "match": "(\\b|\\s)(!important|in|is defined|is a)\\b"
         },
         {
-          "match": "\\b(portrait|landscape|progressive|interlace)\\b",
-          "captures": {
-            "1": {
-              "name": "support.constant.property-value.stylus"
-            }
-          }
+          "name": "variable.language.stylus",
+          "match": "\\barguments\\b"
         }
       ]
     },
-    "media-query-list": {
-      "begin": "\\s*(and)?\\s*(\\()\\s*",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.operator.logic.media.stylus"
-        },
-        "2": {
-          "name": "punctuation.definition.parameters.start.stylus"
-        }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "punctuation.definition.parameters.end.stylus"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#media-query-properties"
-        },
-        {
-          "include": "#numeric-values"
-        }
-      ]
+    "language-operators": {
+      "name": "keyword.operator.stylus",
+      "match": "((?:\\?|:|!|~|\\+|-|(?:\\*)?\\*|\\/|%|(\\.)?\\.\\.|\u003c|\u003e|(?:=|:|\\?|\\+|-|\\*|\\/|%|\u003c|\u003e)?=|!=)|\\b(?:in|is(?:nt)?|(?\u003c!:)not)\\b)"
+    },
+    "language-property-value-constants": {
+      "name": "constant.property-value.stylus",
+      "match": "\\b(absolute|all(-scroll)?|always|armenian|auto|avoid|baseline|below|bidi-override|block|bold(er)?|(border|content|padding)-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|crosshair|cursive|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fantasy|fixed|geometricPrecision|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|monospace|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|optimize(Legibility|Quality|Speed)|outset|outside|overline|pointer|pre(-(wrap|line))?|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|(sans-)?serif|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|sub|super|sw-resize|table(-(row|cell|footer-group|header-group))?|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical(-(ideographic|text))?|visible(Painted|Fill|Stroke)?|w-resize|wait|whitespace|zero|smaller|larger|((xx?-)?(small(er)?|large(r)?))|painted|fill|stroke)\\b"
     },
     "media-query": {
       "patterns": [
         {
+          "name": "meta.at-rule.media.stylus",
           "begin": "\\s*(?![{;]|$)",
           "end": "\\s*(?=[{;]|$)",
           "patterns": [
             {
               "begin": "(?i)\\s*(only|not)?\\s*(all|aural|braille|embossed|handheld|print|projection|screen|tty|tv)?(?![\\w\\d$-]+)",
+              "end": "\\s*(?:(,)|(?=[{;]|$))",
+              "patterns": [
+                {
+                  "include": "#media-query-list"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "keyword.operator.logic.media.stylus"
@@ -516,120 +622,146 @@
                 "2": {
                   "name": "support.constant.media.stylus"
                 }
-              },
-              "end": "\\s*(?:(,)|(?=[{;]|$))",
-              "patterns": [
-                {
-                  "include": "#media-query-list"
-                }
-              ]
+              }
             },
             {
               "include": "#variable"
             }
-          ],
-          "name": "meta.at-rule.media.stylus"
+          ]
         }
       ]
     },
-    "pseudo-nth": {
-      "begin": "((:)(?:nth-child|nth-last-child|nth-of-type|nth-last-of-type|nth-match|nth-last-match|nth-column|nth-last-column))\\s*(\\()",
+    "media-query-list": {
+      "begin": "\\s*(and)?\\s*(\\()\\s*",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "#media-query-properties"
+        },
+        {
+          "include": "#numeric-values"
+        }
+      ],
       "beginCaptures": {
         "1": {
-          "name": "entity.other.attribute-name.pseudo-class.stylus"
+          "name": "keyword.operator.logic.media.stylus"
         },
         "2": {
-          "name": "puncutation.definition.entity.stylus"
-        },
-        "3": {
-          "name": "puncutation.definition.parameters.start.stylus"
+          "name": "punctuation.definition.parameters.start.stylus"
         }
       },
-      "end": "\\)",
       "endCaptures": {
         "0": {
-          "name": "puncutation.definition.parameters.end.stylus"
+          "name": "punctuation.definition.parameters.end.stylus"
         }
-      },
+      }
+    },
+    "media-query-properties": {
       "patterns": [
         {
-          "include": "#language-operators"
-        },
-        {
-          "include": "#interpolation"
+          "match": "\\s*:\\s*",
+          "captures": {
+            "0": {
+              "name": "punctuation.separator.key-value.stylus"
+            }
+          }
         },
         {
-          "match": "\\b(odd|even)\\b",
-          "name": "constant.language.stylus"
+          "match": "(?x)\n(\n    ((min|max)-)?\n    (\n        ((device-)?(height|width|aspect-ratio))|\n        (color(-index)?)|monochrome|resolution\n    )\n)|grid|scan|orientation\n",
+          "captures": {
+            "0": {
+              "name": "support.type.property-name.media.stylus"
+            }
+          }
         },
         {
-          "match": "\\b(\\d+)?n\\b",
+          "match": "\\b(portrait|landscape|progressive|interlace)\\b",
           "captures": {
             "1": {
-              "name": "constant.numeric.stylus"
+              "name": "support.constant.property-value.stylus"
             }
-          },
-          "name": "variable.language.stylus"
-        },
-        {
-          "match": "\\d+",
-          "name": "constant.numeric.stylus"
+          }
         }
       ]
     },
-    "pseudo-not": {
-      "begin": "((:)not)\\s*(\\()",
-      "beginCaptures": {
-        "1": {
-          "name": "entity.other.attribute-name.pseudo-element.stylus"
-        },
-        "2": {
-          "name": "puncutation.definition.entity.stylus"
-        },
-        "3": {
-          "name": "puncutation.definition.parameters.start.stylus"
-        }
-      },
-      "end": "\\)",
-      "endCaptures": {
-        "0": {
-          "name": "puncutation.definition.parameters.end.stylus"
-        }
-      },
+    "numeric-values": {
       "patterns": [
         {
-          "include": "#selector-components"
+          "name": "constant.other.color.rgb-value.stylus",
+          "match": "(?x) # multi-line regex definition mode\n(\\#)(?:\n        ([0-9a-fA-F])\n        ([0-9a-fA-F])\n        ([0-9a-fA-F])\n        ([0-9a-fA-F])?\n|       ([0-9a-fA-F]{2})\n        ([0-9a-fA-F]{2})\n        ([0-9a-fA-F]{2})\n        ([0-9a-fA-F]{2})?\n)\\b\n",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.constant.stylus"
+            },
+            "2": {
+              "name": "constant.other.color.rgb-value.red.stylus"
+            },
+            "3": {
+              "name": "constant.other.color.rgb-value.green.stylus"
+            },
+            "4": {
+              "name": "constant.other.color.rgb-value.blue.stylus"
+            },
+            "5": {
+              "name": "constant.other.color.rgb-value.alpha.stylus"
+            },
+            "6": {
+              "name": "constant.other.color.rgb-value.red.stylus"
+            },
+            "7": {
+              "name": "constant.other.color.rgb-value.green.stylus"
+            },
+            "8": {
+              "name": "constant.other.color.rgb-value.blue.stylus"
+            },
+            "9": {
+              "name": "constant.other.color.rgb-value.alpha.stylus"
+            }
+          }
+        },
+        {
+          "name": "constant.numeric.stylus",
+          "match": "(?x)                    # multi-line regex definition mode\n(?:-|\\+)?               # negative / positive\n(?:\n    (?:\n        [0-9]+          # integer part\n        (?:\\.[0-9]+)?   # fraction\n    ) |\n    (?:\\.[0-9]+)        # fraction without leading zero\n)\n((?:                    # units\n    px|pt|ch|cm|mm|in|\n    r?em|ex|pc|vw|vh|vmin|vmax|deg|\n    g?rad|turn|dpi|dpcm|dppx|m?s|k?Hz\n)\\b|%)?\n",
+          "captures": {
+            "1": {
+              "name": "keyword.other.unit.stylus"
+            }
+          }
         }
       ]
     },
+    "property-reference": {
+      "name": "variable.other.property.stylus",
+      "match": "@[a-z-]+"
+    },
     "pseudo": {
       "patterns": [
         {
+          "name": "entity.other.attribute-name.pseudo-class.stylus",
           "match": "(:)(active|checked|default|disabled|empty|enabled|first-child|first-of-type|first|fullscreen|focus|hover|indeterminate|in-range|invalid|last-child|last-of-type|left|link|only-child|only-of-type|optional|out-of-range|read-only|read-write|required|right|root|scope|target|valid|visited)\\b",
           "captures": {
             "1": {
               "name": "puncutation.definition.entity.stylus"
             }
-          },
-          "name": "entity.other.attribute-name.pseudo-class.stylus"
+          }
         },
         {
+          "name": "entity.other.attribute-name.pseudo-element.stylus",
           "match": "(:?:)(before|after)\\b",
           "captures": {
             "1": {
               "name": "puncutation.definition.entity.stylus"
             }
-          },
-          "name": "entity.other.attribute-name.pseudo-element.stylus"
+          }
         },
         {
+          "name": "entity.other.attribute-name.pseudo-element.stylus",
           "match": "(::)(first-letter|first-number|selection)\\b",
           "captures": {
             "1": {
               "name": "puncutation.definition.entity.stylus"
             }
-          },
-          "name": "entity.other.attribute-name.pseudo-element.stylus"
+          }
         },
         {
           "match": "((:)dir)\\s*(?:(\\()(ltr|rtl)?(\\)))?",
@@ -679,61 +811,94 @@
         }
       ]
     },
-    "attribute-selector": {
-      "begin": "\\[(?=[^\\]]*\\])",
+    "pseudo-not": {
+      "begin": "((:)not)\\s*(\\()",
+      "end": "\\)",
+      "patterns": [
+        {
+          "include": "#selector-components"
+        }
+      ],
       "beginCaptures": {
-        "0": {
-          "name": "punctuation.definition.entity.start.stylus"
+        "1": {
+          "name": "entity.other.attribute-name.pseudo-element.stylus"
+        },
+        "2": {
+          "name": "puncutation.definition.entity.stylus"
+        },
+        "3": {
+          "name": "puncutation.definition.parameters.start.stylus"
         }
       },
-      "end": "\\]",
       "endCaptures": {
         "0": {
-          "name": "punctuation.definition.entity.end.stylus"
+          "name": "puncutation.definition.parameters.end.stylus"
         }
-      },
+      }
+    },
+    "pseudo-nth": {
+      "begin": "((:)(?:nth-child|nth-last-child|nth-of-type|nth-last-of-type|nth-match|nth-last-match|nth-column|nth-last-column))\\s*(\\()",
+      "end": "\\)",
       "patterns": [
         {
-          "begin": "(?<=\\[)|(?<=\\{)",
-          "end": "(?=[|~=\\]\\s])",
-          "patterns": [
-            {
-              "include": "#interpolation"
-            },
-            {
-              "match": ".",
-              "captures": {
-                "0": {
-                  "name": "entity.other.attribute-name.stylus"
-                }
-              }
-            }
-          ]
+          "include": "#language-operators"
         },
         {
           "include": "#interpolation"
         },
         {
-          "match": "([|~]?=)",
+          "name": "constant.language.stylus",
+          "match": "\\b(odd|even)\\b"
+        },
+        {
+          "name": "variable.language.stylus",
+          "match": "\\b(\\d+)?n\\b",
           "captures": {
             "1": {
-              "name": "keyword.operator.stylus"
+              "name": "constant.numeric.stylus"
             }
           }
         },
         {
-          "include": "#string-quoted"
+          "name": "constant.numeric.stylus",
+          "match": "\\d+"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "entity.other.attribute-name.pseudo-class.stylus"
+        },
+        "2": {
+          "name": "puncutation.definition.entity.stylus"
         },
+        "3": {
+          "name": "puncutation.definition.parameters.start.stylus"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "puncutation.definition.parameters.end.stylus"
+        }
+      }
+    },
+    "return": {
+      "begin": "^\\s*(return)",
+      "end": "(;)|(?=$)",
+      "patterns": [
         {
-          "match": ".",
-          "captures": {
-            "0": {
-              "name": "string.unquoted.stylus"
-            }
-          }
+          "include": "#expression"
         }
       ],
-      "name": "meta.attribute-selector.stylus"
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.stylus"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.terminator.statement.stylus"
+        }
+      }
     },
     "selector-components": {
       "patterns": [
@@ -750,27 +915,27 @@
           "include": "#pseudo"
         },
         {
-          "match": "\\$[\\w$-]+\\b",
-          "name": "entity.other.placeholder.stylus"
+          "name": "entity.other.placeholder.stylus",
+          "match": "\\$[\\w$-]+\\b"
         },
         {
-          "match": "[:~>]",
-          "name": "keyword.operator.selector.stylus"
+          "name": "keyword.operator.selector.stylus",
+          "match": "[:~\u003e]"
         },
         {
-          "match": "(?x) # multi-line regex definition mode\n\\b(\n    altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|\n    animateMotion|animateTransform|circle|clipPath|color-profile|\n    defs|desc|ellipse|feBlend|feColorMatrix|\n    feComponentTransfer|feComposite|feConvolveMatrix|\n    feDiffuseLighting|feDisplacementMap|feDistantLight|feFlood|\n    feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feImage|feMerge|\n    feMergeNode|feMorphology|feOffset|fePointLight|\n    feSpecularLighting|feSpotLight|feTile|feTurbulence|filter|\n    font-face|font-face-format|font-face-name|font-face-src|\n    font-face-uri|foreignObject|g|glyph|glyphRef|hkern|image|line|\n    linearGradient|marker|mask|metadata|missing-glyph|mpath|path|\n    pattern|polygon|polyline|radialGradient|rect|set|stop|svg|\n    switch|symbol|text|textPath|tref|tspan|use|view|vkern|\n    a|abbr|acronym|address|applet|area|article|aside|audio|b|base|\n    basefont|bdi|bdo|bgsound|big|blink|blockquote|body|br|button|\n    canvas|caption|center|cite|code|col|colgroup|content|data|\n    datalist|dd|decorator|del|details|dfn|dir|div|dl|dt|element|\n    em|embed|fieldset|figcaption|figure|font|footer|form|frame|\n    frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|\n    img|input|ins|isindex|kbd|keygen|label|legend|li|link|listing|\n    main|map|mark|marquee|menu|menuitem|meta|meter|nav|nobr|\n    noframes|noscript|object|ol|optgroup|option|output|p|param|\n    plaintext|pre|progress|q|rp|rt|ruby|s|samp|script|section|\n    select|shadow|small|source|spacer|span|strike|strong|style|\n    sub|summary|sup|table|tbody|td|template|textarea|tfoot|th|\n    thead|time|title|tr|track|tt|u|ul|var|video|wbr|xmp\n)\\b\n",
-          "name": "entity.name.tag.stylus"
+          "name": "entity.name.tag.stylus",
+          "match": "(?x) # multi-line regex definition mode\n\\b(\n    altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|\n    animateMotion|animateTransform|circle|clipPath|color-profile|\n    defs|desc|ellipse|feBlend|feColorMatrix|\n    feComponentTransfer|feComposite|feConvolveMatrix|\n    feDiffuseLighting|feDisplacementMap|feDistantLight|feFlood|\n    feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feImage|feMerge|\n    feMergeNode|feMorphology|feOffset|fePointLight|\n    feSpecularLighting|feSpotLight|feTile|feTurbulence|filter|\n    font-face|font-face-format|font-face-name|font-face-src|\n    font-face-uri|foreignObject|g|glyph|glyphRef|hkern|image|line|\n    linearGradient|marker|mask|metadata|missing-glyph|mpath|path|\n    pattern|polygon|polyline|radialGradient|rect|set|stop|svg|\n    switch|symbol|text|textPath|tref|tspan|use|view|vkern|\n    a|abbr|acronym|address|applet|area|article|aside|audio|b|base|\n    basefont|bdi|bdo|bgsound|big|blink|blockquote|body|br|button|\n    canvas|caption|center|cite|code|col|colgroup|content|data|\n    datalist|dd|decorator|del|details|dfn|dir|div|dl|dt|element|\n    em|embed|fieldset|figcaption|figure|font|footer|form|frame|\n    frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|\n    img|input|ins|isindex|kbd|keygen|label|legend|li|link|listing|\n    main|map|mark|marquee|menu|menuitem|meta|meter|nav|nobr|\n    noframes|noscript|object|ol|optgroup|option|output|p|param|\n    plaintext|pre|progress|q|rp|rt|ruby|s|samp|script|section|\n    select|shadow|small|source|spacer|span|strike|strong|style|\n    sub|summary|sup|table|tbody|td|template|textarea|tfoot|th|\n    thead|time|title|tr|track|tt|u|ul|var|video|wbr|xmp\n)\\b\n"
         },
         {
-          "match": "\\.[a-zA-Z0-9_-]+",
-          "name": "entity.other.attribute-name.class.stylus"
+          "name": "entity.other.attribute-name.class.stylus",
+          "match": "\\.[a-zA-Z0-9_-]+"
         },
         {
-          "match": "#[a-zA-Z0-9_-]+",
-          "name": "entity.other.attribute-name.id.stylus"
+          "name": "entity.other.attribute-name.id.stylus",
+          "match": "#[a-zA-Z0-9_-]+"
         },
         {
-          "match": "(?x)            # multi-line regex definition mode\n([\\w\\d_-]+)?    # matching any word right before &\n(&)         # & itself, escaped because of plist\n([\\w\\d_-]+)?    # matching any word right after &\n",
+          "match": "(?x)            # multi-line regex definition mode\n([\\w\\d_-]+)?    # matching any word right before \u0026\n(\u0026)         # \u0026 itself, escaped because of plist\n([\\w\\d_-]+)?    # matching any word right after \u0026\n",
           "captures": {
             "1": {
               "name": "entity.other.attribute-name.stylus"
@@ -788,238 +953,66 @@
     "single-line-comment": {
       "patterns": [
         {
+          "name": "comment.line.stylus",
+          "match": "(\\/\\/).*$",
           "captures": {
             "1": {
               "name": "punctuation.definition.comment.stylus"
             }
-          },
-          "match": "(\\/\\/).*$",
-          "name": "comment.line.stylus"
+          }
         }
       ]
     },
-    "comments": {
+    "string-quoted": {
       "patterns": [
         {
-          "include": "#single-line-comment"
+          "name": "string.quoted.single.stylus",
+          "match": "'[^']*'"
         },
         {
-          "begin": "\\/\\*",
-          "captures": {
-            "0": {
-              "name": "punctuation.definition.comment.stylus"
-            }
-          },
-          "end": "\\*\\/",
-          "name": "comment.block.stylus"
+          "name": "string.quoted.double.stylus",
+          "match": "\"[^\"]*\""
         }
       ]
-    }
-  },
-  "patterns": [
-    {
-      "include": "#comments"
     },
-    {
-      "begin": "^\\s*(@(?:import|charset|css|font-face|(?:-webkit-)?keyframes)(?:\\s+([\\w-]+))?)\\b",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.at-rule.other.stylus"
-        },
-        "2": {
-          "name": "variable.other.animation-name.stylus"
-        }
-      },
+    "url": {
+      "name": "meta.function-call.stylus",
+      "begin": "(url)\\s*(\\()",
+      "end": "(\\))",
       "patterns": [
         {
           "include": "#string-quoted"
-        }
-      ],
-      "end": "$|;|(?=\\{)"
-    },
-    {
-      "begin": "^\\s*(@media)\\s*",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.at-rule.media.stylus"
-        }
-      },
-      "patterns": [
+        },
         {
-          "include": "#media-query"
-        }
-      ],
-      "end": "$|(?=\\{)"
-    },
-    {
-      "begin": "(?x)\n(?<=^|;|})\n\\s*\n(?=\n    [\\[\\]'\".\\w$-]+\n    \\s*\n    ([?:]?=)\n    (?![^\\[]*\\])\n)\n",
-      "patterns": [
+          "include": "#language-constants"
+        },
         {
-          "include": "#expression"
-        }
-      ],
-      "end": "$|;"
-    },
-    {
-      "include": "#iteration"
-    },
-    {
-      "include": "#conditionals"
-    },
-    {
-      "include": "#return"
-    },
-    {
-      "begin": "(?x)            # multi-line regex definition mode\n\n^(\\s*)          # starts at the beginning of line\n([\\w$-]+)       # identifier (name)\n(\\()            # start of argument list\n(?=\n    .*?\n    \\)\\s*\\{     # we see a curly brace afterwards\n)               # which means this is a function definition\n",
-      "beginCaptures": {
-        "2": {
-          "name": "entity.name.function.stylus"
+          "include": "#language-property-value-constants"
         },
-        "3": {
-          "name": "punctuation.definition.parameters.start.stylus"
-        }
-      },
-      "end": "(\\))",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.parameters.end.stylus"
-        }
-      },
-      "patterns": [
         {
-          "include": "#expression"
+          "include": "#property-reference"
+        },
+        {
+          "include": "#variable"
         }
       ],
-      "name": "meta.function-call.stylus"
-    },
-    {
-      "begin": "(?x)                # multi-line regex definition mode\n(\n\n    (^|;)           # starts at the beginning of line or at a ;\n    \\s*\n    (\\+?\\s*         # for block mixins\n     [\\w$-]+)       # identifier (name)\n    (\\()            # start of argument list\n    (?=\n        .*?\n        \\)\\s*;?\\s*  # if there are only spaces and semicolons\n        $|;         # then this a\n    )\n)\n",
       "beginCaptures": {
-        "3": {
-          "name": "entity.other.attribute-name.mixin.stylus"
+        "1": {
+          "name": "entity.function-name.stylus"
         },
-        "4": {
+        "2": {
           "name": "punctuation.definition.parameters.start.stylus"
         }
       },
-      "end": "(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.parameters.end.stylus"
         }
-      },
-      "patterns": [
-        {
-          "include": "#expression"
-        }
-      ],
-      "name": "meta.function-call.stylus"
-    },
-    {
-      "begin": "(?x) # multi-line regex definition mode\n(^|(?<=\\*/|\\}))\\s*\n(?=\n    font(?!\n        \\s*:\\s\n        |\n        -\n        |\n        .*?\n        (?:\n            \\/|normal|bold|light(er?)|serif|sans|monospace|\n            \\b\\d+(?:\\b|px|r?em|%)|\n            ['\"][^\\]]*$\n        )\n    ) | # we need to distinguish between tag and property `cursor`\n    cursor(?!\n        \\s*[:;]\\s\n        |\n        -\n        |\n        .*?\n        (?:\n            (?:url\\s*\\()|\n            (?:-moz-|-webkit-|-ms-)?\n            (?:auto|default|none|context-menu|help|pointer|progress|\n            wait|cell|crosshair|text|vertical-text|alias|copy|\n            move|no-drop|not-allowed|e-resize|n-resize|ne-resize|\n            nw-resize|s-resize|se-resize|sw-resize|w-resize|\n            ew-resize|ns-resize|nesw-resize|nwse-resize|col-resize|\n            row-resize|all-scroll|zoom-in|zoom-out|grab|grabbing\n            normal|bold|light(er?)|serif|sans|monospace)\n        )\n    ) | (\n        (\n        altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|\n        animateMotion|animateTransform|circle|clipPath|color-profile|\n        defs|desc|ellipse|feBlend|feColorMatrix|\n        feComponentTransfer|feComposite|feConvolveMatrix|\n        feDiffuseLighting|feDisplacementMap|feDistantLight|feFlood|\n        feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feImage|feMerge|\n        feMergeNode|feMorphology|feOffset|fePointLight|\n        feSpecularLighting|feSpotLight|feTile|feTurbulence|filter|\n        font-face|font-face-format|font-face-name|font-face-src|\n        font-face-uri|foreignObject|g|glyph|glyphRef|hkern|image|line|\n        linearGradient|marker|mask|metadata|missing-glyph|mpath|path|\n        pattern|polygon|polyline|radialGradient|rect|set|stop|svg|\n        switch|symbol|text|textPath|tref|tspan|use|view|vkern|\n        a|abbr|acronym|address|applet|area|article|aside|audio|b|base|\n        basefont|bdi|bdo|bgsound|big|blink|blockquote|body|br|button|\n        canvas|caption|center|cite|code|col|colgroup|data|\n        datalist|dd|decorator|del|details|dfn|dir|div|dl|dt|element|\n        em|embed|fieldset|figcaption|figure|footer|form|frame|\n        frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|\n        img|input|ins|isindex|kbd|keygen|label|legend|li|link|listing|\n        main|map|mark|marquee|menu|menuitem|meta|meter|nav|nobr|\n        noframes|noscript|object|ol|optgroup|option|output|p|param|\n        plaintext|pre|progress|q|rp|rt|ruby|s|samp|script|section|\n        select|shadow|small|source|spacer|span|strike|strong|style|\n        sub|summary|sup|table|tbody|td|template|textarea|tfoot|th|\n        thead|time|title|tr|track|tt|u|ul|var|video|wbr|xmp)\n\n        \\s*([\\s,.#\\[]|:[^\\s]|(?=\\{|$))\n\n    ) | (\n        [:~>\\[*\\/]       # symbols but they are valid for selector\n\n    ) | (\n\n        \\+\\s*[\\w$-]+\\b\\s*      # are an identifier starting with $\n        (?!\\()              # and they can't have anything besides\n\n    ) | (                    # for animtions\n\n        \\d+(\\.\\d+)?%|(from|to)\\b\n\n    ) | (                   # Placeholder selectors\n\n        \\$[\\w$-]+\\b\\s*      # are an identifier starting with $\n        (?=$|\\{)            # and they can't have anything besides\n\n    ) | (                   # CSS class\n\n        \\.[a-zA-Z0-9_-]+\n\n    ) | (                   # CSS id\n\n        \\#[a-zA-Z0-9_-]+\n\n    ) | (                   # Reference to parent\n\n        ([\\w\\d_-]+)?        # matching any word right before &\n        (&)             # & itself, escaped because of plist\n        ([\\w\\d_-]+)?        # matching any word right after &\n    )\n)\n",
-      "patterns": [
-        {
-          "include": "#comma"
-        },
-        {
-          "match": "\\d+(\\.\\d+)?%|from|to",
-          "name": "entity.other.animation-keyframe.stylus"
-        },
-        {
-          "include": "#selector-components"
-        },
-        {
-          "match": ".",
-          "name": "entity.other.attribute-name.stylus"
-        }
-      ],
-      "end": "\n|$|(?=\\{\\s*\\}.*$)|(?=\\{.*?[:;])|(?=\\{)(?!.+\\}.*$)",
-      "name": "meta.selector.stylus"
-    },
-    {
-      "begin": "(?x)                # multi-line regex definition mode\n(?<=^|;|{)\\s*    # starts after begining of line, '{' or ';''\n(?=                 # lookahead for\n    (\n     [a-zA-Z0-9_-]  # then a letter\n     |              # or\n     (\\{(.*?)\\})    # interpolation\n     |              # or\n     (/\\*.*?\\*/)    # comment\n    )+\n\n    \\s*[:\\s]\\s*     # value is separted by colon or space\n\n    (?!(\\s*\\{))     # if there are only spaces afterwards\n\n    (?!\n        [^}]*?      # checking for an unclosed curly braces on this\n        \\{          # line because if one exists it means that\n        [^}]*       # this is a selector and not a property\n        ($|\\})\n    )\n)\n",
-      "end": "(?=\\}|;)|(?<!,)\\s*\\n",
-      "patterns": [
-        {
-          "include": "#comments"
-        },
-        {
-          "include": "#interpolation"
-        },
-        {
-          "begin": "(?<!^|;|{)\\s*(?:(:)|\\s)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.separator.key-value.stylus"
-            }
-          },
-          "end": "(;)|(?=\\})|(?=(?<!\\,)\\s*\\n)",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.terminator.rule.stylus"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#comments"
-            },
-            {
-              "include": "#expression"
-            }
-          ]
-        },
-        {
-          "match": "-(moz|o|ms|webkit|khtml)-",
-          "name": "support.type.vendor-prefix.stylus"
-        },
-        {
-          "match": ".",
-          "name": "meta.property-name.stylus support.type.property-name.stylus"
-        }
-      ]
-    },
-    {
-      "begin": "@extends?\\s",
-      "beginCaptures": {
-        "0": {
-          "name": "keyword.language.stylus"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#selector-components"
-        }
-      ],
-      "end": "(?=$|;)"
-    },
-    {
-      "include": "#string-quoted"
-    },
-    {
-      "include": "#escape"
-    },
-    {
-      "include": "#language-constants"
+      }
     },
-    {
-      "include": "#language-operators"
-    },
-    {
-      "include": "#language-keywords"
-    },
-    {
-      "include": "#property-reference"
-    },
-    {
-      "include": "#function-call"
-    },
-    {
-      "match": "\\{",
-      "name": "punctuation.section.start.stylus"
-    },
-    {
-      "match": "\\}",
-      "name": "punctuation.section.end.stylus"
+    "variable": {
+      "name": "variable.other.stylus",
+      "match": "([\\w$-]+\\b)"
     }
-  ]
-}
+  }
+}