tm-grammars 1.22.3 → 1.22.4

package/grammars/razor.json

@@ -126,7 +126,7 @@
       ]
     },
     "catch-clause": {
-      "begin": "(?:^|(?<=}))\\s*(catch)\\b\\s*?(?=[\\n({])",
+      "begin": "(?:^|(?<=}))\\s*(catch)\\b\\s*?(?=[\\n\\(\\{])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.try.catch.cs"
@@ -176,7 +176,7 @@
               "name": "entity.name.variable.local.cs"
             }
           },
-          "match": "(?<type-name>(?:(?:(?:(?<identifier>@?[_A-Za-z][_0-9A-Za-z]*)\\s*::\\s*)?(?<name-and-type-args>\\g<identifier>\\s*(?<type-args>\\s*<(?:[^<>]|\\g<type-args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name-and-type-args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s*(?:(\\g<identifier>)\\b)?"
+          "match": "(?<type-name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name-and-type-args>\\g<identifier>\\s*(?<type-args>\\s*<(?:[^<>]|\\g<type-args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name-and-type-args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*))\\s*(?:(\\g<identifier>)\\b)?"
         }
       ]
     },
@@ -405,7 +405,7 @@
       ]
     },
     "else-part": {
-      "begin": "(?:^|(?<=}))\\s*(else)\\b\\s*?(?: (if))?\\s*?(?=[\\n({])",
+      "begin": "(?:^|(?<=}))\\s*(else)\\b\\s*?(?: (if))?\\s*?(?=[\\n\\(\\{])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.conditional.else.cs"
@@ -460,7 +460,7 @@
       ]
     },
     "finally-clause": {
-      "begin": "(?:^|(?<=}))\\s*(finally)\\b\\s*?(?=[\\n{])",
+      "begin": "(?:^|(?<=}))\\s*(finally)\\b\\s*?(?=[\\n\\{])",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.try.finally.cs"
@@ -566,7 +566,7 @@
               "name": "keyword.control.loop.in.cs"
             }
           },
-          "match": "(?:(\\bvar\\b)|(?<type-name>(?:(?:(?:(?<identifier>@?[_A-Za-z][_0-9A-Za-z]*)\\s*::\\s*)?(?<name-and-type-args>\\g<identifier>\\s*(?<type-args>\\s*<(?:[^<>]|\\g<type-args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name-and-type-args>)*|(?<tuple>\\s*\\((?:[^()]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*)))\\s+(\\g<identifier>)\\s+\\b(in)\\b"
+          "match": "(?:(\\bvar\\b)|(?<type-name>(?:(?:(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)?(?<name-and-type-args>\\g<identifier>\\s*(?<type-args>\\s*<(?:[^<>]|\\g<type-args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name-and-type-args>)*|(?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\)))(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)*)))\\s+(\\g<identifier>)\\s+\\b(in)\\b"
         },
         {
           "captures": {
@@ -584,7 +584,7 @@
               "name": "keyword.control.loop.in.cs"
             }
           },
-          "match": "(?:\\b(var)\\b\\s*)?(?<tuple>\\((?:[^()]|\\g<tuple>)+\\))\\s+\\b(in)\\b"
+          "match": "(?:\\b(var)\\b\\s*)?(?<tuple>\\((?:[^\\(\\)]|\\g<tuple>)+\\))\\s+\\b(in)\\b"
         },
         {
           "include": "source.cs#expression"
@@ -762,7 +762,7 @@
       "name": "meta.directive"
     },
     "implicit-expression": {
-      "begin": "(?<![A-Za-z0-9A-Za-z])(@)",
+      "begin": "(?<![[:alpha:][:alnum:]])(@)",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -773,7 +773,7 @@
         }
       },
       "contentName": "source.cs",
-      "end": "(?=[\\s<>{})\\]'\"])",
+      "end": "(?=[\\s<>\\{\\}\\)\\]'\"])",
       "name": "meta.expression.implicit.cshtml",
       "patterns": [
         {
@@ -785,17 +785,17 @@
       ]
     },
     "implicit-expression-accessor": {
-      "match": "(?<=\\.)[_A-Za-z][_0-9A-Za-z]*",
+      "match": "(?<=\\.)[_[:alpha:]][_[:alnum:]]*",
       "name": "variable.other.object.property.cs"
     },
     "implicit-expression-accessor-start": {
-      "begin": "([_A-Za-z][_0-9A-Za-z]*)",
+      "begin": "([_[:alpha:]][_[:alnum:]]*)",
       "beginCaptures": {
         "1": {
           "name": "variable.other.object.cs"
         }
       },
-      "end": "(?=[\\s<>{})\\]'\"])",
+      "end": "(?=[\\s<>\\{\\}\\)\\]'\"])",
       "patterns": [
         {
           "include": "#implicit-expression-continuation"
@@ -803,7 +803,7 @@
       ]
     },
     "implicit-expression-body": {
-      "end": "(?=[\\s<>{})\\]'\"])",
+      "end": "(?=[\\s<>\\{\\}\\)\\]'\"])",
       "patterns": [
         {
           "include": "#implicit-expression-invocation-start"
@@ -814,7 +814,7 @@
       ]
     },
     "implicit-expression-continuation": {
-      "end": "(?=[\\s<>{})\\]'\"])",
+      "end": "(?=[\\s<>\\{\\}\\)\\]'\"])",
       "patterns": [
         {
           "include": "#balanced-parenthesis-csharp"
@@ -839,20 +839,20 @@
           "name": "punctuation.accessor.cs"
         }
       },
-      "match": "(\\.)(?=[_A-Za-z][_0-9A-Za-z]*)"
+      "match": "(\\.)(?=[_[:alpha:]][_[:alnum:]]*)"
     },
     "implicit-expression-invocation": {
-      "match": "(?<=\\.)[_A-Za-z][_0-9A-Za-z]*(?=\\()",
+      "match": "(?<=\\.)[_[:alpha:]][_[:alnum:]]*(?=\\()",
       "name": "entity.name.function.cs"
     },
     "implicit-expression-invocation-start": {
-      "begin": "([_A-Za-z][_0-9A-Za-z]*)(?=\\()",
+      "begin": "([_[:alpha:]][_[:alnum:]]*)(?=\\()",
       "beginCaptures": {
         "1": {
           "name": "entity.name.function.cs"
         }
       },
-      "end": "(?=[\\s<>{})\\]'\"])",
+      "end": "(?=[\\s<>\\{\\}\\)\\]'\"])",
       "patterns": [
         {
           "include": "#implicit-expression-continuation"
@@ -873,7 +873,7 @@
           "name": "keyword.operator.logical.cs"
         }
       },
-      "match": "(!)(?=(?:\\.[_A-Za-z][_0-9A-Za-z]*)|\\?|[\\[(])"
+      "match": "(\\!)(?=(?:\\.[_[:alpha:]][_[:alnum:]]*)|\\?|[\\[\\(])"
     },
     "implicit-expression-operator": {
       "patterns": [
@@ -934,7 +934,7 @@
           "name": "entity.name.variable.property.cs"
         }
       },
-      "match": "(@)(inject)\\s*([\\S\\s]+?)?\\s*([_A-Za-z][_0-9A-Za-z]*)?\\s*(?=$)",
+      "match": "(@)(inject)\\s*([\\S\\s]+?)?\\s*([_[:alpha:]][_[:alnum:]]*)?\\s*(?=$)",
       "name": "meta.directive"
     },
     "layout-directive": {
@@ -1071,7 +1071,7 @@
           "name": "punctuation.accessor.cs"
         }
       },
-      "match": "([_A-Za-z][_0-9A-Za-z]*)(\\.)?"
+      "match": "([_[:alpha:]][_[:alnum:]]*)(\\.)?"
     },
     "non-void-tag": {
       "begin": "(?=<(!)?([^/\\s>]+)(\\s|/?>))",
@@ -1356,7 +1356,7 @@
           ]
         }
       },
-      "match": "(\\@:)([^$]*)$"
+      "match": "(\\@\\:)([^$]*)$"
     },
     "removeTagHelper-directive": {
       "captures": {
@@ -1405,7 +1405,7 @@
       "name": "meta.directive"
     },
     "section-directive": {
-      "begin": "(@)(section)\\b\\s+([_A-Za-z][_0-9A-Za-z]*)?",
+      "begin": "(@)(section)\\b\\s+([_[:alpha:]][_[:alnum:]]*)?",
       "beginCaptures": {
         "1": {
           "patterns": [
@@ -1726,7 +1726,7 @@
           ]
         }
       },
-      "match": "([_A-Za-z][_0-9A-Za-z]*)\\b\\s*(=)\\s*(.+)\\s*"
+      "match": "([_[:alpha:]][_[:alnum:]]*)\\b\\s*(=)\\s*(.+)\\s*"
     },
     "using-directive": {
       "captures": {
@@ -1766,7 +1766,7 @@
           "name": "entity.name.type.namespace.cs"
         }
       },
-      "match": "([_A-Za-z][_0-9A-Za-z]*)\\s*"
+      "match": "([_[:alpha:]][_[:alnum:]]*)\\s*"
     },
     "using-statement": {
       "begin": "(?:(@))(using)\\b\\s*(?=\\()",

package/grammars/reg.json

@@ -112,11 +112,11 @@
           "name": "punctuation.definition.quote.reg"
         }
       },
-      "match": "^(\\s*([\"']?)(.+?)([\"']?)\\s*(=))?\\s*((-)|(([\"'])(.*?)([\"']))|(((?i:dword))(:)\\s*([\\dabcdefABCDEF]{1,8}))|(((?i:hex))((\\()([\\d]*)(\\)))?(:)(.*?)(\\\\?)))\\s*(;.*)?$",
+      "match": "^(\\s*([\"']?)(.+?)([\"']?)\\s*(=))?\\s*((-)|(([\"'])(.*?)([\"']))|(((?i:dword))(\\:)\\s*([\\dabcdefABCDEF]{1,8}))|(((?i:hex))((\\()([\\d]*)(\\)))?(\\:)(.*?)(\\\\?)))\\s*(;.*)?$",
       "name": "meta.declaration.reg"
     },
     {
-      "match": "\\d+",
+      "match": "[0-9]+",
       "name": "constant.numeric.reg"
     },
     {

package/grammars/regexp.json

@@ -73,7 +73,7 @@
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.backreference.named.end.regexp"
         }
       },
-      "match": "(\\()(\\?P=\\w+(?:\\s+[0-9A-Za-z]+)?)(\\))",
+      "match": "(\\()(\\?P=\\w+(?:\\s+[[:alnum:]]+)?)(\\))",
       "name": "meta.backreference.named.regexp"
     },
     "regexp-backreference-number": {
@@ -210,7 +210,7 @@
       ]
     },
     "regexp-conditional": {
-      "begin": "(\\()\\?\\((\\w+(?:\\s+[0-9A-Za-z]+)?|\\d+)\\)",
+      "begin": "(\\()\\?\\((\\w+(?:\\s+[[:alnum:]]+)?|\\d+)\\)",
       "beginCaptures": {
         "0": {
           "name": "keyword.operator.conditional.regexp"
@@ -417,7 +417,7 @@
       ]
     },
     "regexp-named-group": {
-      "begin": "(\\()(\\?P<\\w+(?:\\s+[0-9A-Za-z]+)?>)",
+      "begin": "(\\()(\\?P<\\w+(?:\\s+[[:alnum:]]+)?>)",
       "beginCaptures": {
         "1": {
           "name": "support.other.parenthesis.regexp punctuation.parenthesis.named.begin.regexp"

package/grammars/rel.json

@@ -125,7 +125,7 @@
     "keywords": {
       "patterns": [
         {
-          "match": "(\\b(def|entity|bound|include|ic|forall|exists|∀|∃|return|module|^end)\\b)|(((<)?\\|(>)?)|∀|∃)",
+          "match": "(\\b(def|entity|bound|include|ic|forall|exists|∀|∃|return|module|^end)\\b)|(((\\<)?\\|(\\>)?)|∀|∃)",
           "name": "keyword.control.rel"
         }
       ]
@@ -133,7 +133,7 @@
     "operators": {
       "patterns": [
         {
-          "match": "(\\b(if|then|else|and|or|not|eq|neq|lt|lt_eq|gt|gt_eq)\\b)|(\\+|-|\\*|\\/|÷|\\^|\\%|=|!=|≠|<|<=|≤|>|>=|≥|\\&)|\\s+(end)",
+          "match": "(\\b(if|then|else|and|or|not|eq|neq|lt|lt_eq|gt|gt_eq)\\b)|(\\+|\\-|\\*|\\/|÷|\\^|\\%|\\=|\\!\\=|≠|\\<|\\<\\=|≤|\\>|\\>\\=|≥|\\&)|\\s+(end)",
           "name": "keyword.other.rel"
         }
       ]
@@ -141,7 +141,7 @@
     "otherkeywords": {
       "patterns": [
         {
-          "match": "\\s*(@inline)\\s*|\\s*(@auto_number)\\s*|\\s*(function)\\s|(\\b(implies|select|from|∈|where|for|in)\\b)|(((<)?\\|(>)?)|∈)",
+          "match": "\\s*(@inline)\\s*|\\s*(@auto_number)\\s*|\\s*(function)\\s|(\\b(implies|select|from|∈|where|for|in)\\b)|(((\\<)?\\|(\\>)?)|∈)",
           "name": "keyword.other.rel"
         }
       ]
@@ -182,7 +182,7 @@
     "symbols": {
       "patterns": [
         {
-          "match": "(:[\\[_$A-Za-z](\\]|[_$0-9A-Za-z]*))",
+          "match": "(:[\\[_$[:alpha:]](\\]|[_$[:alnum:]]*))",
           "name": "variable.parameter.rel"
         }
       ]

package/grammars/riscv.json

@@ -70,7 +70,7 @@
           "name": "punctuation.definition.variable.riscv"
         }
       },
-      "match": "\\b(x(\\d|1\\d|2\\d|3[0-1]))\\b",
+      "match": "\\b(x([0-9]|1[0-9]|2[0-9]|3[0-1]))\\b",
       "name": "variable.other.register.usable.by-number.riscv"
     },
     {
@@ -79,7 +79,7 @@
           "name": "punctuation.definition.variable.riscv"
         }
       },
-      "match": "\\b(zero|ra|sp|gp|tp|t[0-6]|a[0-7]|s\\d|fp|s1[0-1])\\b",
+      "match": "\\b(zero|ra|sp|gp|tp|t[0-6]|a[0-7]|s[0-9]|fp|s1[0-1])\\b",
       "name": "variable.other.register.usable.by-name.riscv"
     },
     {
@@ -88,7 +88,7 @@
           "name": "punctuation.definition.variable.riscv"
         }
       },
-      "match": "\\b(([umsh]|vs)status|([umsh]|vs)ie|([ums]|vs)tvec|([ums]|vs)scratch|([ums]|vs)epc|([ums]|vs)cause|([umsh]|vs)tval|([umsh]|vs)ip|fflags|frm|fcsr|m?cycleh?|timeh?|m?instreth?|m?hpmcounter([3-9]|[12]\\d|3[01])h?|[msh][ei]deleg|[msh]counteren|v?satp|hgeie|hgeip|[hm]tinst|hvip|hgatp|htimedeltah?|mvendorid|marchid|mimpid|mhartid|misa|mstatush|mtval2|pmpcfg[0-3]|pmpaddr(\\d|1[0-5])|mcountinhibit|mhpmevent([3-9]|[12]\\d|3[01])|tselect|tdata[1-3]|dcsr|dpc|dscratch[0-1])\\b",
+      "match": "\\b(([umsh]|vs)status|([umsh]|vs)ie|([ums]|vs)tvec|([ums]|vs)scratch|([ums]|vs)epc|([ums]|vs)cause|([umsh]|vs)tval|([umsh]|vs)ip|fflags|frm|fcsr|m?cycleh?|timeh?|m?instreth?|m?hpmcounter([3-9]|[12][0-9]|3[01])h?|[msh][ei]deleg|[msh]counteren|v?satp|hgeie|hgeip|[hm]tinst|hvip|hgatp|htimedeltah?|mvendorid|marchid|mimpid|mhartid|misa|mstatush|mtval2|pmpcfg[0-3]|pmpaddr([0-9]|1[0-5])|mcountinhibit|mhpmevent([3-9]|[12][0-9]|3[01])|tselect|tdata[1-3]|dcsr|dpc|dscratch[0-1])\\b",
       "name": "variable.other.csr.names.riscv"
     },
     {
@@ -97,7 +97,7 @@
           "name": "punctuation.definition.variable.riscv"
         }
       },
-      "match": "\\bf(\\d|1\\d|2\\d|3[0-1])\\b",
+      "match": "\\bf([0-9]|1[0-9]|2[0-9]|3[0-1])\\b",
       "name": "variable.other.register.usable.floating-point.riscv"
     },
     {
@@ -161,7 +161,7 @@
       "name": "comment.line.double-slash"
     },
     {
-      "begin": "^\\s*\\#\\s*(define)\\s+((?<id>[a-zA-Z_]\\w*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
+      "begin": "^\\s*\\#\\s*(define)\\s+((?<id>[a-zA-Z_][a-zA-Z0-9_]*))(?:(\\()(\\s*\\g<id>\\s*((,)\\s*\\g<id>\\s*)*(?:\\.\\.\\.)?)(\\)))?",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.import.define.c"

package/grammars/rst.json

@@ -727,7 +727,7 @@
       ]
     },
     "title": {
-      "match": "^(\\*{3,}|#{3,}|={3,}|~{3,}|\\+{3,}|-{3,}|`{3,}|\\^{3,}|:{3,}|\"{3,}|_{3,}|'{3,})$",
+      "match": "^(\\*{3,}|#{3,}|\\={3,}|~{3,}|\\+{3,}|-{3,}|`{3,}|\\^{3,}|:{3,}|\"{3,}|_{3,}|'{3,})$",
       "name": "markup.heading"
     }
   },

package/grammars/ruby.json

@@ -24,7 +24,7 @@
         }
       },
       "comment": "class Namespace::ClassName < OtherNamespace::OtherClassName",
-      "match": "\b(class)\\s+((\\w+)((::)\\w+)*)\\s*((<)\\s*((\\w+)((::)\\w+)*))?",
+      "match": "\b(class)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)\\s*((<)\\s*(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*))?",
       "name": "meta.class.ruby"
     },
     {
@@ -39,7 +39,7 @@
           "name": "punctuation.separator.namespace.ruby"
         }
       },
-      "match": "\b(module)\\s+((\\w+)((::)\\w+)*)",
+      "match": "\b(module)\\s+(([a-zA-Z0-9_]+)((::)[a-zA-Z0-9_]+)*)",
       "name": "meta.module.ruby"
     },
     {
@@ -374,7 +374,7 @@
       "name": "meta.function.method.without-arguments.ruby"
     },
     {
-      "match": "\\b([\\d](?>_?\\d)*(\\.(?![^\\s\\d])(?>_?\\d)*)?([eE][-+]?\\d(?>_?\\d)*)?|0(?:[xX]\\h(?>_?\\h)*|[oO]?[0-7](?>_?[0-7])*|[bB][01](?>_?[01])*|[dD]\\d(?>_?\\d)*))\\b",
+      "match": "\\b([\\d](?>_?\\d)*(\\.(?![^[:space:][:digit:]])(?>_?\\d)*)?([eE][-+]?\\d(?>_?\\d)*)?|0(?:[xX]\\h(?>_?\\h)*|[oO]?[0-7](?>_?[0-7])*|[bB][01](?>_?[01])*|[dD]\\d(?>_?\\d)*))\\b",
       "name": "constant.numeric.ruby"
     },
     {

package/grammars/rust.json

@@ -245,7 +245,7 @@
   ],
   "repository": {
     "attributes": {
-      "begin": "(#)(!?)(\\[)",
+      "begin": "(#)(\\!?)(\\[)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.attribute.rust"

package/grammars/sas.json

@@ -168,7 +168,7 @@
       "patterns": [
         {
           "comment": "numeric constant",
-          "match": "(?<![&}])\\b\\d*\\.?\\d+([eEdD][-+]?\\d+)?\\b",
+          "match": "(?<![&\\}])\\b[0-9]*\\.?[0-9]+([eEdD][-+]?[0-9]+)?\\b",
           "name": "constant.numeric.sas"
         },
         {
@@ -251,7 +251,7 @@
     "operator": {
       "patterns": [
         {
-          "match": "([+\\-\\*\\^\\/])",
+          "match": "([\\+\\-\\*\\^\\/])",
           "name": "keyword.operator.arithmetic.sas"
         },
         {

package/grammars/sass.json

@@ -3,8 +3,8 @@
   "fileTypes": [
     "sass"
   ],
-  "foldingStartMarker": "/\\*|^#|^\\*|^\\b|\\*#?region|^\\.",
-  "foldingStopMarker": "\\*/|\\*#?endregion|^\\s*$",
+  "foldingStartMarker": "/\\*|^#|^\\*|^\\b|*#?region|^\\.",
+  "foldingStopMarker": "\\*/|*#?endregion|^\\s*$",
   "name": "sass",
   "patterns": [
     {
@@ -238,7 +238,7 @@
       "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)|&",
+      "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": [
@@ -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": {
@@ -525,7 +525,7 @@
       "name": "constant.character.module"
     },
     "numeric": {
-      "match": "(-|\\.)?\\d+(\\.\\d+)?",
+      "match": "(-|\\.)?[0-9]+(\\.[0-9]+)?",
       "name": "constant.numeric.css.sass"
     },
     "operator": {