github-linguist 7.4.0 → 7.5.0

data/grammars/source.objectscript_csp.json

@@ -0,0 +1,19 @@
+{
+  "name": "ObjectScript CSP",
+  "scopeName": "source.objectscript_csp",
+  "patterns": [
+    {
+      "include": "#inline-html"
+    }
+  ],
+  "repository": {
+    "inline-html": {
+      "name": "meta.embedded.inline.html",
+      "patterns": [
+        {
+          "include": "text.html.basic"
+        }
+      ]
+    }
+  }
+}

data/grammars/source.objectscript_macros.json

@@ -0,0 +1,226 @@
+{
+  "name": "ObjectScript Macros",
+  "scopeName": "source.objectscript_macros",
+  "patterns": [
+    {
+      "include": "#include"
+    },
+    {
+      "include": "#dim"
+    },
+    {
+      "include": "#define"
+    },
+    {
+      "include": "#def1arg"
+    },
+    {
+      "include": "#ifdef"
+    },
+    {
+      "include": "#comment-line"
+    }
+  ],
+  "repository": {
+    "comment-line": {
+      "patterns": [
+        {
+          "name": "comment.line.objectscript",
+          "match": "^///.*$"
+        },
+        {
+          "name": "comment.line.objectscript",
+          "match": "\\s+//.*$"
+        },
+        {
+          "name": "comment.line.objectscript",
+          "match": "\\s+;.*$"
+        },
+        {
+          "name": "comment.line.objectscript",
+          "match": "^\\s*#;.*$"
+        },
+        {
+          "name": "comment.block.objectscript",
+          "begin": "/\\*",
+          "end": "\\*/",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.objectscript"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.objectscript"
+            }
+          }
+        }
+      ]
+    },
+    "continue": {
+      "patterns": [
+        {
+          "name": "keyword.control.objectscript",
+          "match": "(\\s+\\#\\#(?i)(continue)\\s*)"
+        }
+      ]
+    },
+    "def1arg": {
+      "patterns": [
+        {
+          "name": "meta.preprocessor.objectscript",
+          "begin": "^\\s*(\\#\\s*(?:(?i)def1arg))\\s+((?\u003cid\u003e[a-zA-Z%][a-zA-Z0-9]*))(?:(\\()(\\s*\\g\u003cid\u003e\\s*)(\\)))",
+          "end": "(?\u003c!\\#\\#continue)\\n",
+          "patterns": [
+            {
+              "include": "#comment-line"
+            },
+            {
+              "include": "#continue"
+            },
+            {
+              "include": "#digits"
+            },
+            {
+              "include": "#macros"
+            },
+            {
+              "include": "source.objectscript"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.objectscript"
+            },
+            "2": {
+              "name": "entity.name.objectscript"
+            },
+            "4": {
+              "name": "punctuation.definition.objectscript"
+            },
+            "5": {
+              "name": "variable.parameter.objectscript"
+            },
+            "6": {
+              "name": "punctuation.definition.objectscript"
+            }
+          }
+        }
+      ]
+    },
+    "define": {
+      "patterns": [
+        {
+          "name": "meta.preprocessor.objectscript",
+          "begin": "^\\s*(\\#\\s*(?:(?i)define))\\s+((?\u003cid\u003e[a-zA-Z%][a-zA-Z0-9]*))(?:(\\()(\\s*\\g\u003cid\u003e\\s*((,)\\s*\\g\u003cid\u003e\\s*)*)(\\)))?",
+          "end": "(?\u003c!\\#\\#continue)\\n",
+          "patterns": [
+            {
+              "include": "#comment-line"
+            },
+            {
+              "include": "#continue"
+            },
+            {
+              "include": "#macros"
+            },
+            {
+              "include": "source.objectscript"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.objectscript"
+            },
+            "2": {
+              "name": "entity.name.objectscript"
+            },
+            "4": {
+              "name": "punctuation.definition.objectscript"
+            },
+            "5": {
+              "name": "variable.parameter.objectscript"
+            },
+            "7": {
+              "name": "punctuation.definition.objectscript"
+            }
+          }
+        }
+      ]
+    },
+    "dim": {
+      "patterns": [
+        {
+          "name": "meta.preprocessor.objectscript",
+          "match": "^\\s*(\\#\\s*(?:(?i)dim))\\s+((?\u003cid\u003e[a-zA-Z%][a-zA-Z0-9]*))(?:\\s*(,)\\s*((\\g\u003cid\u003e)*))*(?:\\s+((?i)As)(?:\\s(\\g\u003cid\u003e(?:\\.\\g\u003cid\u003e)*)))?",
+          "captures": {
+            "1": {
+              "name": "keyword.control.objectscript"
+            },
+            "2": {
+              "name": "variable.name"
+            },
+            "4": {
+              "name": "punctuation.definition.objectscript"
+            },
+            "5": {
+              "name": "variable.name"
+            },
+            "7": {
+              "name": "keyword.control.objectscript"
+            },
+            "8": {
+              "name": "entity.name.class.objectscript"
+            }
+          }
+        }
+      ]
+    },
+    "ifdef": {
+      "patterns": [
+        {
+          "contentName": "meta.preprocessor.objectscript",
+          "begin": "^\\s*(#\\s*(?i)(?:if|ifdef|ifndef|elif|else|undef|endif))\\b",
+          "end": "(?=(?:;|//|/\\*))|$",
+          "patterns": [
+            {
+              "include": "#digits"
+            },
+            {
+              "include": "#comment-line"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.objectscript"
+            }
+          }
+        }
+      ]
+    },
+    "include": {
+      "patterns": [
+        {
+          "begin": "^\\s*(\\#\\s*(?:(?i)include))\\s+([a-zA-Z%][a-zA-Z0-9]*)",
+          "end": "(?=$)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.objectscript"
+            },
+            "2": {
+              "name": "entity.name.objectscript"
+            }
+          }
+        }
+      ]
+    },
+    "macros": {
+      "patterns": [
+        {
+          "name": "support.constant",
+          "match": "\\$\\$\\$[a-zA-Z]([a-zA-Z0-9])*"
+        }
+      ]
+    }
+  }
+}

data/grammars/source.powershell.json

@@ -282,40 +282,13 @@
     },
     "attribute": {
       "name": "meta.attribute.powershell",
-      "begin": "(\\[)\\s*\\b(?i)(cmdletbinding|alias|outputtype|parameter|validatenotnull|validatenotnullorempty|validatecount|validateset|allownull|allowemptycollection|allowemptystring|validatescript|validaterange|validatepattern|validatelength)\\b",
+      "begin": "(\\[)\\s*\\b(?i)(cmdletbinding|alias|outputtype|parameter|validatenotnull|validatenotnullorempty|validatecount|validateset|allownull|allowemptycollection|allowemptystring|validatescript|validaterange|validatepattern|validatelength|supportswildcards)\\b",
       "end": "(\\])",
       "patterns": [
         {
           "begin": "\\(",
           "end": "\\)",
           "patterns": [
-            {
-              "include": "#variable"
-            },
-            {
-              "include": "#variableNoProperty"
-            },
-            {
-              "include": "#hashtable"
-            },
-            {
-              "include": "#scriptblock"
-            },
-            {
-              "include": "#doubleQuotedStringEscapes"
-            },
-            {
-              "include": "#doubleQuotedString"
-            },
-            {
-              "include": "#type"
-            },
-            {
-              "include": "#numericConstant"
-            },
-            {
-              "include": "#doubleQuotedString"
-            },
             {
               "include": "$self"
             },
@@ -329,27 +302,6 @@
                   "name": "keyword.operator.assignment.powershell"
                 }
               }
-            },
-            {
-              "name": "string.quoted.single.powershell",
-              "begin": "(?\u003c!')'",
-              "end": "'(?!')",
-              "patterns": [
-                {
-                  "name": "constant.character.escape.powershell",
-                  "match": "''"
-                }
-              ],
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.begin.powershell"
-                }
-              },
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.string.end.powershell"
-                }
-              }
             }
           ],
           "beginCaptures": {
@@ -462,9 +414,6 @@
         {
           "include": "#variableNoProperty"
         },
-        {
-          "include": "#variable"
-        },
         {
           "include": "#doubleQuotedStringEscapes"
         },
@@ -491,7 +440,10 @@
       "patterns": [
         {
           "name": "constant.character.escape.powershell",
-          "match": "`[0abnfrvt\"'$`]"
+          "match": "`[`0abefnrtv\"'$]"
+        },
+        {
+          "include": "#unicodeEscape"
         },
         {
           "name": "constant.character.escape.powershell",
@@ -745,6 +697,18 @@
         }
       }
     },
+    "unicodeEscape": {
+      "patterns": [
+        {
+          "name": "constant.character.escape.powershell",
+          "match": "`u\\{(?:(?:10)?([0-9a-fA-F]){1,4}|0?\\g\u003c1\u003e{1,5})}"
+        },
+        {
+          "name": "invalid.character.escape.powershell",
+          "match": "`u(?:\\{[0-9a-fA-F]{,6}.)?"
+        }
+      ]
+    },
     "variable": {
       "patterns": [
         {
@@ -773,10 +737,10 @@
           }
         },
         {
-          "match": "(\\$)(?i:(\\$|\\^|\\?|_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This))((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?\\b",
+          "match": "(\\$)((?:[$^?])|(?i:_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This)\\b)((?:\\.(?:\\p{L}|\\d|_)+)*\\b)?",
           "captures": {
             "0": {
-              "name": "support.constant.automatic.powershell"
+              "name": "support.variable.automatic.powershell"
             },
             "1": {
               "name": "punctuation.definition.variable.powershell"
@@ -910,7 +874,7 @@
           }
         },
         {
-          "match": "(\\$)(?i:(\\$|\\^|\\?|_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This))\\b",
+          "match": "(\\$)((?:[$^?])|(?i:_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This)\\b)",
           "captures": {
             "0": {
               "name": "support.variable.automatic.powershell"
@@ -938,7 +902,7 @@
           }
         },
         {
-          "match": "(?i:(\\$|@)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))",
+          "match": "(?i:(\\$)(global|local|private|script|using|workflow):((?:\\p{L}|\\d|_)+))",
           "captures": {
             "0": {
               "name": "variable.other.readwrite.powershell"

data/grammars/source.rust.json

@@ -141,7 +141,7 @@
     },
     {
       "name": "keyword.control.rust",
-      "match": "\\b(break|continue|else|if|in|for|loop|match|return|while)\\b"
+      "match": "\\b(async|await|break|continue|else|if|in|for|loop|match|return|try|while)\\b"
     },
     {
       "name": "keyword.other.rust",

data/grammars/source.sass.json

@@ -3,238 +3,932 @@
   "scopeName": "source.sass",
   "patterns": [
     {
-      "name": "meta.attribute-selector.scss",
-      "match": "(?i)(\\[)\\s*(-?[_a-z\\\\[[:^ascii:]]][_a-z0-9\\-\\\\[[:^ascii:]]]*)(?:\\s*([~|^$*]?=)\\s*(?:(-?[_a-z\\\\[[:^ascii:]]][_a-z0-9\\-\\\\[[:^ascii:]]]*)|((?\u003e(['\"])(?:[^\\\\]|\\\\.)*?(\\6)))))?\\s*(\\])",
-      "captures": {
+      "name": "meta.variable-declaration.sass",
+      "begin": "(?:(!)|(\\$))([a-zA-Z0-9_-]+)\\s*(?=(\\|\\|)?=|:\\s+)",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "name": "meta.property-value.sass",
+          "begin": "(?:(:)\\s+)|((\\|\\|)?=)",
+          "end": "(?=;?$)",
+          "patterns": [
+            {
+              "include": "#property-value"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.separator.key-value.css"
+            },
+            "2": {
+              "name": "invalid.illegal.deprecated.sass"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
         "1": {
-          "name": "punctuation.definition.entity.scss"
+          "name": "invalid.illegal.deprecated.sass"
         },
         "2": {
-          "name": "entity.other.attribute-name.attribute.scss"
+          "name": "punctuation.definition.entity.sass"
         },
         "3": {
-          "name": "punctuation.separator.operator.scss"
-        },
-        "4": {
-          "name": "string.unquoted.attribute-value.scss"
-        },
-        "5": {
-          "name": "string.quoted.double.attribute-value.scss"
-        },
-        "6": {
-          "name": "punctuation.definition.string.begin.scss"
-        },
-        "7": {
-          "name": "punctuation.definition.string.end.scss"
+          "name": "variable.other.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
         }
       }
     },
     {
-      "name": "support.function.name.sass",
-      "match": "(?\u003c=@include|@mixin)\\s[a-zA-Z0-9_-]+"
-    },
-    {
-      "name": "keyword.control.at-rule.css.sass",
-      "match": "(@media\\s(all|aural|braille|embossed|handheld|print|projection|screen|tty|tv)*)|(@else\\s(if)*)|@[a-zA-Z-]+"
-    },
-    {
-      "include": "#variable"
-    },
-    {
-      "include": "#placeholder-selector"
-    },
-    {
-      "name": "support.type.property-name.css.sass",
-      "match": "[a-z-]+(?=:)|\\b(from|through|to|in)\\b"
-    },
-    {
-      "name": "keyword.control.at-rule.sass",
-      "match": "@(import|for|else|each|mixin|include|charset|import|media|page|namespace|extend)\\s[\\%\\/\\.\\w-]*\\b"
+      "name": "meta.at-rule.if.sass",
+      "begin": "\\s*((@)if\\b)\\s+",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#property-value"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.if.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "keyword.other.important.css.sass",
-      "match": "!(important|default|optional)"
+      "name": "meta.at-rule.else.sass",
+      "begin": "\\s*((@)(?:(?:else(?=\\s*$))|(?:else\\s+if\\s+(?=\\S+))))",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#property-value"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.else.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "entity.name.tag.wildcard.scss",
-      "match": "\\*"
+      "name": "meta.at-rule.while.sass",
+      "begin": "\\s*((@)while\\b)\\s+",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#property-value"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.while.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "keyword.other.unit.scss",
-      "match": "(?\u003c=[\\d])(ch|cm|deg|dpi|dpcm|dppx|em|ex|grad|in|mm|ms|pc|pt|px|rad|rem|turn|s|vh|vmin|vw)\\b|%"
+      "name": "meta.at-rule.for.sass",
+      "begin": "\\s*((@)for\\b)\\s+",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#property-value"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.for.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "keyword.control.untitled",
-      "match": "\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b"
+      "name": "meta.at-rule.each.sass",
+      "begin": "\\s*((@)each\\b)\\s+",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#property-value"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.each.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "keyword.control.mixin-shorthand.sass",
-      "match": "(?\u003c![!\u003c\u003e=a-zA-Z0-9_-]|[\u003c\u003e=a-zA-Z0-9_-] )[=+][a-zA-Z0-9_-]+"
+      "name": "meta.at-rule.function.sass",
+      "begin": "^((@)function\\b)\\s*([a-zA-Z0-9_-]+)",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#property-value"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.at-rule.function.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        },
+        "3": {
+          "name": "support.function.misc.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "string.quoted.single.sass",
-      "begin": "'",
-      "end": "'",
+      "name": "meta.at-rule.return.sass",
+      "begin": "\\s*((@)return\\b)\\s+",
+      "end": "(;)?$",
       "patterns": [
         {
-          "name": "constant.character.escaped.sass",
-          "match": "\\\\."
+          "include": "#property-value"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.return.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "string.quoted.double.sass",
-      "begin": "\"",
-      "end": "\"",
+      "name": "meta.variable-declaration.sass.mixin",
+      "begin": "^(=\\s*|(?:(@)mixin))\\s+([a-zA-Z0-9_-]+)",
+      "end": "(;)?$",
       "patterns": [
         {
-          "name": "constant.character.escaped.sass",
-          "match": "\\\\."
+          "include": "#property-value"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.at-rule.mixin.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        },
+        "3": {
+          "name": "variable.other.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "entity.other.attribute-name.class.sass",
-      "match": "[\\.%][a-zA-Z0-9_-]+"
+      "name": "meta.at-rule.content.sass",
+      "begin": "\\s*((@)content)\\s*$",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#property-value"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.content.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "constant.other.rgb-value.sass",
-      "match": "(#)([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\\b"
+      "name": "meta.function.include.sass",
+      "begin": "^\\s*(\\+(?!\\s+)|(?:(@)include(?=\\s+)))\\s*([a-zA-Z0-9_-]+)",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#property-value"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.at-rule.include.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        },
+        "3": {
+          "name": "variable.other.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "keyword.other.important.css.sass",
-      "match": "!(important|default|optional)"
+      "name": "meta.function.extend.sass",
+      "match": "^\\s*(@extend)\\s+([.*\u0026#%a-zA-Z][-_:.*\u0026#a-zA-Z]*)\\s*(;)?\\s*$",
+      "captures": {
+        "1": {
+          "name": "keyword.control.at-rule.extend.sass"
+        },
+        "2": {
+          "name": "variable.other.sass"
+        },
+        "3": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "entity.other.attribute-name.id.sass",
-      "match": "#[a-zA-Z0-9_-]+"
+      "name": "meta.at-rule.warn.sass",
+      "begin": "\\s*((@)(warn|debug|error)\\b)\\s*",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#string-single"
+        },
+        {
+          "include": "#string-double"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.warn.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "variable.parameter.sass",
-      "match": "[!\\$][a-zA-Z0-9_-]+"
+      "name": "meta.at-rule.at-root.sass",
+      "begin": "^\\s*((@)at-root)(?!(?:\\s+[^.\\(])|(?:\\s+\\((?!with)))",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "match": "(?:(\\((?:with(?:out)?)\\s*:\\s*[a-zA-Z ]+\\))|((?:[.*\u0026#a][:*\u0026#a-zA-Z]+)+))",
+          "captures": {
+            "1": {
+              "name": "support.function.misc.sass"
+            },
+            "2": {
+              "name": ".entity.other.attribute-name"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.at-root.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.entity.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "comment.block.sass",
-      "begin": "/\\*",
-      "end": "\\*/"
+      "name": "meta.variable-usage.sass",
+      "begin": "^\\s*(\\+)([a-zA-Z0-9_-]+)",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "name": "meta.variable-usage.sass",
+          "match": "(!|\\$)([a-zA-Z0-9_-]+)",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.entity.css"
+            },
+            "2": {
+              "name": "variable.other.sass"
+            }
+          }
+        },
+        {
+          "include": "#string-single"
+        },
+        {
+          "include": "#string-double"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.entity.sass"
+        },
+        "2": {
+          "name": "variable.other.sass"
+        },
+        "3": {
+          "name": "punctuation.definition.entity.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "comment.line.double-slash.sass",
-      "begin": "//",
-      "end": "$\\n?"
+      "name": "meta.selector.css",
+      "begin": "(?=[.*\u0026#\\[a-zA-Z][:.*\u0026#a-zA-Z]*)",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "match": "(\u0026)([a-zA-Z0-9_-]*)",
+          "captures": {
+            "1": {
+              "name": "keyword.other.parent-reference.sass"
+            },
+            "2": {
+              "name": "entity.other.attribute-name.parent-selector-suffix.sass"
+            }
+          }
+        },
+        {
+          "name": "entity.other.attribute-name.class.sass",
+          "match": "(\\.)[a-zA-Z0-9_-]+",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.entity.css"
+            }
+          }
+        },
+        {
+          "include": "source.css#tag-names"
+        },
+        {
+          "name": "entity.other.attribute-name.id.css.sass",
+          "match": "(#)[a-zA-Z][a-zA-Z0-9_-]*",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.entity.sass"
+            }
+          }
+        },
+        {
+          "name": "entity.name.tag.wildcard.sass",
+          "match": "\\*"
+        },
+        {
+          "include": "source.css#pseudo-classes"
+        },
+        {
+          "include": "source.css#pseudo-elements"
+        },
+        {
+          "include": "source.css#functional-pseudo-classes"
+        },
+        {
+          "name": "meta.attribute-selector.css.sass",
+          "match": "(?i)(\\[)\\s*(-?[_a-z\\\\[[:^ascii:]]][-_a-z0-9\\\\[[:^ascii:]]]*)(?:\\s*([~|^$*]?=)\\s*(?:(-?[_a-z\\\\[[:^ascii:]]][-_a-z0-9\\\\[[:^ascii:]]]*)|((?\u003e(['\"])(?:[^\\\\]|\\\\.)*?(\\6)))))?\\s*(])",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.attribute-selector.begin.bracket.square.sass"
+            },
+            "2": {
+              "name": "entity.other.attribute-name.attribute.sass"
+            },
+            "3": {
+              "name": "keyword.operator.sass"
+            },
+            "4": {
+              "name": "string.unquoted.attribute-value.sass"
+            },
+            "5": {
+              "name": "string.quoted.double.attribute-value.sass"
+            },
+            "6": {
+              "name": "punctuation.definition.string.begin.sass"
+            },
+            "7": {
+              "name": "punctuation.definition.string.end.sass"
+            },
+            "8": {
+              "name": "punctuation.definition.attribute-selector.end.bracket.square.sass"
+            }
+          }
+        }
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "constant.numeric.sass",
-      "match": "(-|\\+)?\\s*[0-9]+(\\.[0-9]+)?"
+      "include": "#comments"
     },
     {
-      "name": "support.constant.property-value.sass",
-      "match": "\\b(whitespace|wait|w-resize|visible|rect|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"
+      "name": "meta.variable-declaration.sass.mixin",
+      "begin": "^(=|@keyframes\\s+)([a-zA-Z0-9_-]+)",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#property-value"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.at-rule.keyframes.sass"
+        },
+        "2": {
+          "name": "variable.other.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "name": "constant.string.sass",
-      "match": "(left|right|true|false|top|bottom)(?!:)"
+      "name": "meta.at-rule.import.sass",
+      "begin": "^\\s*((@)import\\b)",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#string-double"
+        },
+        {
+          "begin": "(url)\\s*(\\()\\s*",
+          "end": "\\s*(\\))\\s*",
+          "patterns": [
+            {
+              "name": "variable.parameter.url.sass",
+              "match": "[^'\") \\t]+"
+            },
+            {
+              "include": "#string-single"
+            },
+            {
+              "include": "#string-double"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.url.sass"
+            },
+            "2": {
+              "name": "punctuation.section.function.sass"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.function.sass"
+            }
+          }
+        },
+        {
+          "name": "variable.parameter.url.sass",
+          "match": "([^\"'\\n;]+)"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.at-rule.import.sass"
+        },
+        "2": {
+          "name": "punctuation.definition.keyword.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
     },
     {
-      "begin": "(headings|stylesheet-url|rgba?|hsla?|ie-hex-str|red|green|blue|alpha|opacity|hue|saturation|lightness|prefixed|prefix|-moz|-svg|-css2|-pie|-webkit|-ms|-o|-khtml|font-(?:files|url)|grid-image|image-(?:width|height|url|color)|sprites?|sprite-(?:map|map-name|file|url|position)|inline-(?:font-files|image)|opposite-position|grad-point|grad-end-position|color-stops|color-stops-in-percentages|grad-color-stops|(?:radial|linear)-(?:gradient|svg-gradient)|opacify|fade-?in|transparentize|fade-?out|lighten|darken|saturate|desaturate|grayscale|adjust-(?:hue|lightness|saturation|color)|scale-(?:lightness|saturation|color)|change-color|spin|complement|invert|mix|-compass-(?:list|space-list|slice|nth|list-size)|blank|compact|nth|first-value-of|join|length|append|nest|append-selector|headers|enumerate|range|percentage|unitless|unit|if|type-of|comparable|elements-of-type|quote|unquote|escape|e|sin|cos|tan|abs|round|ceil|floor|pi|translate(?:X|Y))\\s*(\\()",
-      "end": "(\\))",
+      "name": "meta.at-rule.media.sass",
+      "begin": "^\\s*((@)media)\\b",
+      "end": "$",
       "patterns": [
         {
-          "include": "#double-quoted"
+          "name": "keyword.control.operator.css.sass",
+          "match": "\\b(only)\\b"
         },
         {
-          "include": "#single-quoted"
+          "name": "meta.property-list.media-query.sass",
+          "begin": "\\(",
+          "end": "\\)",
+          "patterns": [
+            {
+              "name": "meta.property-name.media-query.sass",
+              "begin": "(?\u003c![-a-z])(?=[-a-z])",
+              "end": "$|(?![-a-z])",
+              "patterns": [
+                {
+                  "include": "source.css#media-features"
+                },
+                {
+                  "include": "source.css#property-names"
+                }
+              ]
+            },
+            {
+              "contentName": "meta.property-value.media-query.sass",
+              "begin": "(:)\\s*",
+              "end": "\\s*(?=\\))",
+              "patterns": [
+                {
+                  "include": "#property-value"
+                }
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.separator.key-value.sass"
+                }
+              }
+            }
+          ],
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.media-query.begin.bracket.round.sass"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.media-query.end.bracket.round.sass"
+            }
+          }
         },
         {
-          "include": "#variable"
+          "include": "#variable-usage"
         },
         {
-          "name": "keyword.other.regex.sass",
-          "match": "\\^|\\$|\\*|~"
+          "include": "#conditional-operators"
         },
         {
-          "include": "#parameters"
+          "include": "source.css#media-types"
         }
       ],
       "beginCaptures": {
         "1": {
-          "name": "support.function.misc.scss"
+          "name": "keyword.control.at-rule.media.sass"
         },
         "2": {
-          "name": "punctuation.section.function.scss"
+          "name": "punctuation.definition.keyword.sass"
+        }
+      }
+    },
+    {
+      "begin": "^\\s+(:)(?=[-a-z])",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "include": "#property-name"
+        },
+        {
+          "name": "meta.property-value.sass",
+          "begin": "\\s+",
+          "end": "(?=;?$)",
+          "patterns": [
+            {
+              "include": "#property-value"
+            }
+          ]
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.separator.key-value.css"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "punctuation.section.function.scss"
+          "name": "invalid.illegal.punctuation.sass"
         }
       }
     },
     {
-      "name": "keyword.control.untitled",
-      "match": "\u0026"
-    },
-    {
-      "name": "entity.other.attribute-name.tag.pseudo-class",
-      "match": ":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"
-    },
-    {
-      "name": "entity.other.attribute-name.tag.pseudo-element",
-      "match": "::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"
-    },
-    {
-      "name": "support.type.property-name.sass",
-      "match": "\\b(-webkit-[A-Za-z]+|-moz-[A-Za-z]+|-o-[A-Za-z]+|-ms-[A-Za-z]+|-khtml-[A-Za-z]+|[0-9]{1,3}\\%|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|trim|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform|top-width|top-style|top-right-radius|top-left-radius|top-color|top|timing-function|text-wrap|text-transform|text-shadow|text-replace|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|resolution|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|opacity|offset|numeral|new|nav-up|nav-right|nav-left|nav-index|nav-down|nav|name|move-to|model|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|level|letter-spacing|length|left-width|left-style|left-color|left|label|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|grid-rows|grid-columns|grid|gap|font-weight|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-family|font|float-offset|float|flex-group|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-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-break|background-attachment|background|backface-visibility|azimuth|attachment|appearance|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-duration|animation-direction|animation-delay|animation|alignment-baseline|alignment-adjust|alignment|align-last|align|after|adjust)\\b"
+      "begin": "^\\s+([-A-Za-z]+)\\s*(?=(\\|\\|)?=|:[ \\t]+)",
+      "end": "(;)?$",
+      "patterns": [
+        {
+          "name": "meta.property-value.sass",
+          "begin": "(?:(:)\\s+)|((\\|\\|)?=)",
+          "end": "(?=;?$)",
+          "patterns": [
+            {
+              "include": "#property-value"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.separator.key-value.css"
+            },
+            "2": {
+              "name": "invalid.illegal.deprecated.sass"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#property-name"
+            }
+          ]
+        },
+        "2": {
+          "name": "punctuation.separator.key-value.css"
+        },
+        "3": {
+          "name": "invalid.illegal.deprecated.sass"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "invalid.illegal.punctuation.sass"
+        }
+      }
+    }
+  ],
+  "repository": {
+    "comments": {
+      "patterns": [
+        {
+          "match": "\\w+\\s*((//|/\\*).*)",
+          "captures": {
+            "1": {
+              "name": "invalid.illegal.sass"
+            }
+          }
+        },
+        {
+          "name": "comment.block.documentation.sass",
+          "begin": "^(\\s*)(///)",
+          "end": "^(?!\\s\\1)",
+          "patterns": [
+            {
+              "include": "source.sassdoc"
+            }
+          ],
+          "beginCaptures": {
+            "2": {
+              "name": "punctuation.definition.comment.sass"
+            }
+          }
+        },
+        {
+          "name": "comment.block.sass",
+          "begin": "^(\\s*)(/\\*)",
+          "end": "(\\*/)|^(?!\\s\\1)",
+          "beginCaptures": {
+            "2": {
+              "name": "punctuation.definition.comment.sass"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.comment.sass"
+            }
+          }
+        },
+        {
+          "name": "comment.line.sass",
+          "begin": "^(\\s*)(//)",
+          "end": "^(?!\\s\\1)",
+          "beginCaptures": {
+            "2": {
+              "name": "punctuation.definition.comment.sass"
+            }
+          }
+        }
+      ]
     },
-    {
-      "name": "support.constant.font-name.sass",
-      "match": "(\\b(?i:arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace)\\b)"
+    "conditional-operators": {
+      "patterns": [
+        {
+          "name": "keyword.operator.comparison.sass",
+          "match": "==|!=|\u003c=|\u003e=|\u003c|\u003e"
+        },
+        {
+          "name": "keyword.operator.logical.sass",
+          "match": "\\b(not|or|and)\\b"
+        }
+      ]
     },
-    {
-      "name": "support.type.property-name.sass",
-      "match": "(?\u003e-(webkit|moz|ms|o|apple|khtml|xv|wap|epub)[a-zA-Z0-9_-]+)(?!\\()"
+    "property-name": {
+      "name": "meta.property-name.sass",
+      "begin": "(?=[-A-Za-z]+)",
+      "end": "(?!\\G)",
+      "patterns": [
+        {
+          "include": "source.css#property-names"
+        }
+      ]
     },
-    {
-      "name": "helper.sublime.property-name.sass",
-      "match": "(?\u003c=\\s\\s)-?\\w\\n?"
+    "property-value": {
+      "patterns": [
+        {
+          "include": "source.css#numeric-values"
+        },
+        {
+          "name": "keyword.operator.css",
+          "match": "[-+*/](?!\\s*[-+*/])"
+        },
+        {
+          "include": "#variable-usage"
+        },
+        {
+          "name": "support.constant.property-value.css.sass",
+          "match": "\\b(true|false)\\b"
+        },
+        {
+          "include": "source.css#property-keywords"
+        },
+        {
+          "include": "source.css#color-keywords"
+        },
+        {
+          "name": "constant.other.color.rgb-value.css",
+          "match": "(#)([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\\b",
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.constant.css"
+            }
+          }
+        },
+        {
+          "include": "#string-double"
+        },
+        {
+          "include": "#string-single"
+        },
+        {
+          "begin": "(rgb|url|attr|counter|counters|local|format)\\s*(\\()",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "#string-single"
+            },
+            {
+              "include": "#string-double"
+            },
+            {
+              "name": "constant.other.color.rgb-value.sass",
+              "match": "(\\b0*((1?[0-9]{1,2})|(2([0-4][0-9]|5[0-5])))\\s*,\\s*)(0*((1?[0-9]{1,2})|(2([0-4][0-9]|5[0-5])))\\s*,\\s*)(0*((1?[0-9]{1,2})|(2([0-4][0-9]|5[0-5])))\\b)"
+            },
+            {
+              "name": "constant.other.color.rgb-percentage.sass",
+              "match": "\\b([0-9]{1,2}|100)\\s*%,\\s*([0-9]{1,2}|100)\\s*%,\\s*([0-9]{1,2}|100)\\s*%"
+            },
+            {
+              "name": "variable.parameter.misc.sass",
+              "match": "[^'\") \\t]+"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "support.function.misc.sass"
+            },
+            "2": {
+              "name": "punctuation.section.function.sass"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.function.sass"
+            }
+          }
+        },
+        {
+          "name": "keyword.other.important.sass",
+          "match": "!\\s*important"
+        },
+        {
+          "name": "keyword.operator.control.sass",
+          "match": "(from|to|through|in)"
+        },
+        {
+          "include": "#conditional-operators"
+        }
+      ]
     },
-    {
-      "name": "helper.sublime.property-value.sass",
-      "match": "(?\u003c=\\w: )\\w\\n?"
-    }
-  ],
-  "repository": {
-    "double-quoted": {
-      "name": "string.quoted.double.css.sass",
+    "string-double": {
+      "name": "string.quoted.double.sass",
       "begin": "\"",
-      "end": "\""
-    },
-    "nested-parens": {
-      "begin": "\\(",
-      "end": "\\)",
+      "end": "\"",
       "patterns": [
         {
-          "include": "#nested-parens"
+          "name": "constant.character.escape.sass",
+          "match": "\\\\([[:xdigit:]]{1,6}|.)"
         }
       ],
-      "captures": {
+      "beginCaptures": {
         "0": {
-          "name": "punctuation.section.scope.sass"
+          "name": "punctuation.definition.string.begin.sass"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.sass"
         }
       }
     },
-    "placeholder-selector": {
-      "name": "entity.other.attribute-name.placeholder-selector.sass",
-      "match": "%[a-zA-Z0-9_-]+"
-    },
-    "single-quoted": {
-      "name": "string.quoted.single.css.sass",
+    "string-single": {
+      "name": "string.quoted.single.sass",
       "begin": "'",
-      "end": "'"
+      "end": "'",
+      "patterns": [
+        {
+          "name": "constant.character.escape.sass",
+          "match": "\\\\([[:xdigit:]]{1,6}|.)"
+        }
+      ],
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.begin.sass"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.string.end.sass"
+        }
+      }
     },
-    "variable": {
-      "name": "variable",
-      "match": "\\$[a-zA-Z0-9_-]+"
+    "variable-usage": {
+      "name": "meta.variable-usage.sass",
+      "match": "(!|\\$)([a-zA-Z0-9_-]+)",
+      "captures": {
+        "1": {
+          "name": "punctuation.definition.entity.css"
+        },
+        "2": {
+          "name": "variable.other.sass"
+        }
+      }
     }
   }
 }