tm-grammars 1.22.3 → 1.22.4

package/grammars/ocaml.json

@@ -18,7 +18,7 @@
   ],
   "repository": {
     "attribute": {
-      "begin": "(\\[)[\\s]*((?<![#\\-:!?.@*/&%^+<=>|~$])@{1,3}(?![#\\-:!?.@*/&%^+<=>|~$]))",
+      "begin": "(\\[)[[:space:]]*((?<![#\\-:!?.@*/&%^+<=>|~$])@{1,3}(?![#\\-:!?.@*/&%^+<=>|~$]))",
       "beginCaptures": {
         "1": {
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
@@ -48,13 +48,13 @@
           "name": "punctuation.definition.tag"
         }
       },
-      "match": "((?<![#\\-:!?.@*/&%^+<=>|~$])%(?![#\\-:!?.@*/&%^+<=>|~$]))((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*))"
+      "match": "((?<![#\\-:!?.@*/&%^+<=>|~$])%(?![#\\-:!?.@*/&%^+<=>|~$]))((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))"
     },
     "attributePayload": {
       "patterns": [
         {
           "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]%|^%))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "((?<![#\\-:!?.@*/&%^+<=>|~$])[:?](?![#\\-:!?.@*/&%^+<=>|~$]))|(?<=[\\s])|(?=\\])",
+          "end": "((?<![#\\-:!?.@*/&%^+<=>|~$])[:\\?](?![#\\-:!?.@*/&%^+<=>|~$]))|(?<=[[:space:]])|(?=\\])",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
@@ -99,7 +99,7 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^\\w]when|^when))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]when|^when))(?![[:word:]]))",
               "end": "(?=\\])",
               "patterns": [
                 {
@@ -117,7 +117,7 @@
     "bindClassTerm": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^\\w]and|^and|[^\\w]class|^class|[^\\w]type|^type))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
           "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(:)|(=)(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
@@ -129,8 +129,8 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^\\w]and|^and|[^\\w]class|^class|[^\\w]type|^type))(?![\\w]))",
-              "end": "(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)[\\s]*,|[^\\sa-z%])|(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)|(?=\\btype\\b)",
+              "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
+              "end": "(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)[[:space:]]*,|[^[:space:][:lower:]%])|(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?=\\btype\\b)",
               "endCaptures": {
                 "0": {
                   "name": "entity.name.function strong emphasis"
@@ -194,7 +194,7 @@
     "bindClassType": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^\\w]and|^and|[^\\w]class|^class|[^\\w]type|^type))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
           "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(:)|(=)(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
@@ -206,8 +206,8 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^\\w]and|^and|[^\\w]class|^class|[^\\w]type|^type))(?![\\w]))",
-              "end": "(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)[\\s]*,|[^\\sa-z%])|(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)|(?=\\btype\\b)",
+              "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
+              "end": "(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)[[:space:]]*,|[^[:space:][:lower:]%])|(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?=\\btype\\b)",
               "endCaptures": {
                 "0": {
                   "name": "entity.name.function strong emphasis"
@@ -271,7 +271,7 @@
     "bindConstructor": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^\\w]exception|^exception))(?![\\w]))|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\+=|^\\+=|[^#\\-:!?.@*/&%^+<=>|~$]=|^=|[^#\\-:!?.@*/&%^+<=>|~$]\\||^\\|))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "begin": "(?:(?<=(?:[^[:word:]]exception|^exception))(?![[:word:]]))|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\+=|^\\+=|[^#\\-:!?.@*/&%^+<=>|~$]=|^=|[^#\\-:!?.@*/&%^+<=>|~$]\\||^\\|))(?![#\\-:!?.@*/&%^+<=>|~$]))",
           "end": "(:)|(\\bof\\b)|((?<![#\\-:!?.@*/&%^+<=>|~$])\\|(?![#\\-:!?.@*/&%^+<=>|~$]))|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
@@ -293,7 +293,7 @@
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
             },
             {
-              "match": "\\b(?:\\b(?=[A-Z])[A-Za-z_][\\w']*)\\b(?![\\s]*(?:\\.|\\([^\\*]))",
+              "match": "\\b(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)\\b(?![[:space:]]*(?:\\.|\\([^\\*]))",
               "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
             },
             {
@@ -302,7 +302,7 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^\\w]of|^of))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]of|^of))(?![[:word:]]))",
           "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\|(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "0": {
@@ -323,7 +323,7 @@
           "include": "#comment"
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]type|^type))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
           "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])",
           "endCaptures": {
             "0": {
@@ -361,7 +361,7 @@
           "include": "#comment"
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]and|^and))(?![\\w]))|(?=[A-Z])",
+          "begin": "(?:(?<=(?:[^[:word:]]and|^and))(?![[:word:]]))|(?=[[:upper:]])",
           "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(:(?!=))|(:?=)(?![#\\-:!?.@*/&%^+<=>|~$])|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|open|type|val)\\b)",
           "endCaptures": {
             "1": {
@@ -380,7 +380,7 @@
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
             },
             {
-              "match": "(?:\\b(?=[A-Z])[A-Za-z_][\\w']*)",
+              "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
               "name": "entity.name.function strong emphasis"
             },
             {
@@ -458,7 +458,7 @@
     "bindTerm": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]!|^!))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^\\w]and|^and|[^\\w]external|^external|[^\\w]let|^let|[^\\w]method|^method|[^\\w]val|^val))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]!|^!))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]val|^val))(?![[:word:]]))",
           "end": "(\\bmodule\\b)|(\\bopen\\b)|(?<![#\\-:!?.@*/&%^+<=>|~$])(:)|((?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$]))(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
@@ -476,8 +476,8 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]!|^!))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^\\w]and|^and|[^\\w]external|^external|[^\\w]let|^let|[^\\w]method|^method|[^\\w]val|^val))(?![\\w]))",
-              "end": "(?=\\b(?:module|open)\\b)|(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)[\\s]*,|[^\\sa-z%])|(\\brec\\b)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*))",
+              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]!|^!))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]val|^val))(?![[:word:]]))",
+              "end": "(?=\\b(?:module|open)\\b)|(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)[[:space:]]*,|[^[:space:][:lower:]%])|(\\brec\\b)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))",
               "endCaptures": {
                 "1": {
                   "name": "variable.other.class.js message.error variable.interpolation string.regexp"
@@ -496,8 +496,8 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^\\w]rec|^rec))(?![\\w]))",
-              "end": "((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*))|(?=[^\\sA-Za-z])",
+              "begin": "(?:(?<=(?:[^[:word:]]rec|^rec))(?![[:word:]]))",
+              "end": "((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(?=[^[:space:][:alpha:]])",
               "endCaptures": {
                 "0": {
                   "name": "entity.name.function strong emphasis"
@@ -515,7 +515,7 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]module|^module))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
           "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
@@ -524,7 +524,7 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]open|^open))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]open|^open))(?![[:word:]]))",
           "end": "(?=\\bin\\b)|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
@@ -543,7 +543,7 @@
           "patterns": [
             {
               "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-              "end": "\\btype\\b|(?=[^\\s])",
+              "end": "\\btype\\b|(?=[^[:space:]])",
               "endCaptures": {
                 "0": {
                   "name": "keyword.control"
@@ -551,7 +551,7 @@
               }
             },
             {
-              "begin": "(?:(?<=(?:[^\\w]type|^type))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
               "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$])",
               "endCaptures": {
                 "0": {
@@ -595,7 +595,7 @@
               "name": "variable.other.class.js message.error variable.interpolation string.regexp"
             }
           },
-          "end": ":|(?=[^\\s])",
+          "end": ":|(?=[^[:space:]])",
           "endCaptures": {
             "0": {
               "name": "keyword"
@@ -604,7 +604,7 @@
           "patterns": [
             {
               "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]~|^~|[^#\\-:!?.@*/&%^+<=>|~$]\\?|^\\?))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-              "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)|(?<=\\))",
+              "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?<=\\))",
               "endCaptures": {
                 "0": {
                   "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
@@ -633,7 +633,7 @@
                       },
                       "patterns": [
                         {
-                          "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
+                          "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
                           "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
                         }
                       ]
@@ -675,7 +675,7 @@
     "bindType": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^\\w]and|^and|[^\\w]type|^type))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]type|^type))(?![[:word:]]))",
           "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\+=|=(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "0": {
@@ -690,7 +690,7 @@
               "include": "#pathType"
             },
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
               "name": "entity.name.function strong"
             },
             {
@@ -731,7 +731,7 @@
       ]
     },
     "commentBlock": {
-      "begin": "\\(\\*(?!\\*[^)])",
+      "begin": "\\(\\*(?!\\*[^\\)])",
       "contentName": "emphasis",
       "end": "\\*\\)",
       "name": "comment constant.regexp meta.separator.markdown",
@@ -803,7 +803,7 @@
           "include": "#pragma"
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]class|^class))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]class|^class))(?![[:word:]]))",
           "beginCaptures": {
             "0": {
               "name": "entity.name.class constant.numeric markup.underline"
@@ -822,7 +822,7 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]type|^type))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
           "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
@@ -889,7 +889,7 @@
       ]
     },
     "declModule": {
-      "begin": "(?:(?<=(?:[^\\w]module|^module))(?![\\w]))|\\bmodule\\b",
+      "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))|\\bmodule\\b",
       "beginCaptures": {
         "0": {
           "name": "markup.inserted constant.language support.constant.property-value entity.name.filename markup.underline"
@@ -909,8 +909,8 @@
           "include": "#pragma"
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]module|^module))(?![\\w]))",
-          "end": "(\\btype\\b)|(?=[A-Z])",
+          "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
+          "end": "(\\btype\\b)|(?=[[:upper:]])",
           "endCaptures": {
             "0": {
               "name": "keyword"
@@ -930,7 +930,7 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]type|^type))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
           "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
@@ -939,7 +939,7 @@
           ]
         },
         {
-          "begin": "(?=[A-Z])",
+          "begin": "(?=[[:upper:]])",
           "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
@@ -1012,7 +1012,7 @@
       ]
     },
     "declType": {
-      "begin": "(?:(?<=(?:[^\\w]type|^type))(?![\\w]))|\\btype\\b",
+      "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))|\\btype\\b",
       "beginCaptures": {
         "0": {
           "name": "keyword markup.underline"
@@ -1111,7 +1111,7 @@
       "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
     },
     "literalCharacter": {
-      "begin": "(?<![\\w])'",
+      "begin": "(?<![[:word:]])'",
       "end": "'",
       "name": "markup.punctuation.quote.beginning",
       "patterns": [
@@ -1121,7 +1121,7 @@
       ]
     },
     "literalCharacterEscape": {
-      "match": "\\\\(?:[\\\\\"'ntbr]|[\\d][\\d][\\d]|x[0-9A-Fa-f][0-9A-Fa-f]|o[0-3][0-7][0-7])"
+      "match": "\\\\(?:[\\\\\"'ntbr]|[[:digit:]][[:digit:]][[:digit:]]|x[[:xdigit:]][[:xdigit:]]|o[0-3][0-7][0-7])"
     },
     "literalClassType": {
       "patterns": [
@@ -1203,7 +1203,7 @@
       ]
     },
     "literalNumber": {
-      "match": "(?<![A-Za-z])[\\d][\\d]*(\\.[\\d][\\d]*)?",
+      "match": "(?<![[:alpha:]])[[:digit:]][[:digit:]]*(\\.[[:digit:]][[:digit:]]*)?",
       "name": "constant.numeric"
     },
     "literalObjectTerm": {
@@ -1301,13 +1301,13 @@
               "include": "#pathModulePrefixSimple"
             },
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]with|^with))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
           "end": "(:)|(=)|(;)|(?=\\})",
           "endCaptures": {
             "1": {
@@ -1322,7 +1322,7 @@
           },
           "patterns": [
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
@@ -1373,7 +1373,7 @@
           ]
         },
         {
-          "begin": "(\\{)([_a-z]*?)(\\|)",
+          "begin": "(\\{)([_[:lower:]]*?)(\\|)",
           "end": "(\\|)(\\2)(\\})",
           "name": "string beginning.punctuation.definition.quote.markdown",
           "patterns": [
@@ -1385,7 +1385,7 @@
       ]
     },
     "literalStringEscape": {
-      "match": "\\\\(?:[\\\\\"ntbr]|[\\d][\\d][\\d]|x[0-9A-Fa-f][0-9A-Fa-f]|o[0-3][0-7][0-7])"
+      "match": "\\\\(?:[\\\\\"ntbr]|[[:digit:]][[:digit:]][[:digit:]]|x[[:xdigit:]][[:xdigit:]]|o[0-3][0-7][0-7])"
     },
     "literalUnit": {
       "match": "\\(\\)",
@@ -1397,19 +1397,19 @@
           "include": "#pathModulePrefixExtended"
         },
         {
-          "match": "(?:\\b(?=[A-Z])[A-Za-z_][\\w']*)",
+          "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
           "name": "entity.name.class constant.numeric"
         }
       ]
     },
     "pathModulePrefixExtended": {
-      "begin": "(?:\\b(?=[A-Z])[A-Za-z_][\\w']*)(?=[\\s]*\\.|$|\\()",
+      "begin": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.|$|\\()",
       "beginCaptures": {
         "0": {
           "name": "entity.name.class constant.numeric"
         }
       },
-      "end": "(?![\\s\\.]|$|\\()",
+      "end": "(?![[:space:]\\.]|$|\\()",
       "patterns": [
         {
           "include": "#comment"
@@ -1424,7 +1424,7 @@
           "end": "\\)",
           "patterns": [
             {
-              "match": "((?:\\b(?=[A-Z])[A-Za-z_][\\w']*)(?=[\\s]*\\)))",
+              "match": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\)))",
               "name": "string.other.link variable.language variable.parameter emphasis"
             },
             {
@@ -1439,7 +1439,7 @@
               "name": "keyword strong"
             }
           },
-          "end": "((?:\\b(?=[A-Z])[A-Za-z_][\\w']*)(?=[\\s]*\\.|$))|((?:\\b(?=[A-Z])[A-Za-z_][\\w']*)(?=[\\s]*(?:$|\\()))|((?:\\b(?=[A-Z])[A-Za-z_][\\w']*)(?=[\\s]*\\)))|(?![\\s\\.A-Z]|$|\\()",
+          "end": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.|$))|((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*(?:$|\\()))|((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\)))|(?![[:space:]\\.[:upper:]]|$|\\()",
           "endCaptures": {
             "1": {
               "name": "entity.name.class constant.numeric"
@@ -1464,7 +1464,7 @@
       "end": "\\)",
       "patterns": [
         {
-          "match": "((?:\\b(?=[A-Z])[A-Za-z_][\\w']*)(?=[\\s]*\\)))",
+          "match": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\)))",
           "name": "string.other.link variable.language variable.parameter emphasis"
         },
         {
@@ -1473,13 +1473,13 @@
       ]
     },
     "pathModulePrefixSimple": {
-      "begin": "(?:\\b(?=[A-Z])[A-Za-z_][\\w']*)(?=[\\s]*\\.)",
+      "begin": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.)",
       "beginCaptures": {
         "0": {
           "name": "entity.name.class constant.numeric"
         }
       },
-      "end": "(?![\\s\\.])",
+      "end": "(?![[:space:]\\.])",
       "patterns": [
         {
           "include": "#comment"
@@ -1491,7 +1491,7 @@
               "name": "keyword strong"
             }
           },
-          "end": "((?:\\b(?=[A-Z])[A-Za-z_][\\w']*)(?=[\\s]*\\.))|((?:\\b(?=[A-Z])[A-Za-z_][\\w']*)(?=[\\s]*))|(?![\\s\\.A-Z])",
+          "end": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.))|((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*))|(?![[:space:]\\.[:upper:]])",
           "endCaptures": {
             "1": {
               "name": "entity.name.class constant.numeric"
@@ -1509,7 +1509,7 @@
           "include": "#pathModulePrefixSimple"
         },
         {
-          "match": "(?:\\b(?=[A-Z])[A-Za-z_][\\w']*)",
+          "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
           "name": "entity.name.class constant.numeric"
         }
       ]
@@ -1517,8 +1517,8 @@
     "pathRecord": {
       "patterns": [
         {
-          "begin": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
-          "end": "(?=[^\\s\\.])(?!\\(\\*)",
+          "begin": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+          "end": "(?=[^[:space:]\\.])(?!\\(\\*)",
           "patterns": [
             {
               "include": "#comment"
@@ -1530,7 +1530,7 @@
                   "name": "keyword strong"
                 }
               },
-              "end": "((?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$]))|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|mutable|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*))|(?<=\\))|(?<=\\])",
+              "end": "((?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$]))|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|mutable|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(?<=\\))|(?<=\\])",
               "endCaptures": {
                 "1": {
                   "name": "keyword strong"
@@ -1745,13 +1745,13 @@
               "include": "#pathModulePrefixSimple"
             },
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]with|^with))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
           "end": "(:)|(=)|(;)|(?=\\})",
           "endCaptures": {
             "1": {
@@ -1766,7 +1766,7 @@
           },
           "patterns": [
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
@@ -1873,7 +1873,7 @@
       "end": "(?=\\))|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^\\w]with|^with))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
           "end": "\\b(?:(module)|(type))\\b",
           "endCaptures": {
             "1": {
@@ -1904,7 +1904,7 @@
           "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^\\w]functor|^functor))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]functor|^functor))(?![[:word:]]))",
               "end": "(\\(\\))|(\\((?!\\)))",
               "endCaptures": {
                 "1": {
@@ -2029,8 +2029,8 @@
     "signatureRecovered": {
       "patterns": [
         {
-          "begin": "\\(|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:|[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^\\w]include|^include|[^\\w]open|^open))(?![\\w]))",
-          "end": "\\bmodule\\b|(?!$|[\\s]|\\bmodule\\b)",
+          "begin": "\\(|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:|[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]include|^include|[^[:word:]]open|^open))(?![[:word:]]))",
+          "end": "\\bmodule\\b|(?!$|[[:space:]]|\\bmodule\\b)",
           "endCaptures": {
             "0": {
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
@@ -2038,11 +2038,11 @@
           }
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]module|^module))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
           "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^\\w]module|^module))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
               "end": "\\btype\\b",
               "endCaptures": {
                 "0": {
@@ -2051,7 +2051,7 @@
               }
             },
             {
-              "begin": "(?:(?<=(?:[^\\w]type|^type))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
               "end": "\\bof\\b",
               "endCaptures": {
                 "0": {
@@ -2060,7 +2060,7 @@
               }
             },
             {
-              "begin": "(?:(?<=(?:[^\\w]of|^of))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]of|^of))(?![[:word:]]))",
               "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
               "patterns": [
                 {
@@ -2103,7 +2103,7 @@
           "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^\\w]functor|^functor))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]functor|^functor))(?![[:word:]]))",
               "end": "(\\(\\))|(\\((?!\\)))",
               "endCaptures": {
                 "1": {
@@ -2286,7 +2286,7 @@
           "include": "#pathModulePrefixSimple"
         },
         {
-          "match": "(?:\\b(?=[A-Z])[A-Za-z_][\\w']*)",
+          "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
           "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
         }
       ]
@@ -2343,7 +2343,7 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^\\w]for|^for))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]for|^for))(?![[:word:]]))",
               "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])",
               "endCaptures": {
                 "0": {
@@ -2371,7 +2371,7 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^\\w]to|^to))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]to|^to))(?![[:word:]]))",
               "end": "\\bdo\\b",
               "endCaptures": {
                 "0": {
@@ -2385,7 +2385,7 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^\\w]do|^do))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]do|^do))(?![[:word:]]))",
               "end": "(?=\\bdone\\b)",
               "patterns": [
                 {
@@ -2411,8 +2411,8 @@
     "termLet": {
       "patterns": [
         {
-          "begin": "(?:(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=|[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?<=;|\\())(?=[\\s]|\\blet\\b)|(?:(?<=(?:[^\\w]begin|^begin|[^\\w]do|^do|[^\\w]else|^else|[^\\w]in|^in|[^\\w]struct|^struct|[^\\w]then|^then|[^\\w]try|^try))(?![\\w]))|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]@@|^@@))(?![#\\-:!?.@*/&%^+<=>|~$]))[\\s]+",
-          "end": "\\b(?:(and)|(let))\\b|(?=[^\\s])(?!\\(\\*)",
+          "begin": "(?:(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=|[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?<=;|\\())(?=[[:space:]]|\\blet\\b)|(?:(?<=(?:[^[:word:]]begin|^begin|[^[:word:]]do|^do|[^[:word:]]else|^else|[^[:word:]]in|^in|[^[:word:]]struct|^struct|[^[:word:]]then|^then|[^[:word:]]try|^try))(?![[:word:]]))|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]@@|^@@))(?![#\\-:!?.@*/&%^+<=>|~$]))[[:space:]]+",
+          "end": "\\b(?:(and)|(let))\\b|(?=[^[:space:]])(?!\\(\\*)",
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
@@ -2428,7 +2428,7 @@
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]and|^and|[^\\w]let|^let))(?![\\w]))|(let)",
+          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]let|^let))(?![[:word:]]))|(let)",
           "beginCaptures": {
             "1": {
               "name": "storage.type markup.underline"
@@ -2468,7 +2468,7 @@
     "termMatchRule": {
       "patterns": [
         {
-          "begin": "(?:(?<=(?:[^\\w]fun|^fun|[^\\w]function|^function|[^\\w]with|^with))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]fun|^fun|[^[:word:]]function|^function|[^[:word:]]with|^with))(?![[:word:]]))",
           "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(\\|)|(->)(?![#\\-:!?.@*/&%^+<=>|~$])",
           "endCaptures": {
             "1": {
@@ -2537,7 +2537,7 @@
               "name": "keyword"
             }
           },
-          "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
+          "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
           "endCaptures": {
             "0": {
               "name": "entity.name.function"
@@ -2577,7 +2577,7 @@
           "name": "variable.other.class.js message.error variable.interpolation string.regexp"
         }
       },
-      "end": ":|(?=[^\\s:])",
+      "end": ":|(?=[^[:space:]:])",
       "endCaptures": {
         "0": {
           "name": "keyword"
@@ -2586,7 +2586,7 @@
       "patterns": [
         {
           "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\?|^\\?|[^#\\-:!?.@*/&%^+<=>|~$]~|^~))(?![#\\-:!?.@*/&%^+<=>|~$]))",
-          "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
+          "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
           "endCaptures": {
             "0": {
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
@@ -2626,7 +2626,7 @@
           },
           "patterns": [
             {
-              "begin": "(?:(?<=(?:[^\\w]while|^while))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]while|^while))(?![[:word:]]))",
               "end": "\\bdo\\b",
               "endCaptures": {
                 "0": {
@@ -2640,7 +2640,7 @@
               ]
             },
             {
-              "begin": "(?:(?<=(?:[^\\w]do|^do))(?![\\w]))",
+              "begin": "(?:(?<=(?:[^[:word:]]do|^do))(?![[:word:]]))",
               "end": "(?=\\bdone\\b)",
               "patterns": [
                 {
@@ -2690,7 +2690,7 @@
     "typeConstructor": {
       "patterns": [
         {
-          "begin": "(_)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*))|(')((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*))|(?<=[^\\*]\\)|\\])",
+          "begin": "(_)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(')((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(?<=[^\\*]\\)|\\])",
           "beginCaptures": {
             "1": {
               "name": "comment constant.regexp meta.separator.markdown"
@@ -2702,7 +2702,7 @@
               "name": "keyword.control emphasis"
             }
           },
-          "end": "(?=\\((?!\\*)|\\*|:|,|=|\\.|>|-|\\{|\\[|\\+|\\}|\\)|\\]|;|\\|)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*))[\\s]*(?!\\(\\*|[\\w])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "end": "(?=\\((?!\\*)|\\*|:|,|=|\\.|>|-|\\{|\\[|\\+|\\}|\\)|\\]|;|\\|)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))[:space:]*(?!\\(\\*|[[:word:]])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
           "endCaptures": {
             "1": {
               "name": "entity.name.function strong"
@@ -2722,7 +2722,7 @@
     "typeLabel": {
       "patterns": [
         {
-          "begin": "(\\??)((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*))[\\s]*((?<![#\\-:!?.@*/&%^+<=>|~$]):(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "begin": "(\\??)((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))[[:space:]]*((?<![#\\-:!?.@*/&%^+<=>|~$]):(?![#\\-:!?.@*/&%^+<=>|~$]))",
           "captures": {
             "1": {
               "name": "keyword strong emphasis"
@@ -2791,7 +2791,7 @@
               "include": "#pathModulePrefixSimple"
             },
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
@@ -2884,13 +2884,13 @@
               "include": "#pathModulePrefixSimple"
             },
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
         },
         {
-          "begin": "(?:(?<=(?:[^\\w]with|^with))(?![\\w]))",
+          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
           "end": "(:)|(=)|(;)|(?=\\})",
           "endCaptures": {
             "1": {
@@ -2905,7 +2905,7 @@
           },
           "patterns": [
             {
-              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*)",
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
               "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
             }
           ]
@@ -2949,7 +2949,7 @@
           "name": "string.other.link variable.language variable.parameter emphasis"
         }
       },
-      "match": "(?:\\b(?=[A-Z])[A-Za-z_][\\w']*)"
+      "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)"
     },
     "variablePattern": {
       "captures": {
@@ -2960,7 +2960,7 @@
           "name": "string.other.link variable.language variable.parameter emphasis"
         }
       },
-      "match": "(\\b_\\b)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[a-z_])[A-Za-z_][\\w']*))"
+      "match": "(\\b_\\b)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))"
     }
   },
   "scopeName": "source.ocaml"