tm-grammars 1.22.19 → 1.23.0

package/grammars/rust.json

@@ -238,7 +238,7 @@
   ],
   "repository": {
     "attributes": {
-      "begin": "(#)(\\!?)(\\[)",
+      "begin": "(#)(!?)(\\[)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.attribute.rust"
@@ -247,7 +247,7 @@
           "name": "punctuation.brackets.attribute.rust"
         }
       },
-      "end": "\\]",
+      "end": "]",
       "endCaptures": {
         "0": {
           "name": "punctuation.brackets.attribute.rust"
@@ -366,7 +366,7 @@
               "name": "entity.name.type.numeric.rust"
             }
           },
-          "match": "\\b\\d[\\d_]*(\\.?)[\\d_]*(?:(E|e)([+-]?)([\\d_]+))?(f32|f64|i128|i16|i32|i64|i8|isize|u128|u16|u32|u64|u8|usize)?\\b",
+          "match": "\\b\\d[\\d_]*(\\.?)[\\d_]*(?:([Ee])([+\\-]?)([\\d_]+))?(f32|f64|i128|i16|i32|i64|i8|isize|u128|u16|u32|u64|u8|usize)?\\b",
           "name": "constant.numeric.decimal.rust"
         },
         {
@@ -420,7 +420,7 @@
           "name": "constant.character.escape.unicode.punctuation.rust"
         }
       },
-      "match": "(\\\\)(?:(?:(x[0-7][\\da-fA-F])|(u(\\{)[\\da-fA-F]{4,6}(\\}))|.))",
+      "match": "(\\\\)(?:(x[0-7][\\da-fA-F])|(u(\\{)[\\da-fA-F]{4,6}(}))|.)",
       "name": "constant.character.escape.rust"
     },
     "functions": {
@@ -657,7 +657,7 @@
           "name": "punctuation.definition.interpolation.rust"
         }
       },
-      "match": "({)[^\"{}]*(})",
+      "match": "(\\{)[^\"{}]*(})",
       "name": "meta.interpolation.rust"
     },
     "keywords": {
@@ -711,11 +711,11 @@
           "name": "storage.modifier.mut.rust"
         },
         {
-          "match": "(\\^|\\||\\|\\||&&|<<|>>|!)(?!=)",
+          "match": "([\\^|]|\\|\\||&&|<<|>>|!)(?!=)",
           "name": "keyword.operator.logical.rust"
         },
         {
-          "match": "&(?![&=])",
+          "match": "&(?![\\&=])",
           "name": "keyword.operator.borrow.and.rust"
         },
         {
@@ -723,7 +723,7 @@
           "name": "keyword.operator.assignment.rust"
         },
         {
-          "match": "(?<![<>])=(?!=|>)",
+          "match": "(?<![<>])=(?![=>])",
           "name": "keyword.operator.assignment.equal.rust"
         },
         {
@@ -758,7 +758,7 @@
               "name": "punctuation.brackets.curly.rust"
             }
           },
-          "match": "(?:\\b|(?:(\\))|(\\])|(\\})))[ \\t]+([<>])[ \\t]+(?:\\b|(?:(\\()|(\\[)|(\\{)))"
+          "match": "(?:\\b|(?:(\\))|(])|(})))[ \\t]+([<>])[ \\t]+(?:\\b|(?:(\\()|(\\[)|(\\{)))"
         },
         {
           "match": "::",
@@ -781,7 +781,7 @@
           "name": "keyword.operator.access.dot.rust"
         },
         {
-          "match": "\\.{2}(=|\\.)?",
+          "match": "\\.{2}([=.])?",
           "name": "keyword.operator.range.rust"
         },
         {
@@ -817,7 +817,7 @@
               "name": "entity.name.type.lifetime.rust"
             }
           },
-          "match": "(['])([a-zA-Z_][0-9a-zA-Z_]*)(?!['])\\b"
+          "match": "(')([a-zA-Z_][0-9a-zA-Z_]*)(?!')\\b"
         },
         {
           "captures": {
@@ -831,7 +831,7 @@
               "name": "entity.name.type.lifetime.rust"
             }
           },
-          "match": "(\\&)(['])([a-zA-Z_][0-9a-zA-Z_]*)(?!['])\\b"
+          "match": "(&)(')([a-zA-Z_][0-9a-zA-Z_]*)(?!')\\b"
         }
       ]
     },
@@ -874,7 +874,7 @@
               "name": "keyword.operator.namespace.rust"
             }
           },
-          "match": "(?<![A-Za-z0-9_])([A-Za-z0-9_]+)((?<!super|self)::)"
+          "match": "(?<![A-Za-z0-9_])([A-Za-z0-9_]+)((?<!s(?:uper|elf))::)"
         }
       ]
     },

package/grammars/sas.json

@@ -49,7 +49,7 @@
               "name": "keyword.other.sas"
             }
           },
-          "match": "(?i:(?:(stack|pgm|view|source)\\s?=\\s?)|(debug|nesting|nolist))"
+          "match": "(?i:(stack|pgm|view|source)\\s?=\\s?|(debug|nesting|nolist))"
         }
       ]
     },
@@ -138,7 +138,7 @@
       "name": "meta.function-call.sas"
     },
     {
-      "match": "(?i:\\b(_n_|_error_)\\b)",
+      "match": "(?i:\\b(_(?:n_|error_))\\b)",
       "name": "variable.language.sas"
     },
     {
@@ -147,7 +147,7 @@
           "name": "support.class.sas"
         }
       },
-      "match": "\\b(?i:(_all_|_character_|_cmd_|_freq_|_i_|_infile_|_last_|_msg_|_null_|_numeric_|_temporary_|_type_|abort|abs|addr|adjrsq|airy|alpha|alter|altlog|altprint|and|arcos|array|arsin|as|atan|attrc|attrib|attrn|authserver|autoexec|awscontrol|awsdef|awsmenu|awsmenumerge|awstitle|backward|band|base|betainv|between|blocksize|blshift|bnot|bor|brshift|bufno|bufsize|bxor|by|byerr|byline|byte|calculated|call|cards|cards4|case|catcache|cbufno|cdf|ceil|center|cexist|change|chisq|cinv|class|cleanup|close|cnonct|cntllev|coalesce|codegen|col|collate|collin|column|comamid|comaux1|comaux2|comdef|compbl|compound|compress|config|continue|convert|cos|cosh|cpuid|create|cross|crosstab|css|curobs|cv|daccdb|daccdbsl|daccsl|daccsyd|dacctab|dairy|datalines|datalines4|date|datejul|datepart|datetime|day|dbcslang|dbcstype|dclose|ddm|delete|delimiter|depdb|depdbsl|depsl|depsyd|deptab|dequote|descending|descript|design=|device|dflang|dhms|dif|digamma|dim|dinfo|display|distinct|dkricond|dkrocond|dlm|dnum|do|dopen|doptname|doptnum|dread|drop|dropnote|dsname|dsnferr|echo|else|emaildlg|emailid|emailpw|emailserver|emailsys|encrypt|end|endsas|engine|eof|eov|erf|erfc|error|errorcheck|errors|exist|exp|fappend|fclose|fcol|fdelete|feedback|fetch|fetchobs|fexist|fget|file|fileclose|fileexist|filefmt|filename|fileref|filevar|finfo|finv|fipname|fipnamel|fipstate|first|firstobs|floor|fmterr|fmtsearch|fnonct|fnote|font|fontalias|footnote[1-9]?|fopen|foptname|foptnum|force|formatted|formchar|formdelim|formdlim|forward|fpoint|fpos|fput|fread|frewind|frlen|from|fsep|full|fullstimer|fuzz|fwrite|gaminv|gamma|getoption|getvarc|getvarn|go|goto|group|gwindow|hbar|hbound|helpenv|helploc|hms|honorappearance|hosthelp|hostprint|hour|hpct|html|hvar|ibessel|ibr|id|if|index|indexc|indexw|infile|informat|initcmd|initstmt|inner|input|inputc|inputn|inr|insert|int|intck|intnx|into|intrr|invaliddata|irr|is|jbessel|join|juldate|keep|kentb|kurtosis|label|lag|last|lbound|leave|left|length|levels|lgamma|lib|libname|library|libref|line|linesize|link|list|log|log10|log2|logpdf|logpmf|logsdf|lostcard|lowcase|lrecl|ls|macro|macrogen|maps|mautosource|max|maxdec|maxr|mdy|mean|measures|median|memtype|merge|merror|min|minute|missing|missover|mlogic|mod|mode|model|modify|month|mopen|mort|mprint|mrecall|msglevel|msymtabmax|mvarsize|myy|n|nest|netpv|new|news|nmiss|no|nobatch|nobs|nocaps|nocardimage|nocenter|nocharcode|nocmdmac|nocol|nocum|nodate|nodbcs|nodetails|nodmr|nodms|nodmsbatch|nodup|nodupkey|noduplicates|noechoauto|noequals|noerrorabend|noexitwindows|nofullstimer|noicon|noimplmac|noint|nolist|noloadlist|nomiss|nomlogic|nomprint|nomrecall|nomsgcase|nomstored|nomultenvappl|nonotes|nonumber|noobs|noovp|nopad|nopercent|noprint|noprintinit|normal|norow|norsasuser|nosetinit|nosource|nosource2|nosplash|nosymbolgen|note|notes|notitle|notitles|notsorted|noverbose|noxsync|noxwait|npv|null|number|numkeys|nummousekeys|nway|obs|ods|on|open|option|order|ordinal|otherwise|out|outer|outp=|output|over|ovp|p(1|5|10|25|50|75|90|95|99)|pad|pad2|page|pageno|pagesize|paired|parm|parmcards|path|pathdll|pathname|pdf|peek|peekc|pfkey|pmf|point|poisson|poke|position|printer|probbeta|probbnml|probchi|probf|probgam|probhypr|probit|probnegb|probnorm|probsig|probt|procleave|project|prt|propcase|prxmatch|prxparse|prxchange|prxposn|ps|put|putc|putn|pw|pwreq|qtr|quote|r|ranbin|rancau|ranexp|rangam|range|ranks|rannor|ranpoi|rantbl|rantri|ranuni|read|recfm|register|regr|remote|remove|rename|repeat|replace|resolve|retain|return|reuse|reverse|rewind|right|round|rsquare|rtf|rtrace|rtraceloc|s|s2|samploc|sasautos|sascontrol|sasfrscr|sashelp|sasmsg|sasmstore|sasscript|sasuser|saving|scan|sdf|second|select|selection|separated|seq|serror|set|setcomm|setot|sign|simple|sin|sinh|siteinfo|skewness|skip|sle|sls|sortedby|sortpgm|sortseq|sortsize|soundex|source2|spedis|splashlocation|split|spool|sqrt|start|std|stderr|stdin|stfips|stimer|stname|stnamel|stop|stopover|strip|subgroup|subpopn|substr|sum|sumwgt|symbol|symbolgen|symget|symput|sysget|sysin|sysleave|sysmsg|sysparm|sysprint|sysprintfont|sysprod|sysrc|system|t|table|tables|tan|tanh|tapeclose|tbufsize|terminal|test|then|time|timepart|tinv|title[1-9]?|tnonct|to|today|tol|tooldef|totper|transformout|translate|trantab|tranwrd|trigamma|trim|trimn|trunc|truncover|type|unformatted|uniform|union|until|upcase|update|user|usericon|uss|validate|value|var|varfmt|varinfmt|varlabel|varlen|varname|varnum|varray|varrayx|vartype|verify|vformat|vformatd|vformatdx|vformatn|vformatnx|vformatw|vformatwx|vformatx|vinarray|vinarrayx|vinformat|vinformatd|vinformatdx|vinformatn|vinformatnx|vinformatw|vinformatwx|vinformatx|vlabel|vlabelx|vlength|vlengthx|vname|vnamex|vnferr|vtype|vtypex|weekday|weight|when|where|while|wincharset|window|work|workinit|workterm|write|wsum|wsumx|x|xsync|xwait|year|yearcutoff|yes|yyq|zipfips|zipname|zipnamel|zipstate))\\b",
+      "match": "\\b(?i:(_all_|_character_|_cmd_|_freq_|_i_|_infile_|_last_|_msg_|_null_|_numeric_|_temporary_|_type_|abort|abs|addr|adjrsq|airy|alpha|alter|altlog|altprint|and|arcos|array|arsin|as|atan|attrc|attrib|attrn|authserver|autoexec|awscontrol|awsdef|awsmenu|awsmenumerge|awstitle|backward|band|base|betainv|between|blocksize|blshift|bnot|bor|brshift|bufno|bufsize|bxor|by|byerr|byline|byte|calculated|call|cards|cards4|case|catcache|cbufno|cdf|ceil|center|cexist|change|chisq|cinv|class|cleanup|close|cnonct|cntllev|coalesce|codegen|col|collate|collin|column|comamid|comaux1|comaux2|comdef|compbl|compound|compress|config|continue|convert|cos|cosh|cpuid|create|cross|crosstab|css|curobs|cv|daccdb|daccdbsl|daccsl|daccsyd|dacctab|dairy|datalines|datalines4|date|datejul|datepart|datetime|day|dbcslang|dbcstype|dclose|ddm|delete|delimiter|depdb|depdbsl|depsl|depsyd|deptab|dequote|descending|descript|design=|device|dflang|dhms|dif|digamma|dim|dinfo|display|distinct|dkricond|dkrocond|dlm|dnum|do|dopen|doptname|doptnum|dread|drop|dropnote|dsname|dsnferr|echo|else|emaildlg|emailid|emailpw|emailserver|emailsys|encrypt|end|endsas|engine|eof|eov|erf|erfc|error|errorcheck|errors|exist|exp|fappend|fclose|fcol|fdelete|feedback|fetch|fetchobs|fexist|fget|file|fileclose|fileexist|filefmt|filename|fileref|filevar|finfo|finv|fipname|fipnamel|fipstate|first|firstobs|floor|fmterr|fmtsearch|fnonct|fnote|font|fontalias|footnote[1-9]?|fopen|foptname|foptnum|force|formatted|formchar|formdelim|formdlim|forward|fpoint|fpos|fput|fread|frewind|frlen|from|fsep|full|fullstimer|fuzz|fwrite|gaminv|gamma|getoption|getvarc|getvarn|go|goto|group|gwindow|hbar|hbound|helpenv|helploc|hms|honorappearance|hosthelp|hostprint|hour|hpct|html|hvar|ibessel|ibr|id|if|index|indexc|indexw|infile|informat|initcmd|initstmt|inner|input|inputc|inputn|inr|insert|int|intck|intnx|into|intrr|invaliddata|irr|is|jbessel|join|juldate|keep|kentb|kurtosis|label|lag|last|lbound|leave|left|length|levels|lgamma|lib|libname|library|libref|line|linesize|link|list|log|log10|log2|logpdf|logpmf|logsdf|lostcard|lowcase|lrecl|ls|macro|macrogen|maps|mautosource|max|maxdec|maxr|mdy|mean|measures|median|memtype|merge|merror|min|minute|missing|missover|mlogic|mod|mode|model|modify|month|mopen|mort|mprint|mrecall|msglevel|msymtabmax|mvarsize|myy|n|nest|netpv|new|news|nmiss|no|nobatch|nobs|nocaps|nocardimage|nocenter|nocharcode|nocmdmac|nocol|nocum|nodate|nodbcs|nodetails|nodmr|nodms|nodmsbatch|nodup|nodupkey|noduplicates|noechoauto|noequals|noerrorabend|noexitwindows|nofullstimer|noicon|noimplmac|noint|nolist|noloadlist|nomiss|nomlogic|nomprint|nomrecall|nomsgcase|nomstored|nomultenvappl|nonotes|nonumber|noobs|noovp|nopad|nopercent|noprint|noprintinit|normal|norow|norsasuser|nosetinit|nosource|nosource2|nosplash|nosymbolgen|note|notes|notitle|notitles|notsorted|noverbose|noxsync|noxwait|npv|null|number|numkeys|nummousekeys|nway|obs|ods|on|open|option|order|ordinal|otherwise|out|outer|outp=|output|over|ovp|p([15]|10|25|50|75|90|95|99)|pad|pad2|page|pageno|pagesize|paired|parm|parmcards|path|pathdll|pathname|pdf|peek|peekc|pfkey|pmf|point|poisson|poke|position|printer|probbeta|probbnml|probchi|probf|probgam|probhypr|probit|probnegb|probnorm|probsig|probt|procleave|project|prt|propcase|prxmatch|prxparse|prxchange|prxposn|ps|put|putc|putn|pw|pwreq|qtr|quote|r|ranbin|rancau|ranexp|rangam|range|ranks|rannor|ranpoi|rantbl|rantri|ranuni|read|recfm|register|regr|remote|remove|rename|repeat|replace|resolve|retain|return|reuse|reverse|rewind|right|round|rsquare|rtf|rtrace|rtraceloc|s|s2|samploc|sasautos|sascontrol|sasfrscr|sashelp|sasmsg|sasmstore|sasscript|sasuser|saving|scan|sdf|second|select|selection|separated|seq|serror|set|setcomm|setot|sign|simple|sin|sinh|siteinfo|skewness|skip|sle|sls|sortedby|sortpgm|sortseq|sortsize|soundex|source2|spedis|splashlocation|split|spool|sqrt|start|std|stderr|stdin|stfips|stimer|stname|stnamel|stop|stopover|strip|subgroup|subpopn|substr|sum|sumwgt|symbol|symbolgen|symget|symput|sysget|sysin|sysleave|sysmsg|sysparm|sysprint|sysprintfont|sysprod|sysrc|system|t|table|tables|tan|tanh|tapeclose|tbufsize|terminal|test|then|time|timepart|tinv|title[1-9]?|tnonct|to|today|tol|tooldef|totper|transformout|translate|trantab|tranwrd|trigamma|trim|trimn|trunc|truncover|type|unformatted|uniform|union|until|upcase|update|user|usericon|uss|validate|value|var|varfmt|varinfmt|varlabel|varlen|varname|varnum|varray|varrayx|vartype|verify|vformat|vformatd|vformatdx|vformatn|vformatnx|vformatw|vformatwx|vformatx|vinarray|vinarrayx|vinformat|vinformatd|vinformatdx|vinformatn|vinformatnx|vinformatw|vinformatwx|vinformatx|vlabel|vlabelx|vlength|vlengthx|vname|vnamex|vnferr|vtype|vtypex|weekday|weight|when|where|while|wincharset|window|work|workinit|workterm|write|wsum|wsumx|x|xsync|xwait|year|yearcutoff|yes|yyq|zipfips|zipname|zipnamel|zipstate))\\b",
       "name": "support.function.sas"
     }
   ],
@@ -155,8 +155,8 @@
     "blockComment": {
       "patterns": [
         {
-          "begin": "\\/\\*",
-          "end": "\\*\\/",
+          "begin": "/\\*",
+          "end": "\\*/",
           "name": "comment.block.slashstar.sas"
         }
       ]
@@ -164,7 +164,7 @@
     "constant": {
       "patterns": [
         {
-          "match": "(?<![&\\}])\\b[0-9]*\\.?[0-9]+([eEdD][-+]?[0-9]+)?\\b",
+          "match": "(?<![\\&}])\\b[0-9]*\\.?[0-9]+([eEdD][\\-+]?[0-9]+)?\\b",
           "name": "constant.numeric.sas"
         },
         {
@@ -227,7 +227,7 @@
     "dataSetOptions": {
       "patterns": [
         {
-          "match": "(?<=\\s|\\(|\\))(?i:ALTER|BUFNO|BUFSIZE|CNTLLEV|COMPRESS|DLDMGACTION|ENCRYPT|ENCRYPTKEY|EXTENDOBSCOUNTER|GENMAX|GENNUM|INDEX|LABEL|OBSBUF|OUTREP|PW|PWREQ|READ|REPEMPTY|REPLACE|REUSE|ROLE|SORTEDBY|SPILL|TOBSNO|TYPE|WRITE|FILECLOSE|FIRSTOBS|IN|OBS|POINTOBS|WHERE|WHEREUP|IDXNAME|IDXWHERE|DROP|KEEP|RENAME)\\s?=",
+          "match": "(?<=[\\s()])(?i:ALTER|BUFNO|BUFSIZE|CNTLLEV|COMPRESS|DLDMGACTION|ENCRYPT|ENCRYPTKEY|EXTENDOBSCOUNTER|GENMAX|GENNUM|INDEX|LABEL|OBSBUF|OUTREP|PW|PWREQ|READ|REPEMPTY|REPLACE|REUSE|ROLE|SORTEDBY|SPILL|TOBSNO|TYPE|WRITE|FILECLOSE|FIRSTOBS|IN|OBS|POINTOBS|WHERE|WHEREUP|IDXNAME|IDXWHERE|DROP|KEEP|RENAME)\\s?=",
           "name": "keyword.other.sas"
         }
       ]
@@ -243,7 +243,7 @@
     "operator": {
       "patterns": [
         {
-          "match": "([\\+\\-\\*\\^\\/])",
+          "match": "([+\\-*\\^/])",
           "name": "keyword.operator.arithmetic.sas"
         },
         {
@@ -251,7 +251,7 @@
           "name": "keyword.operator.comparison.sas"
         },
         {
-          "match": "([¬<>^~]?=(:)?|>|<|\\||!|¦|¬|^|~|<>|><|\\|\\|)",
+          "match": "([¬<>\\^~]?=(:)?|[><|!¦¬]|^|~|<>|><|\\|\\|)",
           "name": "keyword.operator.sas"
         }
       ]

package/grammars/sass.json

@@ -64,13 +64,13 @@
       "include": "#placeholder-selector"
     },
     {
-      "begin": "\\$[a-zA-Z0-9_-]+(?=:)",
+      "begin": "\\$[a-zA-Z0-9_\\-]+(?=:)",
       "captures": {
         "0": {
           "name": "variable.other.name"
         }
       },
-      "end": "$\\n?|(?=\\)\\s\\)|\\)\\n)",
+      "end": "$\\n?|(?=\\)(?:\\s\\)|\\n))",
       "name": "sass.script.maps",
       "patterns": [
         {
@@ -151,13 +151,13 @@
       "include": "#dotdotdot"
     },
     {
-      "begin": "@include|\\+(?!\\W|\\d)",
+      "begin": "@include|\\+(?![\\W\\d])",
       "captures": {
         "0": {
           "name": "keyword.control.at-rule.css.sass"
         }
       },
-      "end": "(?=\\n|\\()",
+      "end": "(?=[\\n(])",
       "name": "support.function.name.sass.library"
     },
     {
@@ -227,19 +227,19 @@
       "name": "support.function.name.sass",
       "patterns": [
         {
-          "match": "[\\w-]+",
+          "match": "[\\w\\-]+",
           "name": "entity.name.function"
         }
       ]
     },
     {
       "begin": "@",
-      "end": "$\\n?|\\s(?!(all|braille|embossed|handheld|print|projection|screen|speech|tty|tv|if|only|not)(\\s|,))",
+      "end": "$\\n?|\\s(?!(all|braille|embossed|handheld|print|projection|screen|speech|tty|tv|if|only|not)([\\s,]))",
       "name": "keyword.control.at-rule.css.sass"
     },
     {
-      "begin": "(?<!\\-|\\()\\b(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video|main|svg|rect|ruby|center|circle|ellipse|line|polyline|polygon|path|text|u|slot)\\b(?!-|\\)|:\\s)|&",
-      "end": "$\\n?|(?=\\s|,|\\(|\\)|\\.|\\#|\\[|>|-|_)",
+      "begin": "(?<![\\-(])\\b(a|abbr|acronym|address|applet|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|embed|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|picture|pre|progress|q|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video|main|svg|rect|ruby|center|circle|ellipse|line|polyline|polygon|path|text|u|slot)\\b(?![\\-)]|:\\s)|&",
+      "end": "$\\n?|(?=[\\s,().#\\[>\\-_])",
       "name": "entity.name.tag.css.sass.symbol",
       "patterns": [
         {
@@ -252,7 +252,7 @@
     },
     {
       "begin": "#",
-      "end": "$\\n?|(?=\\s|,|\\(|\\)|\\.|\\[|>)",
+      "end": "$\\n?|(?=[\\s,().\\[>])",
       "name": "entity.other.attribute-name.id.css.sass",
       "patterns": [
         {
@@ -264,8 +264,8 @@
       ]
     },
     {
-      "begin": "\\.|(?<=&)(-|_)",
-      "end": "$\\n?|(?=\\s|,|\\(|\\)|\\[|>)",
+      "begin": "\\.|(?<=&)([\\-_])",
+      "end": "$\\n?|(?=[\\s,()\\[>])",
       "name": "entity.other.attribute-name.class.css.sass",
       "patterns": [
         {
@@ -278,7 +278,7 @@
     },
     {
       "begin": "\\[",
-      "end": "\\]",
+      "end": "]",
       "name": "entity.other.attribute-selector.sass",
       "patterns": [
         {
@@ -288,20 +288,20 @@
           "include": "#single-quoted"
         },
         {
-          "match": "\\^|\\$|\\*|~",
+          "match": "[\\^$*~]",
           "name": "keyword.other.regex.sass"
         }
       ]
     },
     {
-      "match": "^((?<=\\]|\\)|not\\(|\\*|>|>\\s)|\n*):[a-z:-]+|(::|:-)[a-z:-]+",
+      "match": "^((?<=[\\])]|not\\(|[*>]|>\\s)|\\n*):[a-z:\\-]+|(:[:\\-])[a-z:\\-]+",
       "name": "entity.other.attribute-name.pseudo-class.css.sass"
     },
     {
       "include": "#module"
     },
     {
-      "match": "[\\w-]*\\(",
+      "match": "[\\w\\-]*\\(",
       "name": "entity.name.function"
     },
     {
@@ -314,7 +314,7 @@
       "name": "meta.property-list.css.sass.prop",
       "patterns": [
         {
-          "match": "(?<=:)[a-z-]+\\s",
+          "match": "(?<=:)[a-z\\-]+\\s",
           "name": "support.type.property-name.css.sass.prop.name"
         },
         {
@@ -352,7 +352,7 @@
           "name": "variable.css"
         },
         {
-          "match": "[\\w-]*\\(",
+          "match": "[\\w\\-]*\\(",
           "name": "entity.name.function"
         },
         {
@@ -395,8 +395,8 @@
       "include": "#function-content"
     },
     {
-      "begin": "(?<=})(?!\\n|\\(|\\)|[a-zA-Z0-9_-]+:)",
-      "end": "\\s|(?=,|\\.|\\[|\\)|\\n)",
+      "begin": "(?<=})(?![\\n()]|[a-zA-Z0-9_\\-]+:)",
+      "end": "\\s|(?=[,.\\[)\\n])",
       "name": "entity.name.tag.css.sass",
       "patterns": [
         {
@@ -411,7 +411,7 @@
       "include": "#operator"
     },
     {
-      "match": "[a-z-]+((?=:|#{))",
+      "match": "[a-z\\-]+((?=:|#\\{))",
       "name": "support.type.property-name.css.sass.prop.name"
     },
     {
@@ -431,16 +431,16 @@
       "name": "comment.punctuation.comma.sass"
     },
     "comment-param": {
-      "match": "\\@(\\w+)",
+      "match": "@(\\w+)",
       "name": "storage.type.class.jsdoc"
     },
     "comment-tag": {
-      "begin": "(?<={{)",
+      "begin": "(?<=\\{\\{)",
       "end": "(?=}})",
       "name": "comment.tag.sass"
     },
     "curly-brackets": {
-      "match": "{|}",
+      "match": "[{}]",
       "name": "invalid"
     },
     "dotdotdot": {
@@ -472,7 +472,7 @@
       "name": "keyword.other.important.css.sass"
     },
     "function": {
-      "match": "(?<=[\\s|\\(|,|:])(?!url|format|attr)[a-zA-Z0-9_-][\\w-]*(?=\\()",
+      "match": "(?<=[\\s|(,:])(?!url|format|attr)[a-zA-Z0-9_\\-][\\w\\-]*(?=\\()",
       "name": "support.function.name.sass"
     },
     "function-content": {
@@ -485,7 +485,7 @@
       "name": "constant.character.css.sass"
     },
     "interpolation": {
-      "begin": "#{",
+      "begin": "#\\{",
       "end": "}",
       "name": "support.function.interpolation.sass",
       "patterns": [
@@ -521,15 +521,15 @@
           "name": "constant.numeric.module.dot"
         }
       },
-      "match": "([\\w-]+?)(\\.)",
+      "match": "([\\w\\-]+?)(\\.)",
       "name": "constant.character.module"
     },
     "numeric": {
-      "match": "(-|\\.)?[0-9]+(\\.[0-9]+)?",
+      "match": "([\\-.])?[0-9]+(\\.[0-9]+)?",
       "name": "constant.numeric.css.sass"
     },
     "operator": {
-      "match": "\\+|\\s-\\s|\\s-(?=\\$)|(?<=\\()-(?=\\$)|\\s-(?=\\()|\\*|/|%|=|!|<|>|~",
+      "match": "\\+|\\s-\\s|\\s-(?=\\$)|(?<=\\()-(?=\\$)|\\s-(?=\\()|[*/%=!<>~]",
       "name": "keyword.operator.sass"
     },
     "parent-selector": {
@@ -550,15 +550,15 @@
       "name": "entity.other.inherited-class.placeholder-selector.css.sass"
     },
     "property-value": {
-      "match": "[a-zA-Z0-9_-]+",
+      "match": "[a-zA-Z0-9_\\-]+",
       "name": "meta.property-value.css.sass support.constant.property-value.css.sass"
     },
     "pseudo-class": {
-      "match": ":[a-z:-]+",
+      "match": ":[a-z:\\-]+",
       "name": "entity.other.attribute-name.pseudo-class.css.sass"
     },
     "quoted-interpolation": {
-      "begin": "#{",
+      "begin": "#\\{",
       "end": "}",
       "name": "support.function.interpolation.sass",
       "patterns": [
@@ -584,7 +584,7 @@
       "name": "support.type.property-name.css.sass"
     },
     "rgb-value": {
-      "match": "(#)([0-9a-fA-F]{3,4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})\\b",
+      "match": "(#)(\\h{3,4}|\\h{6}|\\h{8})\\b",
       "name": "constant.language.color.rgb-value.css.sass"
     },
     "semicolon": {
@@ -602,15 +602,15 @@
       ]
     },
     "unit": {
-      "match": "(?<=[\\d]|})(ch|cm|deg|dpcm|dpi|dppx|em|ex|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vmax|vmin|vw|fr|%)",
+      "match": "(?<=[\\d}])(ch|cm|deg|dpcm|dpi|dppx|em|ex|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vmax|vmin|vw|fr|%)",
       "name": "keyword.control.unit.css.sass"
     },
     "variable": {
-      "match": "\\$[a-zA-Z0-9_-]+",
+      "match": "\\$[a-zA-Z0-9_\\-]+",
       "name": "variable.other.value"
     },
     "variable-root": {
-      "match": "\\$[a-zA-Z0-9_-]+",
+      "match": "\\$[a-zA-Z0-9_\\-]+",
       "name": "variable.other.root"
     }
   },