github-linguist 5.3.3 → 6.0.0

data/grammars/source.ocaml.json

@@ -1,14 +1,10 @@
 {
-  "fileTypes": [
-    "ml",
-    "mli"
-  ],
-  "foldingStartMarker": "(\\b(module|class|)\\s.*?=\\s*$|\\bbegin|sig|struct|(object(\\s*\\(_?[a-z]+\\))?)\\s*$|\\bwhile\\s.*?\\bdo\\s*$|^let(?:\\s+rec)?\\s+[a-z_][a-zA-Z0-9_]*\\s+(?!=)\\S)",
-  "foldingStopMarker": "(\\bend(\\s+in)?[ \\t]*(;{1,2}|=)?|\\bdone;?|^\\s*;;|^\\s*in)[ \\t]*$",
-  "keyEquivalent": "^~O",
   "name": "OCaml",
+  "scopeName": "source.ocaml",
   "patterns": [
     {
+      "name": "meta.module.binding",
+      "match": "\\b(let)\\s+(module)\\s+([A-Z][a-zA-Z0-9'_]*)\\s*(=)",
       "captures": {
         "1": {
           "name": "keyword.other.module-binding.ocaml"
@@ -22,12 +18,23 @@
         "4": {
           "name": "punctuation.separator.module-binding.ocmal"
         }
-      },
-      "match": "\\b(let)\\s+(module)\\s+([A-Z][a-zA-Z0-9'_]*)\\s*(=)",
-      "name": "meta.module.binding"
+      }
     },
     {
+      "name": "meta.module.openbinding",
       "begin": "\\b(let)\\s+(open)\\s+([A-Z][a-zA-Z0-9'_]*)(?=(\\.[A-Z][a-zA-Z0-9_]*)*)",
+      "end": "(\\s|$)",
+      "patterns": [
+        {
+          "name": "support.other.module.ocaml",
+          "match": "(\\.)([A-Z][a-zA-Z0-9'_]*)",
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.module-reference.ocaml"
+            }
+          }
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.module-binding.ocaml"
@@ -38,23 +45,17 @@
         "3": {
           "name": "support.other.module.ocaml"
         }
-      },
-      "end": "(\\s|$)",
-      "name": "meta.module.openbinding",
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "punctuation.separator.module-reference.ocaml"
-            }
-          },
-          "match": "(\\.)([A-Z][a-zA-Z0-9'_]*)",
-          "name": "support.other.module.ocaml"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.function.ocaml",
       "begin": "\\b(let|and)\\s+(?!\\(\\*)((rec\\s+)([a-z_][a-zA-Z0-9_']*)\\b|([a-z_][a-zA-Z0-9_']*|\\([^)]+\\))(?=\\s)((?=\\s*=\\s*(?=fun(?:ction)\\b))|(?!\\s*=)))",
+      "end": "(?:(:)\\s*([^=]+))?(?:(=)|(=)\\s*(?=fun(?:ction)\\b))",
+      "patterns": [
+        {
+          "include": "#variables"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.function-definition.ocaml"
@@ -69,7 +70,6 @@
           "name": "entity.name.function.ocaml"
         }
       },
-      "end": "(?:(:)\\s*([^=]+))?(?:(=)|(=)\\s*(?=fun(?:ction)\\b))",
       "endCaptures": {
         "1": {
           "name": "punctuation.separator.function.type-constraint.ocaml"
@@ -83,61 +83,62 @@
         "4": {
           "name": "keyword.operator.ocaml"
         }
-      },
-      "name": "meta.function.ocaml",
-      "patterns": [
-        {
-          "include": "#variables"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.function.anonymous.ocaml",
       "begin": "(\\(|\\s)(?=fun\\s)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.function.anonymous.ocaml"
-        }
-      },
       "end": "(\\))",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.function.anonymous.ocaml"
-        }
-      },
-      "name": "meta.function.anonymous.ocaml",
       "patterns": [
         {
-          "begin": "(?<=(\\(|\\s))(fun)\\s",
+          "name": "meta.function.anonymous.definition.ocaml",
+          "begin": "(?\u003c=(\\(|\\s))(fun)\\s",
+          "end": "(-\u003e)",
+          "patterns": [
+            {
+              "include": "#variables"
+            }
+          ],
           "beginCaptures": {
             "2": {
               "name": "keyword.other.function-definition.ocaml"
             }
           },
-          "end": "(->)",
           "endCaptures": {
             "1": {
               "name": "punctuation.separator.function-definition.ocaml"
             }
-          },
-          "name": "meta.function.anonymous.definition.ocaml",
-          "patterns": [
-            {
-              "include": "#variables"
-            }
-          ]
+          }
         },
         {
           "include": "$self"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.function.anonymous.ocaml"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.function.anonymous.ocaml"
+        }
+      }
     },
     {
+      "name": "meta.type-definition-group.ocaml",
       "begin": "^\\s*(?=type\\s)",
       "end": "\\b(?=let|end|val)|^\\s*$",
-      "name": "meta.type-definition-group.ocaml",
       "patterns": [
         {
+          "name": "meta.type-definition.ocaml",
           "begin": "\\b(type|and)\\s+([^=]*)(=)?",
+          "end": "(?=\\b(type|and|let|end|val)\\b)|(?=^\\s*$)",
+          "patterns": [
+            {
+              "include": "#typedefs"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.other.type-definition.ocaml"
@@ -148,19 +149,19 @@
             "3": {
               "name": "punctuation.separator.type-definition.ocaml"
             }
-          },
-          "end": "(?=\\b(type|and|let|end|val)\\b)|(?=^\\s*$)",
-          "name": "meta.type-definition.ocaml",
-          "patterns": [
-            {
-              "include": "#typedefs"
-            }
-          ]
+          }
         }
       ]
     },
     {
-      "begin": "\\b(with|function)(?=(\\s*$|.*->))\\b|((?<!\\S)(\\|)(?=(\\w|\\s).*->))",
+      "name": "meta.pattern-match.ocaml",
+      "begin": "\\b(with|function)(?=(\\s*$|.*-\u003e))\\b|((?\u003c!\\S)(\\|)(?=(\\w|\\s).*-\u003e))",
+      "end": "(?:(-\u003e)|\\b(when)\\b|\\s(?=\\|))",
+      "patterns": [
+        {
+          "include": "#matchpatterns"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.match-definition.ocaml"
@@ -172,7 +173,6 @@
           "name": "keyword.control.match-definition.ocaml"
         }
       },
-      "end": "(?:(->)|\\b(when)\\b|\\s(?=\\|))",
       "endCaptures": {
         "1": {
           "name": "punctuation.separator.match-definition.ocaml"
@@ -180,15 +180,11 @@
         "2": {
           "name": "keyword.control.match-condition.ocaml"
         }
-      },
-      "name": "meta.pattern-match.ocaml",
-      "patterns": [
-        {
-          "include": "#matchpatterns"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.class.type-definition.ocaml",
+      "match": "^[ \\t]*(class\\s+type\\s+)((\\[\\s*('[A-Za-z][a-zA-Z0-9_']*(?:\\s*,\\s*'[A-Za-z][a-zA-Z0-9_']*)*)\\s*\\]\\s+)?[a-z_][a-zA-Z0-9'_]*)",
       "captures": {
         "1": {
           "name": "keyword.other.class-type-definition.ocaml"
@@ -199,12 +195,17 @@
         "4": {
           "name": "storage.type.ocaml"
         }
-      },
-      "match": "^[ \\t]*(class\\s+type\\s+)((\\[\\s*('[A-Za-z][a-zA-Z0-9_']*(?:\\s*,\\s*'[A-Za-z][a-zA-Z0-9_']*)*)\\s*\\]\\s+)?[a-z_][a-zA-Z0-9'_]*)",
-      "name": "meta.class.type-definition.ocaml"
+      }
     },
     {
+      "name": "meta.class.ocaml",
       "begin": "^[ \\t]*(class)(?:\\s+(?!(?:virtual)\\s+))((\\[\\s*('[A-Za-z][a-zA-Z0-9_']*(?:\\s*,\\s*'[A-Za-z][a-zA-Z0-9_']*)*)\\s*\\]\\s+)?[a-z_][a-zA-Z0-9'_]*)",
+      "end": "(=)",
+      "patterns": [
+        {
+          "include": "#variables"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.class-definition.ocaml"
@@ -216,21 +217,21 @@
           "name": "storage.type.ocaml"
         }
       },
-      "end": "(=)",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.ocaml"
         }
-      },
-      "name": "meta.class.ocaml",
+      }
+    },
+    {
+      "name": "meta.class.virtual.ocaml",
+      "begin": "^[ \\t]*(class\\s+virtual\\s+)((\\[\\s*('[A-Za-z][a-zA-Z0-9_']*(?:\\s*,\\s*'[A-Za-z][a-zA-Z0-9_']*)*)\\s*\\]\\s+)?[a-z_][a-zA-Z0-9'_]*)",
+      "end": "(=)",
       "patterns": [
         {
           "include": "#variables"
         }
-      ]
-    },
-    {
-      "begin": "^[ \\t]*(class\\s+virtual\\s+)((\\[\\s*('[A-Za-z][a-zA-Z0-9_']*(?:\\s*,\\s*'[A-Za-z][a-zA-Z0-9_']*)*)\\s*\\]\\s+)?[a-z_][a-zA-Z0-9'_]*)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.class-definition.ocaml"
@@ -242,20 +243,15 @@
           "name": "storage.type.ocaml"
         }
       },
-      "end": "(=)",
       "endCaptures": {
         "1": {
           "name": "keyword.operator.ocaml"
         }
-      },
-      "name": "meta.class.virtual.ocaml",
-      "patterns": [
-        {
-          "include": "#variables"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.class.virtual.type-definition.ocaml",
+      "match": "^[ \\t]*(class\\s+type\\s+virtual)((\\[\\s*('[A-Za-z][a-zA-Z0-9_']*(?:\\s*,\\s*'[A-Za-z][a-zA-Z0-9_']*)*)\\s*\\]\\s+)?[a-z_][a-zA-Z0-9'_]*)",
       "captures": {
         "1": {
           "name": "keyword.other.class-type-definition.ocaml"
@@ -266,31 +262,26 @@
         "4": {
           "name": "storage.type.ocaml"
         }
-      },
-      "match": "^[ \\t]*(class\\s+type\\s+virtual)((\\[\\s*('[A-Za-z][a-zA-Z0-9_']*(?:\\s*,\\s*'[A-Za-z][a-zA-Z0-9_']*)*)\\s*\\]\\s+)?[a-z_][a-zA-Z0-9'_]*)",
-      "name": "meta.class.virtual.type-definition.ocaml"
+      }
     },
     {
+      "name": "meta.record.ocaml",
       "begin": "(\\{)",
-      "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.record.ocaml"
-        }
-      },
       "end": "(\\})",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.record.ocaml"
-        }
-      },
-      "name": "meta.record.ocaml",
       "patterns": [
         {
-          "match": "\\bwith\\b",
-          "name": "keyword.other.language.ocaml"
+          "name": "keyword.other.language.ocaml",
+          "match": "\\bwith\\b"
         },
         {
+          "name": "meta.record.definition.ocaml",
           "begin": "(\\bmutable\\s+)?\\b([a-z_][a-zA-Z0-9_']*)\\s*(:)",
+          "end": "(;|(?=}))",
+          "patterns": [
+            {
+              "include": "#typedefs"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.other.storage.modifier.ocaml"
@@ -302,53 +293,41 @@
               "name": "punctuation.definition.record.ocaml"
             }
           },
-          "end": "(;|(?=}))",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.ocaml"
             }
-          },
-          "name": "meta.record.definition.ocaml",
-          "patterns": [
-            {
-              "include": "#typedefs"
-            }
-          ]
+          }
         },
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "\\b(object)\\s*(?:(\\()(_?[a-z]+)(\\)))?\\s*$",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.other.object-definition.ocaml"
-        },
-        "2": {
-          "name": "punctuation.definition.self-binding.ocaml"
-        },
-        "3": {
-          "name": "entity.name.type.self-binding.ocaml"
-        },
-        "4": {
-          "name": "punctuation.definition.self-binding.ocaml"
+          "name": "punctuation.definition.record.ocaml"
         }
       },
-      "end": "\\b(end)\\b",
       "endCaptures": {
         "1": {
-          "name": "keyword.control.object.ocaml"
-        },
-        "2": {
-          "name": "punctuation.terminator.expression.ocaml"
+          "name": "punctuation.definition.record.ocaml"
         }
-      },
+      }
+    },
+    {
       "name": "meta.object.ocaml",
+      "begin": "\\b(object)\\s*(?:(\\()(_?[a-z]+)(\\)))?\\s*$",
+      "end": "\\b(end)\\b",
       "patterns": [
         {
+          "name": "meta.method.ocaml",
           "begin": "\\b(method)\\s+(virtual\\s+)?(private\\s+)?([a-z_][a-zA-Z0-9'_]*)",
+          "end": "(=|:)",
+          "patterns": [
+            {
+              "include": "#variables"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.other.method-definition.ocaml"
@@ -363,21 +342,16 @@
               "name": "entity.name.function.method.ocaml"
             }
           },
-          "end": "(=|:)",
           "endCaptures": {
             "1": {
               "name": "keyword.operator.ocaml"
             }
-          },
-          "name": "meta.method.ocaml",
-          "patterns": [
-            {
-              "include": "#variables"
-            }
-          ]
+          }
         },
         {
+          "name": "meta.object.type-constraint.ocaml",
           "begin": "(constraint)\\s+([a-z_'][a-zA-Z0-9'_]*)\\s+(=)",
+          "end": "(#[a-z_][a-zA-Z0-9'_]*)|(int|char|float|string|list|array|bool|unit|exn|option|int32|int64|nativeint|format4|lazy_t)|([a-z_][a-zA-Z0-9'_]*)\\s*$",
           "beginCaptures": {
             "1": {
               "name": "keyword.other.language.ocaml"
@@ -389,7 +363,6 @@
               "name": "keyword.operator.ocaml"
             }
           },
-          "end": "(#[a-z_][a-zA-Z0-9'_]*)|(int|char|float|string|list|array|bool|unit|exn|option|int32|int64|nativeint|format4|lazy_t)|([a-z_][a-zA-Z0-9'_]*)\\s*$",
           "endCaptures": {
             "1": {
               "name": "storage.type.polymorphic-variant.ocaml"
@@ -400,24 +373,47 @@
             "3": {
               "name": "storage.type.ocaml"
             }
-          },
-          "name": "meta.object.type-constraint.ocaml"
+          }
         },
         {
           "include": "$self"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.object-definition.ocaml"
+        },
+        "2": {
+          "name": "punctuation.definition.self-binding.ocaml"
+        },
+        "3": {
+          "name": "entity.name.type.self-binding.ocaml"
+        },
+        "4": {
+          "name": "punctuation.definition.self-binding.ocaml"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "keyword.control.object.ocaml"
+        },
+        "2": {
+          "name": "punctuation.terminator.expression.ocaml"
+        }
+      }
     },
     {
+      "name": "meta.method-call.ocaml",
+      "match": "(?\u003c=\\w|\\)|')(#)[a-z_][a-zA-Z0-9'_]*",
       "captures": {
         "1": {
           "name": "punctuation.separator.method-call.ocaml"
         }
-      },
-      "match": "(?<=\\w|\\)|')(#)[a-z_][a-zA-Z0-9'_]*",
-      "name": "meta.method-call.ocaml"
+      }
     },
     {
+      "name": "meta.module.ocaml",
+      "match": "^[ \\t]*(module)\\s+([A-Z_][a-zA-Z0-9'_]*)(?:\\s*(:)\\s*([A-Z][a-zA-Z0-9'_]*)?)?",
       "captures": {
         "1": {
           "name": "keyword.other.module-definition.ocaml"
@@ -431,11 +427,11 @@
         "4": {
           "name": "entity.name.type.module-type.ocaml"
         }
-      },
-      "match": "^[ \\t]*(module)\\s+([A-Z_][a-zA-Z0-9'_]*)(?:\\s*(:)\\s*([A-Z][a-zA-Z0-9'_]*)?)?",
-      "name": "meta.module.ocaml"
+      }
     },
     {
+      "name": "meta.module.type.ocaml",
+      "match": "^[ \\t]*(module\\s+type\\s+)([A-Z][a-zA-Z0-9'_]*)",
       "captures": {
         "1": {
           "name": "keyword.other.module-type-definition.ocaml"
@@ -443,18 +439,25 @@
         "2": {
           "name": "entity.name.type.module-type.ocaml"
         }
-      },
-      "match": "^[ \\t]*(module\\s+type\\s+)([A-Z][a-zA-Z0-9'_]*)",
-      "name": "meta.module.type.ocaml"
+      }
     },
     {
+      "name": "meta.module.signature.ocaml",
       "begin": "\\b(sig)\\b",
+      "end": "\\b(end)\\b",
+      "patterns": [
+        {
+          "include": "#module-signature"
+        },
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.module.signature.ocaml"
         }
       },
-      "end": "\\b(end)\\b",
       "endCaptures": {
         "1": {
           "name": "keyword.other.module.signature.ocaml"
@@ -465,65 +468,58 @@
         "3": {
           "name": "keyword.operator.ocaml"
         }
-      },
-      "name": "meta.module.signature.ocaml",
+      }
+    },
+    {
+      "name": "meta.module.structure.ocaml",
+      "begin": "\\b(struct)\\b",
+      "end": "\\b(end)\\b",
       "patterns": [
-        {
-          "include": "#module-signature"
-        },
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "\\b(struct)\\b",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other.module.structure.ocaml"
         }
       },
-      "end": "\\b(end)\\b",
       "endCaptures": {
         "1": {
           "name": "keyword.other.module.structure.ocaml"
         }
-      },
-      "name": "meta.module.structure.ocaml",
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     {
       "include": "#moduleref"
     },
     {
+      "name": "meta.module.open.ocaml",
       "begin": "\\b(open)\\s+([A-Z][a-zA-Z0-9'_]*)(?=(\\.[A-Z][a-zA-Z0-9_]*)*)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other.ocaml"
-        },
-        "2": {
-          "name": "support.other.module.ocaml"
-        }
-      },
       "end": "(\\s|$)",
-      "name": "meta.module.open.ocaml",
       "patterns": [
         {
+          "name": "support.other.module.ocaml",
+          "match": "(\\.)([A-Z][a-zA-Z0-9'_]*)",
           "captures": {
             "1": {
               "name": "punctuation.separator.module-reference.ocaml"
             }
-          },
-          "match": "(\\.)([A-Z][a-zA-Z0-9'_]*)",
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.ocaml"
+        },
+        "2": {
           "name": "support.other.module.ocaml"
         }
-      ]
+      }
     },
     {
+      "name": "meta.exception.ocaml",
+      "match": "\\b(exception)\\s+([A-Z][a-zA-Z0-9'_]*)\\b",
       "captures": {
         "1": {
           "name": "keyword.other.ocaml"
@@ -531,24 +527,22 @@
         "2": {
           "name": "entity.name.type.exception.ocaml"
         }
-      },
-      "match": "\\b(exception)\\s+([A-Z][a-zA-Z0-9'_]*)\\b",
-      "name": "meta.exception.ocaml"
+      }
     },
     {
-      "begin": "(?=(\\[<)(?![^\\[]+?[^>]]))",
-      "end": "(>])",
-      "endCaptures": {
-        "1": {
-          "name": "punctuation.definition.camlp4-stream.ocaml"
-        }
-      },
       "name": "source.camlp4.embedded.ocaml",
+      "begin": "(?=(\\[\u003c)(?![^\\[]+?[^\u003e]]))",
+      "end": "(\u003e])",
       "patterns": [
         {
           "include": "source.camlp4.ocaml"
         }
-      ]
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.camlp4-stream.ocaml"
+        }
+      }
     },
     {
       "include": "#strings"
@@ -566,13 +560,19 @@
       "include": "#arrays"
     },
     {
-      "begin": "(\\()(?=(~[a-z][a-zA-Z0-9_]*:|(\"(\\\\\"|[^\"])*\")|[^\\(\\)~\"])+(?<!:)(:>|:(?![:=])))",
+      "name": "meta.type-constraint.ocaml",
+      "begin": "(\\()(?=(~[a-z][a-zA-Z0-9_]*:|(\"(\\\\\"|[^\"])*\")|[^\\(\\)~\"])+(?\u003c!:)(:\u003e|:(?![:=])))",
+      "end": "(?\u003c!:)(:\u003e|:(?![:=]))(.*?)(\\))",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "punctuation.section.type-constraint.ocaml"
         }
       },
-      "end": "(?<!:)(:>|:(?![:=]))(.*?)(\\))",
       "endCaptures": {
         "1": {
           "name": "punctuation.separator.type-constraint.ocaml"
@@ -583,154 +583,148 @@
         "3": {
           "name": "punctuation.section.type-constraint.ocaml"
         }
-      },
-      "name": "meta.type-constraint.ocaml",
-      "patterns": [
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     {
-      "match": "^[ \\t]*#[a-zA-Z]+",
-      "name": "keyword.other.directive.ocaml"
+      "name": "keyword.other.directive.ocaml",
+      "match": "^[ \\t]*#[a-zA-Z]+"
     },
     {
-      "match": "^[ \\t]*#[0-9]*",
-      "name": "keyword.other.directive.line-number.ocaml"
+      "name": "keyword.other.directive.line-number.ocaml",
+      "match": "^[ \\t]*#[0-9]*"
     },
     {
       "include": "#storagetypes"
     },
     {
-      "match": "\\b(mutable|ref)\\b",
-      "name": "keyword.other.storage.modifier.ocaml"
+      "name": "keyword.other.storage.modifier.ocaml",
+      "match": "\\b(mutable|ref)\\b"
     },
     {
-      "match": "`[A-Za-z][a-zA-Z0-9'_]*\\b",
-      "name": "entity.name.type.variant.polymorphic.ocaml"
+      "name": "entity.name.type.variant.polymorphic.ocaml",
+      "match": "`[A-Za-z][a-zA-Z0-9'_]*\\b"
     },
     {
-      "match": "\\b[A-Z][a-zA-Z0-9'_]*\\b",
-      "name": "entity.name.type.variant.ocaml"
+      "name": "entity.name.type.variant.ocaml",
+      "match": "\\b[A-Z][a-zA-Z0-9'_]*\\b"
     },
     {
-      "match": "!=|:=|>|<",
-      "name": "keyword.operator.symbol.ocaml"
+      "name": "keyword.operator.symbol.ocaml",
+      "match": "!=|:=|\u003e|\u003c"
     },
     {
-      "match": "[*+/-]\\.",
-      "name": "keyword.operator.infix.floating-point.ocaml"
+      "name": "keyword.operator.infix.floating-point.ocaml",
+      "match": "[*+/-]\\."
     },
     {
-      "match": "~-\\.",
-      "name": "keyword.operator.prefix.floating-point.ocaml"
+      "name": "keyword.operator.prefix.floating-point.ocaml",
+      "match": "~-\\."
     },
     {
-      "match": "::",
-      "name": "punctuation.definition.list.constructor.ocaml"
+      "name": "punctuation.definition.list.constructor.ocaml",
+      "match": "::"
     },
     {
-      "match": ";;",
-      "name": "punctuation.terminator.expression.ocaml"
+      "name": "punctuation.terminator.expression.ocaml",
+      "match": ";;"
     },
     {
-      "match": ";",
-      "name": "punctuation.separator.ocaml"
+      "name": "punctuation.separator.ocaml",
+      "match": ";"
     },
     {
-      "match": "->",
-      "name": "punctuation.separator.function-return.ocaml"
+      "name": "punctuation.separator.function-return.ocaml",
+      "match": "-\u003e"
     },
     {
-      "match": "[=<>@^&+\\-*/$%|][|!$%&*+./:<=>?@^~-]*",
-      "name": "keyword.operator.infix.ocaml"
+      "name": "keyword.operator.infix.ocaml",
+      "match": "[=\u003c\u003e@^\u0026+\\-*/$%|][|!$%\u0026*+./:\u003c=\u003e?@^~-]*"
     },
     {
-      "match": "\\bnot\\b|!|[!\\?~][!$%&*+./:<=>?@^~-]+",
-      "name": "keyword.operator.prefix.ocaml"
+      "name": "keyword.operator.prefix.ocaml",
+      "match": "\\bnot\\b|!|[!\\?~][!$%\u0026*+./:\u003c=\u003e?@^~-]+"
     },
     {
+      "name": "entity.name.tag.label.ocaml",
+      "match": "~[a-z][a-z0-9'_]*(:)?",
       "captures": {
         "1": {
           "name": "punctuation.separator.argument-label.ocaml"
         }
-      },
-      "match": "~[a-z][a-z0-9'_]*(:)?",
-      "name": "entity.name.tag.label.ocaml"
+      }
     },
     {
+      "name": "meta.begin-end-group.ocaml",
       "begin": "\\b(begin)\\b",
+      "end": "\\b(end)\\b",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.begin-end.ocaml"
         }
       },
-      "end": "\\b(end)\\b",
       "endCaptures": {
         "1": {
           "name": "keyword.control.begin-end.ocaml"
         }
-      },
-      "name": "meta.begin-end-group.ocaml",
+      }
+    },
+    {
+      "name": "meta.for-loop.ocaml",
+      "begin": "\\b(for)\\b",
+      "end": "\\b(done)\\b",
       "patterns": [
+        {
+          "name": "keyword.control.loop.ocaml",
+          "match": "\\bdo\\b"
+        },
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "\\b(for)\\b",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.for-loop.ocaml"
         }
       },
-      "end": "\\b(done)\\b",
       "endCaptures": {
         "1": {
           "name": "keyword.control.for-loop.ocaml"
         }
-      },
-      "name": "meta.for-loop.ocaml",
+      }
+    },
+    {
+      "name": "meta.while-loop.ocaml",
+      "begin": "\\b(while)\\b",
+      "end": "\\b(done)\\b",
       "patterns": [
         {
-          "match": "\\bdo\\b",
-          "name": "keyword.control.loop.ocaml"
+          "name": "keyword.control.loop.ocaml",
+          "match": "\\bdo\\b"
         },
         {
           "include": "$self"
         }
-      ]
-    },
-    {
-      "begin": "\\b(while)\\b",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.while-loop.ocaml"
         }
       },
-      "end": "\\b(done)\\b",
       "endCaptures": {
         "1": {
           "name": "keyword.control.while-loop.ocaml"
         }
-      },
-      "name": "meta.while-loop.ocaml",
-      "patterns": [
-        {
-          "match": "\\bdo\\b",
-          "name": "keyword.control.loop.ocaml"
-        },
-        {
-          "include": "$self"
-        }
-      ]
+      }
     },
     {
+      "name": "meta.paren-group.ocaml",
       "begin": "\\(",
       "end": "\\)",
-      "name": "meta.paren-group.ocaml",
       "patterns": [
         {
           "include": "$self"
@@ -738,74 +732,74 @@
       ]
     },
     {
-      "match": "\\b(and|land|lor|lsl|lsr|asr|lnot|lxor|mod|or)\\b",
-      "name": "keyword.operator.ocaml"
+      "name": "keyword.operator.ocaml",
+      "match": "\\b(and|land|lor|lsl|lsr|asr|lnot|lxor|mod|or)\\b"
     },
     {
-      "match": "\\b(downto|if|else|match|then|to|when|with|try)\\b",
-      "name": "keyword.control.ocaml"
+      "name": "keyword.control.ocaml",
+      "match": "\\b(downto|if|else|match|then|to|when|with|try)\\b"
     },
     {
-      "match": "\\b(as|assert|class|constraint|exception|functor|in|include|inherit|initializer|lazy|let|mod|module|mutable|new|object|open|private|rec|sig|struct|type|virtual)\\b",
-      "name": "keyword.other.ocaml"
+      "name": "keyword.other.ocaml",
+      "match": "\\b(as|assert|class|constraint|exception|functor|in|include|inherit|initializer|lazy|let|mod|module|mutable|new|object|open|private|rec|sig|struct|type|virtual)\\b"
     },
     {
       "include": "#module-signature"
     },
     {
-      "match": "(’|‘|“|”)",
-      "name": "invalid.illegal.unrecognized-character.ocaml"
+      "name": "invalid.illegal.unrecognized-character.ocaml",
+      "match": "(’|‘|“|”)"
     }
   ],
   "repository": {
     "arrays": {
       "patterns": [
         {
+          "name": "meta.array.ocaml",
           "begin": "(\\[\\|)",
+          "end": "(\\|])",
+          "patterns": [
+            {
+              "include": "#arrays"
+            },
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.array.begin.ocaml"
             }
           },
-          "end": "(\\|])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.array.end.ocaml"
             }
-          },
-          "name": "meta.array.ocaml",
-          "patterns": [
-            {
-              "include": "#arrays"
-            },
-            {
-              "include": "$self"
-            }
-          ]
+          }
         }
       ]
     },
     "comments": {
       "patterns": [
         {
+          "name": "comment.block.ocaml",
           "begin": "\\(\\*",
+          "end": "\\*\\)",
+          "patterns": [
+            {
+              "include": "#comments"
+            }
+          ],
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.comment.begin.ocaml"
             }
           },
-          "end": "\\*\\)",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.comment.end.ocaml"
             }
-          },
-          "name": "comment.block.ocaml",
-          "patterns": [
-            {
-              "include": "#comments"
-            }
-          ]
+          }
         }
       ]
     },
@@ -815,13 +809,13 @@
           "include": "#comments"
         },
         {
+          "name": "comment.block.string.quoted.double.ocaml",
           "begin": "(?=[^\\\\])(\")",
           "end": "\"",
-          "name": "comment.block.string.quoted.double.ocaml",
           "patterns": [
             {
-              "match": "\\\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\])",
-              "name": "comment.block.string.constant.character.escape.ocaml"
+              "name": "comment.block.string.constant.character.escape.ocaml",
+              "match": "\\\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\])"
             }
           ]
         }
@@ -830,6 +824,8 @@
     "constants": {
       "patterns": [
         {
+          "name": "constant.language.pseudo-variable.ocaml",
+          "match": "(?:\\[\\s*(\\])|\\((\\))|\\(\\s*(\\)))",
           "captures": {
             "1": {
               "name": "meta.empty-typing-pair.ocaml"
@@ -840,37 +836,35 @@
             "3": {
               "name": "meta.empty-typing-pair.ocaml"
             }
-          },
-          "match": "(?:\\[\\s*(\\])|\\((\\))|\\(\\s*(\\)))",
-          "name": "constant.language.pseudo-variable.ocaml"
+          }
         },
         {
-          "match": "\\b(true|false)\\b",
-          "name": "constant.language.boolean.ocaml"
+          "name": "constant.language.boolean.ocaml",
+          "match": "\\b(true|false)\\b"
         },
         {
-          "match": "\\b-?[0-9][0-9_]*((\\.([0-9][0-9_]*([eE][+-]??[0-9][0-9_]*)?)?)|([eE][+-]??[0-9][0-9_]*))",
-          "name": "constant.numeric.floating-point.ocaml"
+          "name": "constant.numeric.floating-point.ocaml",
+          "match": "\\b-?[0-9][0-9_]*((\\.([0-9][0-9_]*([eE][+-]??[0-9][0-9_]*)?)?)|([eE][+-]??[0-9][0-9_]*))"
         },
         {
-          "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_]*)))n",
-          "name": "constant.numeric.integer.nativeint.ocaml"
+          "name": "constant.numeric.integer.nativeint.ocaml",
+          "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_]*)))n"
         },
         {
-          "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_]*)))L",
-          "name": "constant.numeric.integer.int64.ocaml"
+          "name": "constant.numeric.integer.int64.ocaml",
+          "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_]*)))L"
         },
         {
-          "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_]*)))l",
-          "name": "constant.numeric.integer.int32.ocaml"
+          "name": "constant.numeric.integer.int32.ocaml",
+          "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_]*)))l"
         },
         {
-          "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_]*)))",
-          "name": "constant.numeric.integer.ocaml"
+          "name": "constant.numeric.integer.ocaml",
+          "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": "'(.|\\\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\]))'",
-          "name": "constant.character.ocaml"
+          "name": "constant.character.ocaml",
+          "match": "'(.|\\\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\]))'"
         }
       ]
     },
@@ -880,27 +874,17 @@
           "include": "#storagetypes"
         },
         {
-          "match": "\\b[a-zA-Z0-9'_]+\\b",
-          "name": "storage.type.ocaml"
+          "name": "storage.type.ocaml",
+          "match": "\\b[a-zA-Z0-9'_]+\\b"
         }
       ]
     },
     "lists": {
       "patterns": [
         {
-          "begin": "(\\[)(?!\\||<|>)",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.list.begin.ocaml"
-            }
-          },
-          "end": "(?<!\\||>)(])",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.list.end.ocaml"
-            }
-          },
           "name": "meta.list.ocaml",
+          "begin": "(\\[)(?!\\||\u003c|\u003e)",
+          "end": "(?\u003c!\\||\u003e)(])",
           "patterns": [
             {
               "include": "#lists"
@@ -908,43 +892,53 @@
             {
               "include": "$self"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.list.begin.ocaml"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.list.end.ocaml"
+            }
+          }
         }
       ]
     },
     "matchpatterns": {
       "patterns": [
         {
-          "match": "\\b_\\b",
-          "name": "constant.language.universal-match.ocaml"
+          "name": "constant.language.universal-match.ocaml",
+          "match": "\\b_\\b"
         },
         {
-          "match": "\\|(?=\\s*\\S)",
-          "name": "punctuation.separator.match-pattern.ocaml"
+          "name": "punctuation.separator.match-pattern.ocaml",
+          "match": "\\|(?=\\s*\\S)"
         },
         {
-          "begin": "(\\()(?=(?!=.*?->).*?\\|)",
+          "name": "meta.match-option.ocaml",
+          "begin": "(\\()(?=(?!=.*?-\u003e).*?\\|)",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "name": "punctuation.separator.match-option.ocaml",
+              "match": "\\|"
+            },
+            {
+              "include": "#matchpatterns"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.match-option.ocaml"
             }
           },
-          "end": "(\\))",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.match-option.ocaml"
             }
-          },
-          "name": "meta.match-option.ocaml",
-          "patterns": [
-            {
-              "match": "\\|",
-              "name": "punctuation.separator.match-option.ocaml"
-            },
-            {
-              "include": "#matchpatterns"
-            }
-          ]
+          }
         },
         {
           "include": "#moduleref"
@@ -963,22 +957,13 @@
     "module-signature": {
       "patterns": [
         {
+          "name": "meta.module.signature.val.ocaml",
           "begin": "(val)\\s+([a-z_][a-zA-Z0-9_']*)\\s*(:)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other.ocaml"
-            },
-            "2": {
-              "name": "entity.name.type.value-signature.ocaml"
-            },
-            "3": {
-              "name": "punctuation.separator.type-constraint.ocaml"
-            }
-          },
           "end": "(?=\\b(type|val|external|class|module|end)\\b)|^\\s*$",
-          "name": "meta.module.signature.val.ocaml",
           "patterns": [
             {
+              "name": "variable.parameter.ameter.optional.ocaml",
+              "match": "(\\?)([a-z][a-zA-Z0-9_]*)\\s*(:)",
               "captures": {
                 "1": {
                   "name": "punctuation.definition.optional-parameter.ocaml"
@@ -989,12 +974,17 @@
                 "3": {
                   "name": "punctuation.separator.optional-parameter.ocaml"
                 }
-              },
-              "match": "(\\?)([a-z][a-zA-Z0-9_]*)\\s*(:)",
-              "name": "variable.parameter.ameter.optional.ocaml"
+              }
             },
             {
+              "name": "variable.parameter.labeled.ocaml",
               "begin": "([a-z][a-zA-Z0-9'_]*)\\s*(:)\\s*",
+              "end": "\\s",
+              "patterns": [
+                {
+                  "include": "#definite_storagetypes"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.tag.label.ocaml"
@@ -1005,37 +995,32 @@
                 "3": {
                   "name": "storage.type.ocaml"
                 }
-              },
-              "end": "\\s",
-              "name": "variable.parameter.labeled.ocaml",
-              "patterns": [
-                {
-                  "include": "#definite_storagetypes"
-                }
-              ]
+              }
             },
             {
               "include": "#typedefs"
             }
-          ]
-        },
-        {
-          "begin": "(external)\\s+([a-z_][a-zA-Z0-9_']*)\\s*(:)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.other.ocaml"
             },
             "2": {
-              "name": "entity.name.type.external-signature.ocaml"
+              "name": "entity.name.type.value-signature.ocaml"
             },
             "3": {
               "name": "punctuation.separator.type-constraint.ocaml"
             }
-          },
-          "end": "(?=\\b(type|val|external|class|module|let|end)\\b)|^\\s*$",
+          }
+        },
+        {
           "name": "meta.module.signature.external.ocaml",
+          "begin": "(external)\\s+([a-z_][a-zA-Z0-9_']*)\\s*(:)",
+          "end": "(?=\\b(type|val|external|class|module|let|end)\\b)|^\\s*$",
           "patterns": [
             {
+              "name": "variable.parameter.optional.ocaml",
+              "match": "(\\?)([a-z][a-zA-Z0-9_]*)\\s*(:)",
               "captures": {
                 "1": {
                   "name": "punctuation.definition.optional-parameter.ocaml"
@@ -1046,12 +1031,17 @@
                 "3": {
                   "name": "punctuation.separator.optional-parameter.ocaml"
                 }
-              },
-              "match": "(\\?)([a-z][a-zA-Z0-9_]*)\\s*(:)",
-              "name": "variable.parameter.optional.ocaml"
+              }
             },
             {
+              "name": "variable.parameter.labeled.ocaml",
               "begin": "(~)([a-z][a-zA-Z0-9'_]*)\\s*(:)\\s*",
+              "end": "\\s",
+              "patterns": [
+                {
+                  "include": "#variables"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "punctuation.definition.labeled-parameter.ocaml"
@@ -1062,14 +1052,7 @@
                 "3": {
                   "name": "punctuation.separator.label.ocaml"
                 }
-              },
-              "end": "\\s",
-              "name": "variable.parameter.labeled.ocaml",
-              "patterns": [
-                {
-                  "include": "#variables"
-                }
-              ]
+              }
             },
             {
               "include": "#strings"
@@ -1077,13 +1060,26 @@
             {
               "include": "#typedefs"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.ocaml"
+            },
+            "2": {
+              "name": "entity.name.type.external-signature.ocaml"
+            },
+            "3": {
+              "name": "punctuation.separator.type-constraint.ocaml"
+            }
+          }
         }
       ]
     },
     "moduleref": {
       "patterns": [
         {
+          "name": "meta.module-reference.ocaml",
+          "match": "\\b([A-Z][a-zA-Z0-9'_]*)(\\.)",
           "beginCaptures": {
             "1": {
               "name": "support.other.module.ocaml"
@@ -1091,74 +1087,72 @@
             "2": {
               "name": "punctuation.separator.module-reference.ocaml"
             }
-          },
-          "match": "\\b([A-Z][a-zA-Z0-9'_]*)(\\.)",
-          "name": "meta.module-reference.ocaml"
+          }
         }
       ]
     },
     "storagetypes": {
       "patterns": [
         {
-          "match": "\\b(int|char|float|string|list|array|bool|unit|exn|option|int32|int64|nativeint|format4|lazy_t)\\b",
-          "name": "storage.type.ocaml"
+          "name": "storage.type.ocaml",
+          "match": "\\b(int|char|float|string|list|array|bool|unit|exn|option|int32|int64|nativeint|format4|lazy_t)\\b"
         },
         {
-          "match": "#[a-z_][a-zA-Z0-9_]*",
-          "name": "storage.type.variant.polymorphic.ocaml"
+          "name": "storage.type.variant.polymorphic.ocaml",
+          "match": "#[a-z_][a-zA-Z0-9_]*"
         }
       ]
     },
     "strings": {
       "patterns": [
         {
+          "name": "string.quoted.double.ocaml",
           "begin": "(?=[^\\\\])(\")",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.string.begin.ocaml"
-            }
-          },
           "end": "(\")",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.string.end.ocaml"
-            }
-          },
-          "name": "string.quoted.double.ocaml",
           "patterns": [
             {
-              "match": "\\\\$[ \\t]*",
-              "name": "punctuation.separator.string.ignore-eol.ocaml"
+              "name": "punctuation.separator.string.ignore-eol.ocaml",
+              "match": "\\\\$[ \\t]*"
             },
             {
-              "match": "\\\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\])",
-              "name": "constant.character.string.escape.ocaml"
+              "name": "constant.character.string.escape.ocaml",
+              "match": "\\\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\])"
             },
             {
-              "match": "\\\\[\\|\\(\\)1-9$^.*+?\\[\\]]",
-              "name": "constant.character.regexp.escape.ocaml"
+              "name": "constant.character.regexp.escape.ocaml",
+              "match": "\\\\[\\|\\(\\)1-9$^.*+?\\[\\]]"
             },
             {
-              "match": "\\\\(?!(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\]|[\\|\\(\\)1-9$^.*+?\\[\\]]|$[ \\t]*))(?:.)",
-              "name": "invalid.illegal.character.string.escape"
+              "name": "invalid.illegal.character.string.escape",
+              "match": "\\\\(?!(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\]|[\\|\\(\\)1-9$^.*+?\\[\\]]|$[ \\t]*))(?:.)"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.begin.ocaml"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.ocaml"
+            }
+          }
         }
       ]
     },
     "typedefs": {
       "patterns": [
         {
-          "match": "\\|",
-          "name": "punctuation.separator.variant-definition.ocaml"
+          "name": "punctuation.separator.variant-definition.ocaml",
+          "match": "\\|"
         },
         {
           "include": "#comments_inner"
         },
         {
+          "name": "meta.paren-group.ocaml",
           "begin": "\\(",
           "end": "\\)",
-          "name": "meta.paren-group.ocaml",
           "patterns": [
             {
               "include": "#typedefs"
@@ -1166,17 +1160,19 @@
           ]
         },
         {
-          "match": "\\bof\\b",
-          "name": "keyword.other.ocaml"
+          "name": "keyword.other.ocaml",
+          "match": "\\bof\\b"
         },
         {
           "include": "#storagetypes"
         },
         {
-          "match": "(?<=\\s|\\()['a-z_][a-zA-Z0-9_]*\\b",
-          "name": "storage.type.ocaml"
+          "name": "storage.type.ocaml",
+          "match": "(?\u003c=\\s|\\()['a-z_][a-zA-Z0-9_]*\\b"
         },
         {
+          "name": "meta.module.type.ocaml",
+          "match": "\\b((?:[A-Z][a-zA-Z0-9'_]*)(?:\\.[A-Z][a-zA-Z0-9'_]+)*)(\\.[a-zA-Z0-9'_]+)",
           "captures": {
             "1": {
               "name": "support.other.module.ocaml"
@@ -1184,44 +1180,42 @@
             "2": {
               "name": "storage.type.module.ocaml"
             }
-          },
-          "match": "\\b((?:[A-Z][a-zA-Z0-9'_]*)(?:\\.[A-Z][a-zA-Z0-9'_]+)*)(\\.[a-zA-Z0-9'_]+)",
-          "name": "meta.module.type.ocaml"
+          }
         },
         {
-          "begin": "(\\[(>|<)?)",
+          "name": "meta.polymorphic-variant.definition.ocaml",
+          "begin": "(\\[(\u003e|\u003c)?)",
+          "end": "(\\])",
+          "patterns": [
+            {
+              "include": "#typedefs"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.polymorphic-variant.ocaml"
             }
           },
-          "end": "(\\])",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.polymorphic-variant.ocaml"
             }
-          },
-          "name": "meta.polymorphic-variant.definition.ocaml",
-          "patterns": [
-            {
-              "include": "#typedefs"
-            }
-          ]
+          }
         },
         {
           "include": "$self"
         },
         {
-          "match": "\\|",
-          "name": "punctuation.separator.algebraic-type.ocaml"
+          "name": "punctuation.separator.algebraic-type.ocaml",
+          "match": "\\|"
         }
       ]
     },
     "variables": {
       "patterns": [
         {
-          "match": "\\(\\)",
-          "name": "variable.parameter.unit.ocaml"
+          "name": "variable.parameter.unit.ocaml",
+          "match": "\\(\\)"
         },
         {
           "include": "#constants"
@@ -1230,7 +1224,14 @@
           "include": "#moduleref"
         },
         {
+          "name": "variable.parameter.labeled.ocaml",
           "begin": "(~)([a-z][a-zA-Z0-9'_]*)(\\s*:\\s*)?",
+          "end": "(?=(-\u003e|\\s))",
+          "patterns": [
+            {
+              "include": "#variables"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.labeled-parameter.ocaml"
@@ -1241,16 +1242,11 @@
             "3": {
               "name": "punctuation.separator.label.ocaml"
             }
-          },
-          "end": "(?=(->|\\s))",
-          "name": "variable.parameter.labeled.ocaml",
-          "patterns": [
-            {
-              "include": "#variables"
-            }
-          ]
+          }
         },
         {
+          "name": "variable.parameter.optional.ocaml",
+          "match": "(\\?)([a-z][a-zA-Z0-9_]*)",
           "captures": {
             "1": {
               "name": "punctuation.definition.optional-parameter.ocaml"
@@ -1258,12 +1254,17 @@
             "2": {
               "name": "entity.name.tag.label.optional.ocaml"
             }
-          },
-          "match": "(\\?)([a-z][a-zA-Z0-9_]*)",
-          "name": "variable.parameter.optional.ocaml"
+          }
         },
         {
+          "name": "variable.parameter.optional.ocaml",
           "begin": "(\\?)(\\()([a-z_][a-zA-Z0-9'_]*)\\s*(=)",
+          "end": "(\\))",
+          "patterns": [
+            {
+              "include": "$self"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "punctuation.definition.optional-parameter.ocaml"
@@ -1278,63 +1279,56 @@
               "name": "punctuation.separator.optional-parameter-assignment.ocaml"
             }
           },
-          "end": "(\\))",
           "endCaptures": {
             "1": {
               "name": "punctuation.definition.optional-parameter.ocaml"
             }
-          },
-          "name": "variable.parameter.optional.ocaml",
-          "patterns": [
-            {
-              "include": "$self"
-            }
-          ]
+          }
         },
         {
-          "begin": "(\\()(?=(~[a-z][a-zA-Z0-9_]*:|(\"(\\\\\"|[^\"])*\")|[^\\(\\)~\"])+(?<!:)(:>|:(?![:=])))",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.section.type-constraint.ocaml"
-            }
-          },
-          "end": "(\\))",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.section.type-constraint.ocaml"
-            }
-          },
           "name": "meta.parameter.type-constrained.ocaml",
+          "begin": "(\\()(?=(~[a-z][a-zA-Z0-9_]*:|(\"(\\\\\"|[^\"])*\")|[^\\(\\)~\"])+(?\u003c!:)(:\u003e|:(?![:=])))",
+          "end": "(\\))",
           "patterns": [
             {
-              "begin": "(?<!:)(:>|:(?![:=]))",
-              "beginCaptures": {
-                "1": {
-                  "name": "punctuation.separator.type-constraint.ocaml"
-                }
-              },
-              "end": "(?=\\))",
               "name": "storage.type.ocaml",
+              "begin": "(?\u003c!:)(:\u003e|:(?![:=]))",
+              "end": "(?=\\))",
               "patterns": [
                 {
+                  "name": "meta.paren.group",
                   "begin": "\\(",
-                  "end": "\\)",
-                  "name": "meta.paren.group"
+                  "end": "\\)"
+                }
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.separator.type-constraint.ocaml"
                 }
-              ]
+              }
             },
             {
               "include": "#variables"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.section.type-constraint.ocaml"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.section.type-constraint.ocaml"
+            }
+          }
         },
         {
           "include": "#comments_inner"
         },
         {
+          "name": "meta.paren-group.ocaml",
           "begin": "\\(",
           "end": "\\)",
-          "name": "meta.paren-group.ocaml",
           "patterns": [
             {
               "include": "#variables"
@@ -1342,19 +1336,9 @@
           ]
         },
         {
+          "name": "variable.parameter.tuple.ocaml",
           "begin": "(\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "punctuation.definition.tuple.ocaml"
-            }
-          },
           "end": "(\\))",
-          "endCaptures": {
-            "1": {
-              "name": "punctuation.definition.tuple.ocaml"
-            }
-          },
-          "name": "variable.parameter.tuple.ocaml",
           "patterns": [
             {
               "include": "#matchpatterns"
@@ -1363,31 +1347,38 @@
               "include": "#variables"
             },
             {
-              "match": ",",
-              "name": "punctuation.separator.tuple.ocaml"
+              "name": "punctuation.separator.tuple.ocaml",
+              "match": ","
             }
-          ]
-        },
-        {
-          "begin": "(\\{)",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "punctuation.definition.record.ocaml"
+              "name": "punctuation.definition.tuple.ocaml"
             }
           },
-          "end": "(\\})",
           "endCaptures": {
             "1": {
-              "name": "punctuation.definition.record.ocaml"
+              "name": "punctuation.definition.tuple.ocaml"
             }
-          },
+          }
+        },
+        {
           "name": "variable.parameter.record.ocaml",
+          "begin": "(\\{)",
+          "end": "(\\})",
           "patterns": [
             {
               "include": "#moduleref"
             },
             {
+              "name": "meta.recordfield.match.ocaml",
               "begin": "\\b([a-z][a-zA-Z0-9'_]*)\\s*(=)",
+              "end": "(;)|(?=\\})",
+              "patterns": [
+                {
+                  "include": "#matchpatterns"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.tag.record.ocaml"
@@ -1396,31 +1387,32 @@
                   "name": "punctuation.separator.record.field-assignment.ocaml"
                 }
               },
-              "end": "(;)|(?=\\})",
               "endCaptures": {
                 "1": {
                   "name": "punctuation.separator.record.ocaml"
                 }
-              },
-              "name": "meta.recordfield.match.ocaml",
-              "patterns": [
-                {
-                  "include": "#matchpatterns"
-                }
-              ]
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.record.ocaml"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.record.ocaml"
+            }
+          }
         },
         {
           "include": "#storagetypes"
         },
         {
-          "match": "\\b[a-z_][a-zA-Z0-9'_]*",
-          "name": "variable.parameter.ocaml"
+          "name": "variable.parameter.ocaml",
+          "match": "\\b[a-z_][a-zA-Z0-9'_]*"
         }
       ]
     }
-  },
-  "scopeName": "source.ocaml",
-  "uuid": "F816FA69-6EE8-11D9-BF2D-000D93589AF6"
-}
+  }
+}