tm-grammars 1.22.3 → 1.22.4

package/grammars/lua.json

@@ -12,7 +12,7 @@
           "name": "keyword.control.lua"
         }
       },
-      "end": "(?<=[)\\-{}\\[\\]\"'])",
+      "end": "(?<=[\\)\\-{}\\[\\]\"'])",
       "name": "meta.function.lua",
       "patterns": [
         {
@@ -37,7 +37,7 @@
               "include": "#comment"
             },
             {
-              "match": "[a-zA-Z_]\\w*",
+              "match": "[a-zA-Z_][a-zA-Z0-9_]*",
               "name": "variable.parameter.function.lua"
             },
             {
@@ -51,7 +51,7 @@
                   "name": "punctuation.separator.arguments.lua"
                 }
               },
-              "end": "(?=[),])",
+              "end": "(?=[\\),])",
               "patterns": [
                 {
                   "include": "#emmydoc.type"
@@ -61,11 +61,11 @@
           ]
         },
         {
-          "match": "\\b([a-zA-Z_]\\w*)\\b\\s*(?=:)",
+          "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b\\s*(?=:)",
           "name": "entity.name.class.lua"
         },
         {
-          "match": "\\b([a-zA-Z_]\\w*)\\b",
+          "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
           "name": "entity.name.function.lua"
         }
       ]
@@ -118,7 +118,7 @@
           "name": "string.tag.lua"
         }
       },
-      "match": "\\b(goto)\\s+([a-zA-Z_]\\w*)"
+      "match": "\\b(goto)\\s+([a-zA-Z_][a-zA-Z0-9_]*)"
     },
     {
       "captures": {
@@ -129,7 +129,7 @@
           "name": "punctuation.section.embedded.end.lua"
         }
       },
-      "match": "(::)\\s*[a-zA-Z_]\\w*\\s*(::)",
+      "match": "(::)\\s*[a-zA-Z_][a-zA-Z0-9_]*\\s*(::)",
       "name": "string.tag.lua"
     },
     {
@@ -141,7 +141,7 @@
       "match": "<\\s*(const|close)\\s*>"
     },
     {
-      "match": "<[a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*>",
+      "match": "\\<[a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*\\>",
       "name": "storage.type.generic.lua"
     },
     {
@@ -177,27 +177,27 @@
       "name": "support.function.library.lua"
     },
     {
-      "match": "\\b(and|or|not|\\|\\||\\&\\&|!)\\b",
+      "match": "\\b(and|or|not|\\|\\||\\&\\&|\\!)\\b",
       "name": "keyword.operator.lua"
     },
     {
-      "match": "\\b([a-zA-Z_]\\w*)\\b(?=\\s*(?:[({\"']|\\[\\[))",
+      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[))",
       "name": "support.function.any-method.lua"
     },
     {
-      "match": "\\b([a-zA-Z_]\\w*)\\b(?=\\s*\\??:)",
+      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*\\??:)",
       "name": "entity.name.class.lua"
     },
     {
-      "match": "(?<=[^.]\\.|:)\\b([a-zA-Z_]\\w*)\\b(?!\\s*=\\s*\\b(function)\\b)",
+      "match": "(?<=[^.]\\.|:)\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?!\\s*=\\s*\\b(function)\\b)",
       "name": "entity.other.attribute.lua"
     },
     {
-      "match": "\\b([a-zA-Z_]\\w*)\\b(?!\\s*=\\s*\\b(function)\\b)",
+      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?!\\s*=\\s*\\b(function)\\b)",
       "name": "variable.other.lua"
     },
     {
-      "match": "\\b([a-zA-Z_]\\w*)\\b(?=\\s*=\\s*\\b(function)\\b)",
+      "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*=\\s*\\b(function)\\b)",
       "name": "entity.name.function.lua"
     },
     {
@@ -471,7 +471,7 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "begin": "\\b([a-zA-Z_]\\w*)\\b(\\??)",
+              "begin": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(\\??)",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.variable.lua"
@@ -517,7 +517,7 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "begin": "(\\b([a-zA-Z_]\\w*)\\b|(\\[))(\\??)",
+              "begin": "(\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b|(\\[))(\\??)",
               "beginCaptures": {
                 "2": {
                   "name": "entity.name.variable.lua"
@@ -552,7 +552,7 @@
           "end": "(?=[\\n@#])",
           "patterns": [
             {
-              "begin": "\\b([a-zA-Z_]\\w*)\\b",
+              "begin": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
               "beginCaptures": {
                 "0": {
                   "name": "storage.type.generic.lua"
@@ -663,7 +663,7 @@
               "name": "support.class.lua"
             },
             {
-              "match": ",|>|<",
+              "match": ",|\\>|\\<",
               "name": "keyword.operator.lua"
             }
           ]
@@ -739,7 +739,7 @@
           "name": "storage.type.annotation.lua"
         },
         {
-          "begin": "(?<=---)\\|\\s*[>+]?",
+          "begin": "(?<=---)\\|\\s*[\\>\\+]?",
           "beginCaptures": {
             "0": {
               "name": "storage.type.annotation.lua"
@@ -766,11 +766,11 @@
           "end": "(?=[\\s#])",
           "patterns": [
             {
-              "match": "[(),:?][ \\t]*",
+              "match": "[\\(\\),:\\?][ \\t]*",
               "name": "keyword.operator.lua"
             },
             {
-              "match": "([a-zA-Z_][a-zA-Z0-9_\\.\\*\\[\\]<>\\,\\-]*)(?<!,)[ \\t]*(?=\\??:)",
+              "match": "([a-zA-Z_][a-zA-Z0-9_\\.\\*\\[\\]\\<\\>\\,\\-]*)(?<!,)[ \\t]*(?=\\??:)",
               "name": "entity.name.variable.lua"
             },
             {
@@ -782,7 +782,7 @@
           ]
         },
         {
-          "match": "<[a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*>",
+          "match": "\\<[a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*\\>",
           "name": "storage.type.generic.lua"
         },
         {
@@ -790,15 +790,15 @@
           "name": "entity.name.tag.lua"
         },
         {
-          "match": "[{}:\\,?\\|\\`][ \\t]*",
+          "match": "[\\{\\}\\:\\,\\?\\|\\`][ \\t]*",
           "name": "keyword.operator.lua"
         },
         {
           "begin": "(?=[a-zA-Z_\\.\\*\"'\\[])",
-          "end": "(?=[\\s)\\,?:}\\|#])",
+          "end": "(?=[\\s\\)\\,\\?\\:\\}\\|#])",
           "patterns": [
             {
-              "match": "([a-zA-Z0-9_\\.\\*\\[\\]<>\\,\\-]+)(?<!,)[ \\t]*",
+              "match": "([a-zA-Z0-9_\\.\\*\\[\\]\\<\\>\\,\\-]+)(?<!,)[ \\t]*",
               "name": "support.type.lua"
             },
             {

package/grammars/luau.json

@@ -72,7 +72,7 @@
               "name": "storage.type.attribute.luau"
             }
           },
-          "match": "(@)([a-zA-Z_]\\w*)",
+          "match": "(@)([a-zA-Z_][a-zA-Z0-9_]*)",
           "name": "meta.attribute.luau"
         }
       ]
@@ -177,7 +177,7 @@
           ]
         },
         {
-          "match": "\\b([a-zA-Z_]\\w*)\\b",
+          "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
           "name": "variable.parameter.luau"
         }
       ]
@@ -192,7 +192,7 @@
           "name": "keyword.control.luau"
         }
       },
-      "end": "(?<=[)\\-{}\\[\\]\"'])",
+      "end": "(?<=[\\)\\-{}\\[\\]\"'])",
       "name": "meta.function.luau",
       "patterns": [
         {
@@ -224,7 +224,7 @@
               "name": "variable.parameter.function.varargs.luau"
             },
             {
-              "match": "[a-zA-Z_]\\w*",
+              "match": "[a-zA-Z_][a-zA-Z0-9_]*",
               "name": "variable.parameter.function.luau"
             },
             {
@@ -238,7 +238,7 @@
                   "name": "keyword.operator.type.luau"
                 }
               },
-              "end": "(?=[),])",
+              "end": "(?=[\\),])",
               "patterns": [
                 {
                   "include": "#type_literal"
@@ -252,7 +252,7 @@
           "name": "variable.language.metamethod.luau"
         },
         {
-          "match": "\\b([a-zA-Z_]\\w*)\\b",
+          "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
           "name": "entity.name.function.luau"
         }
       ]
@@ -262,7 +262,7 @@
       "end": "(>)",
       "patterns": [
         {
-          "match": "[a-zA-Z_]\\w*",
+          "match": "[a-zA-Z_][a-zA-Z0-9_]*",
           "name": "entity.name.type.luau"
         },
         {
@@ -277,11 +277,11 @@
     "identifier": {
       "patterns": [
         {
-          "match": "\\b([a-zA-Z_]\\w*)\\b(?=\\s*(?:[({\"']|\\[\\[))",
+          "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[))",
           "name": "entity.name.function.luau"
         },
         {
-          "match": "(?<=[^.]\\.|:)\\b([a-zA-Z_]\\w*)\\b",
+          "match": "(?<=[^.]\\.|:)\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
           "name": "variable.other.property.luau"
         },
         {
@@ -289,7 +289,7 @@
           "name": "variable.other.constant.luau"
         },
         {
-          "match": "\\b([a-zA-Z_]\\w*)\\b",
+          "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
           "name": "variable.other.readwrite.luau"
         }
       ]
@@ -397,7 +397,7 @@
           "name": "variable.other.constant.luau"
         },
         {
-          "match": "\\b([a-zA-Z_]\\w*)\\b",
+          "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
           "name": "variable.other.readwrite.luau"
         }
       ]
@@ -405,15 +405,15 @@
     "number": {
       "patterns": [
         {
-          "match": "\\b0_*[xX]_*[\\da-fA-F_]*(?:[eE][+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
+          "match": "\\b0_*[xX]_*[\\da-fA-F_]*(?:[eE][\\+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
           "name": "constant.numeric.hex.luau"
         },
         {
-          "match": "\\b0_*[bB][01_]+(?:[eE][+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
+          "match": "\\b0_*[bB][01_]+(?:[eE][\\+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
           "name": "constant.numeric.binary.luau"
         },
         {
-          "match": "(?:\\d[\\d_]*(?:\\.[\\d_]*)?|\\.\\d[\\d_]*)(?:[eE][+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
+          "match": "(?:\\d[\\d_]*(?:\\.[\\d_]*)?|\\.\\d[\\d_]*)(?:[eE][\\+\\-]?_*\\d[\\d_]*(?:\\.[\\d_]*)?)?",
           "name": "constant.numeric.decimal.luau"
         }
       ]
@@ -609,7 +609,7 @@
       ]
     },
     "type_annotation": {
-      "begin": ":(?!\\b([a-zA-Z_]\\w*)\\b(?=\\s*(?:[({\"']|\\[\\[)))",
+      "begin": ":(?!\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*(?:[({\"']|\\[\\[)))",
       "end": "(?<=\\))(?!\\s*->)|=|;|$|(?=\\breturn\\b)|(?=\\bend\\b)",
       "patterns": [
         {
@@ -627,7 +627,7 @@
           "name": "keyword.operator.typecast.luau"
         }
       },
-      "end": "(?=^|[;),}\\]:?\\-+>](?!\\s*[&\\|])|$|\\b(break|do|else|for|if|elseif|return|then|repeat|while|until|end|in|continue)\\b)",
+      "end": "(?=^|[;),}\\]:?\\-\\+\\>](?!\\s*[&\\|])|$|\\b(break|do|else|for|if|elseif|return|then|repeat|while|until|end|in|continue)\\b)",
       "patterns": [
         {
           "include": "#type_literal"
@@ -708,7 +708,7 @@
           ]
         },
         {
-          "match": "\\b([a-zA-Z_]\\w*)\\b",
+          "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
           "name": "entity.name.type.luau"
         },
         {
@@ -733,7 +733,7 @@
                   "name": "keyword.operator.type.luau"
                 }
               },
-              "match": "\\b([a-zA-Z_]\\w*)\\b(:)"
+              "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(:)"
             },
             {
               "include": "#type_literal"
@@ -757,7 +757,7 @@
                   "name": "keyword.operator.type.luau"
                 }
               },
-              "match": "\\b([a-zA-Z_]\\w*)\\b(:)",
+              "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(:)",
               "name": "variable.parameter.luau"
             },
             {

package/grammars/make.json

@@ -462,7 +462,7 @@
       ]
     },
     "target": {
-      "begin": "^(?!\\t)([^:]*)(:)(?!=)",
+      "begin": "^(?!\\t)([^:]*)(:)(?!\\=)",
       "beginCaptures": {
         "1": {
           "patterns": [

package/grammars/markdown.json

@@ -12,7 +12,7 @@
   "repository": {
     "ampersand": {
       "comment": "Markdown will convert this for us. We match it so that the HTML grammar will not mark it up as invalid.",
-      "match": "&(?!([a-zA-Z0-9]+|#\\d+|#x[0-9a-fA-F]+);)",
+      "match": "&(?!([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+);)",
       "name": "meta.other.valid-ampersand.markdown"
     },
     "block": {
@@ -133,7 +133,7 @@
     },
     "bracket": {
       "comment": "Markdown will convert this for us. We match it so that the HTML grammar will not mark it up as invalid.",
-      "match": "<(?![a-zA-Z/?$!])",
+      "match": "<(?![a-zA-Z/?\\$!])",
       "name": "meta.other.valid-bracket.markdown"
     },
     "escape": {
@@ -2502,7 +2502,7 @@
           "name": "punctuation.definition.link.markdown"
         }
       },
-      "match": "(!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])(\\()[ \\t]*((<)((?:\\\\[<>]|[^<>\\n])*)(>)|((?<url>(?>[^\\s()]+)|\\(\\g<url>*\\))*))[ \\t]*(?:((\\().+?(\\)))|((\").+?(\"))|((').+?(')))?\\s*(\\))",
+      "match": "(\\!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])(\\()[ \\t]*((<)((?:\\\\[<>]|[^<>\\n])*)(>)|((?<url>(?>[^\\s()]+)|\\(\\g<url>*\\))*))[ \\t]*(?:((\\().+?(\\)))|((\").+?(\"))|((').+?(')))?\\s*(\\))",
       "name": "meta.image.inline.markdown"
     },
     "image-ref": {
@@ -2526,7 +2526,7 @@
           "name": "punctuation.definition.constant.markdown"
         }
       },
-      "match": "(!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])[ ]?(\\[)(.*?)(\\])",
+      "match": "(\\!\\[)((?<square>[^\\[\\]\\\\]|\\\\.|\\[\\g<square>*+\\])*+)(\\])[ ]?(\\[)(.*?)(\\])",
       "name": "meta.image.reference.markdown"
     },
     "inline": {
@@ -2884,7 +2884,7 @@
       "name": "meta.link.reference.markdown"
     },
     "list_paragraph": {
-      "begin": "(^|\\G)(?=\\S)(?![*+->]\\s|\\d+\\.\\s)",
+      "begin": "(^|\\G)(?=\\S)(?![*+->]\\s|[0-9]+\\.\\s)",
       "name": "meta.paragraph.markdown",
       "patterns": [
         {
@@ -2897,7 +2897,7 @@
           "include": "#heading-setext"
         }
       ],
-      "while": "(^|\\G)(?!\\s*$|#|[ ]{0,3}([-*_>][ ]{2,}){3,}[ \\t]*$\\n?|[ ]{0,3}[*+->]|[ ]{0,3}\\d+\\.)"
+      "while": "(^|\\G)(?!\\s*$|#|[ ]{0,3}([-*_>][ ]{2,}){3,}[ \\t]*$\\n?|[ ]{0,3}[*+->]|[ ]{0,3}[0-9]+\\.)"
     },
     "lists": {
       "patterns": [
@@ -2921,7 +2921,7 @@
           "while": "((^|\\G)([ ]{2,4}|\\t))|(^[ \\t]*$)"
         },
         {
-          "begin": "(^|\\G)([ ]{0,3})(\\d+[\\.)])([ \\t])",
+          "begin": "(^|\\G)([ ]{0,3})([0-9]+[\\.\\)])([ \\t])",
           "beginCaptures": {
             "3": {
               "name": "punctuation.definition.list.begin.markdown"
@@ -2974,7 +2974,7 @@
       "while": "(^|\\G)([ ]{4}|\\t)"
     },
     "separator": {
-      "match": "(^|\\G)[ ]{0,3}([\\*\\-_])([ ]{0,2}\\2){2,}[ \\t]*$\\n?",
+      "match": "(^|\\G)[ ]{0,3}([\\*\\-\\_])([ ]{0,2}\\2){2,}[ \\t]*$\\n?",
       "name": "meta.separator.markdown"
     },
     "strikethrough": {

package/grammars/marko.json

@@ -922,7 +922,7 @@
           },
           "comment": "Variable for a tag",
           "contentName": "source.js",
-          "end": "(?=:?=|\\s|>|$|\\||\\(|/)",
+          "end": "(?=:?\\=|\\s|>|$|\\||\\(|/)",
           "name": "meta.embedded.js",
           "patterns": [
             {
@@ -1025,7 +1025,7 @@
             }
           },
           "comment": "HTML style tag with less",
-          "end": "/>|(?<=>)",
+          "end": "/>|(?<=\\>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1076,7 +1076,7 @@
             }
           },
           "comment": "HTML style tag with scss",
-          "end": "/>|(?<=>)",
+          "end": "/>|(?<=\\>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1127,7 +1127,7 @@
             }
           },
           "comment": "HTML style tag",
-          "end": "/>|(?<=>)",
+          "end": "/>|(?<=\\>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1178,7 +1178,7 @@
             }
           },
           "comment": "HTML script tag",
-          "end": "/>|(?<=>)",
+          "end": "/>|(?<=\\>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"
@@ -1229,7 +1229,7 @@
             }
           },
           "comment": "HTML normal tag",
-          "end": "/>|(?<=>)",
+          "end": "/>|(?<=\\>)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.tag.end.marko"

package/grammars/matlab.json

@@ -388,7 +388,7 @@
                     "1": {
                       "patterns": [
                         {
-                          "match": "[a-zA-Z]\\w*",
+                          "match": "[a-zA-Z][a-zA-Z0-9_]*",
                           "name": "variable.parameter.class.matlab"
                         },
                         {
@@ -418,7 +418,7 @@
                     "5": {
                       "patterns": [
                         {
-                          "match": "[a-zA-Z]\\w*(\\.[a-zA-Z]\\w*)*",
+                          "match": "[a-zA-Z][a-zA-Z0-9_]*(\\.[a-zA-Z][a-zA-Z0-9_]*)*",
                           "name": "entity.other.inherited-class.matlab"
                         },
                         {
@@ -435,7 +435,7 @@
                       ]
                     }
                   },
-                  "match": "(\\([^)]*\\))?\\s*(([a-zA-Z]\\w*)(?:\\s*(<)\\s*([^%]*))?)\\s*($|(?=(%|...)).*)"
+                  "match": "(\\([^)]*\\))?\\s*(([a-zA-Z][a-zA-Z0-9_]*)(?:\\s*(<)\\s*([^%]*))?)\\s*($|(?=(%|...)).*)"
                 }
               ]
             }
@@ -457,7 +457,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "[a-zA-Z]\\w*",
+                      "match": "[a-zA-Z][a-zA-Z0-9_]*",
                       "name": "variable.parameter.properties.matlab"
                     },
                     {
@@ -502,7 +502,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "[a-zA-Z]\\w*",
+                      "match": "[a-zA-Z][a-zA-Z0-9_]*",
                       "name": "variable.parameter.methods.matlab"
                     },
                     {
@@ -544,7 +544,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "[a-zA-Z]\\w*",
+                      "match": "[a-zA-Z][a-zA-Z0-9_]*",
                       "name": "variable.parameter.events.matlab"
                     },
                     {
@@ -742,7 +742,7 @@
     "function": {
       "patterns": [
         {
-          "begin": "(^\\s*)(function)\\s+(?:(?:(\\[)([^\\]]*)(\\])|([a-zA-Z]\\w*))\\s*=\\s*)?([a-zA-Z]\\w*(\\.[a-zA-Z]\\w*)*)\\s*",
+          "begin": "(^\\s*)(function)\\s+(?:(?:(\\[)([^\\]]*)(\\])|([a-zA-Z][a-zA-Z0-9_]*))\\s*=\\s*)?([a-zA-Z][a-zA-Z0-9_]*(\\.[a-zA-Z][a-zA-Z0-9_]*)*)\\s*",
           "beginCaptures": {
             "2": {
               "name": "storage.type.function.matlab"
@@ -799,7 +799,7 @@
                 "3": {
                   "patterns": [
                     {
-                      "match": "[a-zA-Z]\\w*",
+                      "match": "[a-zA-Z][a-zA-Z0-9_]*",
                       "name": "variable.parameter.arguments.matlab"
                     }
                   ]
@@ -885,7 +885,7 @@
     },
     "numbers": {
       "comment": "Valid numbers: 1, .1, 1.1, .1e1, 1.1e1, 1e1, 1i, 1j, 1e2j",
-      "match": "(?<=[\\s\\-+\\*\\/\\\\=:\\[({,]|^)\\d*\\.?\\d+([eE][+-]?\\d)?([0-9&&[^\\.]])*(i|j)?\\b",
+      "match": "(?<=[\\s\\-\\+\\*\\/\\\\=:\\[\\(\\{,]|^)\\d*\\.?\\d+([eE][+-]?\\d)?([0-9&&[^\\.]])*(i|j)?\\b",
       "name": "constant.numeric.matlab"
     },
     "operators": {
@@ -970,7 +970,7 @@
             },
             {
               "comment": "Operator symbols",
-              "match": "((\\%([+\\-0]?\\d{0,3}(\\.\\d{1,3})?)(c|d|e|E|f|g|G|s|((b|t)?(o|u|x|X))))|\\%\\%|\\\\(b|f|n|r|t|\\\\))",
+              "match": "((\\%([\\+\\-0]?\\d{0,3}(\\.\\d{1,3})?)(c|d|e|E|f|g|G|s|((b|t)?(o|u|x|X))))|\\%\\%|\\\\(b|f|n|r|t|\\\\))",
               "name": "constant.character.escape.matlab"
             }
           ]
@@ -1051,7 +1051,7 @@
       ]
     },
     "validators": {
-      "begin": "\\s*[;]?\\s*([a-zA-Z][a-zA-Z0-9_\\.?]*)",
+      "begin": "\\s*[;]?\\s*([a-zA-Z][a-zA-Z0-9_\\.\\?]*)",
       "comment": "Property and argument validation. Match an identifier allowing . and ?.",
       "end": "([;\\n%=].*)",
       "endCaptures": {
@@ -1108,7 +1108,7 @@
         },
         {
           "comment": "Size declaration",
-          "match": "\\s*(\\([^)]*\\))",
+          "match": "\\s*(\\([^\\)]*\\))",
           "name": "storage.type.matlab"
         },
         {

package/grammars/mdc.json

@@ -209,7 +209,7 @@
               "name": "comment.block.html"
             }
           },
-          "match": "^(\\s*)(#[\\w\\-_]*)\\s*(<!--(.*)-->)?$"
+          "match": "^(\\s*)(#[\\w\\-\\_]*)\\s*(<!--(.*)-->)?$"
         },
         {
           "include": "#block"
@@ -279,7 +279,7 @@
               "name": "punctuation.definition.entity.html"
             }
           },
-          "match": "(&)#\\d+(;)",
+          "match": "(&)#[0-9]+(;)",
           "name": "constant.character.entity.numeric.decimal.html"
         },
         {
@@ -499,7 +499,7 @@
           "while": "((^|\\G)([ ]*|\\t))|(^[ \\t]*$)"
         },
         {
-          "begin": "(^|\\G)([ ]*)(\\d+\\.)([ \\t])",
+          "begin": "(^|\\G)([ ]*)([0-9]+\\.)([ \\t])",
           "beginCaptures": {
             "3": {
               "name": "punctuation.definition.list.begin.markdown"