tm-grammars 1.22.18 → 1.23.0

package/grammars/fsharp.json

@@ -59,7 +59,7 @@
   ],
   "repository": {
     "abstract_definition": {
-      "begin": "\\b(static\\s+)?(abstract)\\s+(member)?(\\s+\\[\\<.*\\>\\])?\\s*([_[:alpha:]0-9,\\._`\\s]+)(<)?",
+      "begin": "\\b(static\\s+)?(abstract)\\s+(member)?(\\s+\\[<.*>])?\\s*([_[:alpha:]0-9,.`\\s]+)(<)?",
       "beginCaptures": {
         "1": {
           "name": "keyword.fsharp"
@@ -106,7 +106,7 @@
               "name": "entity.name.type.fsharp"
             }
           },
-          "match": "(\\?{0,1})([[:alpha:]0-9'`^._ ]+)\\s*(:)((?!with\\b)\\b([\\w0-9'`^._ ]+)){0,1}"
+          "match": "(\\??)([[:alpha:]0-9'`\\^._ ]+)\\s*(:)((?!with\\b)\\b([\\w0-9'`\\^._ ]+))?"
         },
         {
           "captures": {
@@ -115,7 +115,7 @@
             }
           },
           "comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
-          "match": "(?!with|get|set\\b)\\s*([\\w0-9'`^._]+)"
+          "match": "(?!with|get|set\\b)\\s*([\\w0-9'`\\^._]+)"
         },
         {
           "include": "#keywords"
@@ -175,7 +175,7 @@
           "name": "keyword.symbol.fsharp"
         }
       },
-      "end": "(\\|\\})",
+      "end": "(\\|})",
       "endCaptures": {
         "1": {
           "name": "keyword.symbol.fsharp"
@@ -188,7 +188,7 @@
               "name": "keyword.symbol.fsharp"
             }
           },
-          "match": "[[:alpha:]0-9'`^_ ]+(:)"
+          "match": "[[:alpha:]0-9'`\\^_ ]+(:)"
         },
         {
           "captures": {
@@ -196,7 +196,7 @@
               "name": "entity.name.type.fsharp"
             }
           },
-          "match": "([[:alpha:]0-9'`^_ ]+)"
+          "match": "([[:alpha:]0-9'`\\^_ ]+)"
         },
         {
           "include": "#anonymous_record_declaration"
@@ -209,8 +209,8 @@
     "attributes": {
       "patterns": [
         {
-          "begin": "\\[\\<",
-          "end": "\\>\\]|\\]",
+          "begin": "\\[<",
+          "end": ">]|]",
           "name": "support.function.attribute.fsharp",
           "patterns": [
             {
@@ -317,17 +317,17 @@
           "name": "comment.block.markdown.fsharp.end"
         },
         {
-          "begin": "(?<![!%&+-.<=>?@^|/])///(?!/)",
+          "begin": "(?<![!%\\&+-.<=>?@\\^|/])///(?!/)",
           "name": "comment.line.markdown.fsharp",
           "patterns": [
             {
               "include": "text.html.markdown"
             }
           ],
-          "while": "(?<![!%&+-.<=>?@^|/])///(?!/)"
+          "while": "(?<![!%\\&+-.<=>?@\\^|/])///(?!/)"
         },
         {
-          "match": "(?<![!%&+-.<=>?@^|/])//(.*$)",
+          "match": "(?<![!%\\&+-.<=>?@\\^|/])//(.*$)",
           "name": "comment.line.double-slash.fsharp"
         }
       ]
@@ -354,7 +354,7 @@
             }
           },
           "comments": "SRTP syntax support",
-          "end": "(\\))\\s*((?=,)|(?=\\=))",
+          "end": "(\\))\\s*((?=,)|(?==))",
           "endCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -387,7 +387,7 @@
               "name": "keyword.symbol.fsharp"
             }
           },
-          "end": "(\\)\\s*(([?[:alpha:]0-9'`^._ ]*)))",
+          "end": "(\\)\\s*(([?[:alpha:]0-9'`\\^._ ]*)))",
           "endCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -432,10 +432,10 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "([[:alpha:]0-9'^._]+)"
+              "match": "([[:alpha:]0-9'\\^._]+)"
             },
             {
-              "match": "(\\(|\\))",
+              "match": "([()])",
               "name": "keyword.symbol.fsharp"
             }
           ]
@@ -449,7 +449,7 @@
               "name": "entity.name.type.fsharp"
             }
           },
-          "match": "(:)\\s*([?[:alpha:]0-9'`^._ ]+)"
+          "match": "(:)\\s*([?[:alpha:]0-9'`\\^._ ]+)"
         },
         {
           "captures": {
@@ -463,7 +463,7 @@
               "name": "entity.name.type.fsharp"
             }
           },
-          "match": "(->)\\s*(\\()?\\s*([?[:alpha:]0-9'`^._ ]+)*"
+          "match": "(->)\\s*(\\()?\\s*([?[:alpha:]0-9'`\\^._ ]+)*"
         },
         {
           "begin": "(\\*)\\s*(\\()",
@@ -475,7 +475,7 @@
               "name": "keyword.symbol.fsharp"
             }
           },
-          "end": "(\\)\\s*(([?[:alpha:]0-9'`^._ ]+))*)",
+          "end": "(\\)\\s*(([?[:alpha:]0-9'`\\^._ ]+))*)",
           "endCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -491,7 +491,7 @@
           ]
         },
         {
-          "begin": "(\\*)(\\s*([?[:alpha:]0-9'`^._ ]+))*",
+          "begin": "(\\*)(\\s*([?[:alpha:]0-9'`\\^._ ]+))*",
           "beginCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -513,7 +513,7 @@
           ]
         },
         {
-          "begin": "(<+(?![[:space:]]*\\)))",
+          "begin": "(<+(?!\\s*\\)))",
           "beginCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -537,7 +537,7 @@
           "include": "#anonymous_record_declaration"
         },
         {
-          "begin": "({)",
+          "begin": "(\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -569,7 +569,7 @@
     "common_declaration": {
       "patterns": [
         {
-          "begin": "\\s*(->)\\s*([[:alpha:]0-9'`^._ ]+)(<)",
+          "begin": "\\s*(->)\\s*([[:alpha:]0-9'`\\^._ ]+)(<)",
           "beginCaptures": {
             "1": {
               "name": "keyword.symbol.arrow.fsharp"
@@ -594,7 +594,7 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "([[:alpha:]0-9'`^._ ]+)"
+              "match": "([[:alpha:]0-9'`\\^._ ]+)"
             },
             {
               "include": "#keywords"
@@ -610,13 +610,13 @@
               "name": "entity.name.type.fsharp"
             }
           },
-          "match": "\\s*(->)\\s*(?!with|get|set\\b)\\b([\\w0-9'`^._]+)"
+          "match": "\\s*(->)\\s*(?!with|get|set\\b)\\b([\\w0-9'`\\^._]+)"
         },
         {
           "include": "#anonymous_record_declaration"
         },
         {
-          "begin": "(\\?{0,1})([[:alpha:]0-9'`^._ ]+)\\s*(:)(\\s*([?[:alpha:]0-9'`^._ ]+)(<))",
+          "begin": "(\\??)([[:alpha:]0-9'`\\^._ ]+)\\s*(:)(\\s*([?[:alpha:]0-9'`\\^._ ]+)(<))",
           "beginCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -647,7 +647,7 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "([[:alpha:]0-9'`^._ ]+)"
+              "match": "([[:alpha:]0-9'`\\^._ ]+)"
             },
             {
               "include": "#keywords"
@@ -661,7 +661,7 @@
         {
           "captures": {
           },
-          "match": "\\s?(#if|#elif|#elseif|#else|#endif|#light|#nowarn)",
+          "match": "\\s?(#(?:if|elif|elseif|else|endif|light|nowarn))",
           "name": "keyword.control.directive.fsharp"
         }
       ]
@@ -673,11 +673,11 @@
           "name": "keyword.symbol.fsharp"
         },
         {
-          "match": "\\b-?[0-9][0-9_]*((\\.(?!\\.)([0-9][0-9_]*([eE][+-]??[0-9][0-9_]*)?)?)|([eE][+-]??[0-9][0-9_]*))",
+          "match": "\\b-?[0-9][0-9_]*((\\.(?!\\.)([0-9][0-9_]*([eE][+\\-]??[0-9][0-9_]*)?)?)|([eE][+\\-]??[0-9][0-9_]*))",
           "name": "constant.numeric.float.fsharp"
         },
         {
-          "match": "\\b(-?((0(x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(0(o|O)[0-7][0-7_]*)|(0(b|B)[01][01_]*)|([0-9][0-9_]*)))",
+          "match": "\\b(-?((0([xX])\\h[_\\h]*)|(0([oO])[0-7][0-7_]*)|(0([bB])[01][01_]*)|([0-9][0-9_]*)))",
           "name": "constant.numeric.integer.nativeint.fsharp"
         },
         {
@@ -693,7 +693,7 @@
     "definition": {
       "patterns": [
         {
-          "begin": "\\b(let mutable|static let mutable|static let|let inline|let|and|member val|member inline|static member inline|static member val|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
+          "begin": "\\b(let mutable|static let mutable|static let|let inline|let|and|member val|member inline|static member inline|static member val|static member|default|member|override|let!)(\\s+rec|mutable)?(\\s+\\[<.*>])?\\s*(private|internal|public)?\\s+(\\[[^\\-=]*]|[_[:alpha:]]([_[:alpha:]0-9.]+)*|``[_[:alpha:]]([_[:alpha:]0-9.`\\s]+|(?<=,)\\s)*)?",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -711,7 +711,7 @@
               "name": "variable.fsharp"
             }
           },
-          "end": "\\s*((with\\b)|(=|\\n+=|(?<=\\=)))",
+          "end": "\\s*((with\\b)|(=|\\n+=|(?<==)))",
           "endCaptures": {
             "2": {
               "name": "keyword.fsharp"
@@ -728,7 +728,7 @@
           ]
         },
         {
-          "begin": "\\b(use|use!|and|and!)\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
+          "begin": "\\b(use|use!|and|and!)\\s+(\\[[^\\-=]*]|[_[:alpha:]]([_[:alpha:]0-9.]+)*|``[_[:alpha:]]([_[:alpha:]0-9.`\\s]+|(?<=,)\\s)*)?",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -748,13 +748,13 @@
           ]
         },
         {
-          "begin": "(?<=with|and)\\s*\\b((get|set)\\s*(?=\\())(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9\\._`\\s]+|(?<=,)\\s)*)?",
+          "begin": "(?<=with|and)\\s*\\b((get|set)\\s*(?=\\())(\\[[^\\-=]*]|[_[:alpha:]]([_[:alpha:]0-9.]+)*|``[_[:alpha:]]([_[:alpha:]0-9.`\\s]+|(?<=,)\\s)*)?",
           "beginCaptures": {
             "4": {
               "name": "variable.fsharp"
             }
           },
-          "end": "\\s*(=|\\n+=|(?<=\\=))",
+          "end": "\\s*(=|\\n+=|(?<==))",
           "endCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -768,7 +768,7 @@
           ]
         },
         {
-          "begin": "\\b(static val mutable|val mutable|val inline|val)(\\s+rec|mutable)?(\\s+\\[\\<.*\\>\\])?\\s*(private|internal|public)?\\s+(\\[[^-=]*\\]|[_[:alpha:]]([_[:alpha:]0-9,\\._]+)*|``[_[:alpha:]]([_[:alpha:]0-9,\\._`\\s]+|(?<=,)\\s)*)?",
+          "begin": "\\b(static val mutable|val mutable|val inline|val)(\\s+rec|mutable)?(\\s+\\[<.*>])?\\s*(private|internal|public)?\\s+(\\[[^\\-=]*]|[_[:alpha:]]([_[:alpha:]0-9,.]+)*|``[_[:alpha:]]([_[:alpha:]0-9,.`\\s]+|(?<=,)\\s)*)?",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -870,7 +870,7 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "([[:alpha:]0-9'`<>^._]+|``[[:alpha:]0-9' <>^._]+``)\\s*(:)\\s*([[:alpha:]0-9'`<>^._]+|``[[:alpha:]0-9' <>^._]+``)"
+              "match": "([[:alpha:]0-9'`<>\\^._]+|``[[:alpha:]0-9' <>\\^._]+``)\\s*(:)\\s*([[:alpha:]0-9'`<>\\^._]+|``[[:alpha:]0-9' <>\\^._]+``)"
             },
             {
               "captures": {
@@ -878,7 +878,7 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "(``([[:alpha:]0-9'^._ ]+)``|[[:alpha:]0-9'`^._]+)"
+              "match": "(``([[:alpha:]0-9'\\^._ ]+)``|[[:alpha:]0-9'`\\^._]+)"
             },
             {
               "include": "#anonymous_record_declaration"
@@ -938,7 +938,7 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "(('|\\^)[[:alpha:]0-9'._]+)"
+              "match": "((['\\^])[[:alpha:]0-9'._]+)"
             },
             {
               "include": "#variables"
@@ -949,7 +949,7 @@
           ]
         },
         {
-          "match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let\\!|return\\!|return|interface|with|abstract|enum|member|try|finally|and|when|or|use|use\\!|struct|while|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b",
+          "match": "\\b(private|to|public|internal|function|yield!|yield|class|exception|match|delegate|of|new|in|as|if|then|else|elif|for|begin|end|inherit|do|let!|return!|return|interface|with|abstract|enum|member|try|finally|and|when|or|use|use!|struct|while|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b",
           "name": "keyword.fsharp"
         },
         {
@@ -965,7 +965,7 @@
               "name": "entity.name.type.fsharp"
             }
           },
-          "match": "(('|\\^)[[:alpha:]0-9'._]+)"
+          "match": "((['\\^])[[:alpha:]0-9'._]+)"
         },
         {
           "begin": "(<)",
@@ -987,7 +987,7 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "(('|\\^)[[:alpha:]0-9'._]+)"
+              "match": "((['\\^])[[:alpha:]0-9'._]+)"
             },
             {
               "include": "#tuple_signature"
@@ -1017,7 +1017,7 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "(([?[:alpha:]0-9'`^._ ]+))+"
+              "match": "(([?[:alpha:]0-9'`\\^._ ]+))+"
             },
             {
               "include": "#tuple_signature"
@@ -1031,7 +1031,7 @@
             }
           },
           "comments": "Here we need the \\w modifier in order to check that the words are allowed",
-          "match": "(?!when|and|or\\b)\\b([\\w0-9'`^._]+)"
+          "match": "(?!when|and|or\\b)\\b([\\w0-9'`\\^._]+)"
         },
         {
           "captures": {
@@ -1054,7 +1054,7 @@
           "name": "storage.modifier"
         },
         {
-          "match": "\\b(private|to|public|internal|function|class|exception|delegate|of|new|as|begin|end|inherit|let!|interface|abstract|enum|member|and|when|or|use|use\\!|struct|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b",
+          "match": "\\b(private|to|public|internal|function|class|exception|delegate|of|new|as|begin|end|inherit|let!|interface|abstract|enum|member|and|when|or|use|use!|struct|mutable|assert|base|done|downcast|downto|extern|fixed|global|lazy|upcast|not)(?!')\\b",
           "name": "keyword.fsharp"
         },
         {
@@ -1062,11 +1062,11 @@
           "name": "keyword.control"
         },
         {
-          "match": "(\\->|\\<\\-)",
+          "match": "(->|<-)",
           "name": "keyword.symbol.arrow.fsharp"
         },
         {
-          "match": "[.?]*(&&&|\\|\\|\\||\\^\\^\\^|~~~|~\\+|~\\-|<<<|>>>|\\|>|:>|:\\?>|:|\\[|\\]|\\;|<>|=|@|\\|\\||&&|&|%|{|}|\\||_|\\.\\.|\\,|\\+|\\-|\\*|\\/|\\^|\\!|\\>|\\>\\=|\\>\\>|\\<|\\<\\=|\\(|\\)|\\<\\<)[.?]*",
+          "match": "[.?]*(&&&|\\|\\|\\||\\^\\^\\^|~~~|~\\+|~-|<<<|>>>|\\|>|:>|:\\?>|[:\\[\\];]|<>|[=@]|\\|\\||&&|[\\&%{}|_]|\\.\\.|[,+\\-*/\\^!>]|>=|>>|<|<=|[()]|<<)[.?]*",
           "name": "keyword.symbol.fsharp"
         }
       ]
@@ -1093,7 +1093,7 @@
             }
           },
           "comments": "SRTP syntax support",
-          "end": "(\\))\\s*((?=,)|(?=\\=))",
+          "end": "(\\))\\s*((?=,)|(?==))",
           "endCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -1148,7 +1148,7 @@
           "name": "keyword.fsharp"
         },
         {
-          "match": "(\\(|\\))",
+          "match": "([()])",
           "name": "keyword.symbol.fsharp"
         },
         {
@@ -1166,7 +1166,7 @@
               "name": "entity.name.type.fsharp"
             }
           },
-          "match": "(\\?{0,1})([[:alpha:]0-9'`^._]+|``[[:alpha:]0-9'`^:,._ ]+``)\\s*(:{0,1})(\\s*([?[:alpha:]0-9'`<>._ ]+)){0,1}"
+          "match": "(\\??)([[:alpha:]0-9'`\\^._]+|``[[:alpha:]0-9'`\\^:,._ ]+``)\\s*(:?)(\\s*([?[:alpha:]0-9'`<>._ ]+))?"
         },
         {
           "include": "#keywords"
@@ -1176,7 +1176,7 @@
     "modules": {
       "patterns": [
         {
-          "begin": "\\b(namespace global)|\\b(namespace|module)\\s*(public|internal|private|rec)?\\s+([[:alpha:]|``][[:alpha:]0-9'_. ]*)",
+          "begin": "\\b(?:(namespace global)|(namespace|module)\\s*(public|internal|private|rec)?\\s+([[:alpha:]|`][[:alpha:]0-9'_. ]*))",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -1214,7 +1214,7 @@
           ]
         },
         {
-          "begin": "\\b(open type|open)\\s+([[:alpha:]|``][[:alpha:]0-9'_]*)(?=(\\.[A-Z][[:alpha:]0-9_]*)*)",
+          "begin": "\\b(open(?: type|))\\s+([[:alpha:]|`][[:alpha:]0-9'_]*)(?=(\\.[A-Z][[:alpha:]0-9_]*)*)",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -1235,7 +1235,7 @@
                   "name": "entity.name.section.fsharp"
                 }
               },
-              "match": "(\\.)([[:alpha:]][[:alpha:]0-9'_]*)",
+              "match": "(\\.)(\\p{alpha}[[:alpha:]0-9'_]*)",
               "name": "entity.name.section.fsharp"
             },
             {
@@ -1287,13 +1287,13 @@
               "name": "keyword.symbol.fsharp"
             }
           },
-          "end": "(?<=\\})",
+          "end": "(?<=})",
           "patterns": [
             {
               "include": "#comments"
             },
             {
-              "begin": "(((mutable)\\s[[:alpha:]]+)|[[:alpha:]0-9'`<>^._]*)\\s*((?<!:):(?!:))\\s*",
+              "begin": "(((mutable)\\s\\p{alpha}+)|[[:alpha:]0-9'`<>\\^._]*)\\s*((?<!:):(?!:))\\s*",
               "beginCaptures": {
                 "3": {
                   "name": "keyword.fsharp"
@@ -1302,7 +1302,7 @@
                   "name": "keyword.symbol.fsharp"
                 }
               },
-              "end": "$|(;|\\})",
+              "end": "$|([;}])",
               "endCaptures": {
                 "1": {
                   "name": "keyword.symbol.fsharp"
@@ -1318,7 +1318,7 @@
                       "name": "entity.name.type.fsharp"
                     }
                   },
-                  "match": "([[:alpha:]0-9'`^_ ]+)"
+                  "match": "([[:alpha:]0-9'`\\^_ ]+)"
                 },
                 {
                   "include": "#keywords"
@@ -1373,10 +1373,10 @@
               "name": "variable.parameter.fsharp"
             }
           },
-          "match": "[[:alpha:]0-9'`^_ ]+(=)([[:alpha:]0-9'`^_ ]+)"
+          "match": "[[:alpha:]0-9'`\\^_ ]+(=)([[:alpha:]0-9'`\\^_ ]+)"
         },
         {
-          "begin": "({)",
+          "begin": "(\\{)",
           "beginCaptures": {
             "1": {
               "name": "keyword.symbol.fsharp"
@@ -1398,7 +1398,7 @@
                   "name": "variable.parameter.fsharp"
                 }
               },
-              "match": "[[:alpha:]0-9'`^_ ]+(=)([[:alpha:]0-9'`^_ ]+)"
+              "match": "[[:alpha:]0-9'`\\^_ ]+(=)([[:alpha:]0-9'`\\^_ ]+)"
             },
             {
               "include": "#record_signature"
@@ -1413,7 +1413,7 @@
     "records": {
       "patterns": [
         {
-          "begin": "\\b(type)[\\s]+(private|internal|public)?\\s*",
+          "begin": "\\b(type)\\s+(private|internal|public)?\\s*",
           "beginCaptures": {
             "1": {
               "name": "keyword.fsharp"
@@ -1457,7 +1457,7 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "([[:alpha:]0-9'^._]+|``[[:alpha:]0-9'`^:,._ ]+``)"
+              "match": "([[:alpha:]0-9'\\^._]+|``[[:alpha:]0-9'`\\^:,._ ]+``)"
             },
             {
               "begin": "(<)",
@@ -1479,7 +1479,7 @@
                       "name": "entity.name.type.fsharp"
                     }
                   },
-                  "match": "(('|\\^)``[[:alpha:]0-9`^:,._ ]+``|('|\\^)[[:alpha:]0-9`^:._]+)"
+                  "match": "((['\\^])``[[:alpha:]0-9`\\^:,._ ]+``|(['\\^])[[:alpha:]0-9`\\^:._]+)"
                 },
                 {
                   "match": "\\b(interface|with|abstract|and|when|or|not|struct|equality|comparison|unmanaged|delegate|enum)\\b",
@@ -1519,7 +1519,7 @@
                     }
                   },
                   "comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
-                  "match": "([\\w0-9'`^._]+)"
+                  "match": "([\\w0-9'`\\^._]+)"
                 },
                 {
                   "include": "#keywords"
@@ -1568,7 +1568,7 @@
               "name": "keyword.format.specifier.fsharp"
             }
           },
-          "match": "(%0?-?(\\d+)?((a|t)|(\\.\\d+)?(f|F|e|E|g|G|M)|(b|c|s|d|i|x|X|o|u)|(s|b|O)|(\\+?A)))",
+          "match": "(%0?-?(\\d+)?(([at])|(\\.\\d+)?([fFeEgGM])|([bcsdixXou])|([sbO])|(\\+?A)))",
           "name": "entity.name.type.format.specifier.fsharp"
         }
       ]
@@ -1636,11 +1636,11 @@
               "name": "punctuation.separator.string.ignore-eol.fsharp"
             },
             {
-              "match": "\\\\(['\"\\\\abfnrtv]|([01][0-9][0-9]|2[0-4][0-9]|25[0-5])|(x[0-9a-fA-F]{2})|(u[0-9a-fA-F]{4})|(U00(0[0-9a-fA-F]|10)[0-9a-fA-F]{4}))",
+              "match": "\\\\(['\"\\\\abfnrtv]|([01][0-9][0-9]|2[0-4][0-9]|25[0-5])|(x\\h{2})|(u\\h{4})|(U00(0\\h|10)\\h{4}))",
               "name": "constant.character.string.escape.fsharp"
             },
             {
-              "match": "\\\\(([0-9]{1,3})|(x[^\\s]{0,2})|(u[^\\s]{0,4})|(U[^\\s]{0,8})|[^\\s])",
+              "match": "\\\\(([0-9]{1,3})|(x\\S{0,2})|(u\\S{0,4})|(U\\S{0,8})|\\S)",
               "name": "invalid.illegal.character.string.fsharp"
             },
             {
@@ -1724,7 +1724,7 @@
               "name": "keyword.symbol.fsharp"
             }
           },
-          "match": "(static member|member)\\s*([[:alpha:]0-9'`<>^._]+|``[[:alpha:]0-9' <>^._]+``)\\s*(:)"
+          "match": "(static member|member)\\s*([[:alpha:]0-9'`<>\\^._]+|``[[:alpha:]0-9' <>\\^._]+``)\\s*(:)"
         },
         {
           "include": "#compiler_directives"
@@ -1780,7 +1780,7 @@
               "name": "entity.name.type.fsharp"
             }
           },
-          "match": "(([?[:alpha:]0-9'`^._ ]+))+"
+          "match": "(([?[:alpha:]0-9'`\\^._ ]+))+"
         },
         {
           "begin": "(\\()",
@@ -1802,7 +1802,7 @@
                   "name": "entity.name.type.fsharp"
                 }
               },
-              "match": "(([?[:alpha:]0-9'`^._ ]+))+"
+              "match": "(([?[:alpha:]0-9'`\\^._ ]+))+"
             },
             {
               "include": "#tuple_signature"
@@ -1829,7 +1829,7 @@
               "name": "variable.parameter.fsharp"
             }
           },
-          "match": "(\\?{0,1})(``[[:alpha:]0-9'`^:,._ ]+``|(?!private|struct\\b)\\b[\\w[:alpha:]0-9'`<>^._ ]+)"
+          "match": "(\\??)(``[[:alpha:]0-9'`\\^:,._ ]+``|(?!private|struct\\b)\\b[\\w[:alpha:]0-9'`<>\\^._ ]+)"
         }
       ]
     }