github-linguist 5.3.3 → 6.0.0

data/grammars/source.reason.hover.type.json

@@ -11,4 +11,4 @@
       "include": "source.reason#type-expression"
     }
   ]
-}
+}

data/grammars/source.reason.json

@@ -1,10 +1,6 @@
 {
   "name": "Reason",
   "scopeName": "source.reason",
-  "fileTypes": [
-    "re",
-    "rei"
-  ],
   "patterns": [
     {
       "include": "#structure-expression-block-item"
@@ -21,16 +17,16 @@
         {
           "begin": "\\[(@{1,3})",
           "end": "(?=[^_\\.'[:word:]])",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.less"
-            }
-          },
           "patterns": [
             {
               "include": "#attribute-identifier"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.less"
+            }
+          }
         },
         {
           "include": "#attribute-payload"
@@ -51,8 +47,8 @@
           }
         },
         {
-          "match": "\\b([[:alpha:]][[:word:]]*)\\b",
-          "name": "entity.other.attribute-name.css constant.language constant.numeric"
+          "name": "entity.other.attribute-name.css constant.language constant.numeric",
+          "match": "\\b([[:alpha:]][[:word:]]*)\\b"
         }
       ]
     },
@@ -61,11 +57,6 @@
         {
           "begin": "(:)",
           "end": "(?=\\])",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-            }
-          },
           "patterns": [
             {
               "include": "#structure-expression"
@@ -76,16 +67,16 @@
             {
               "include": "#type-expression"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+            }
+          }
         },
         {
           "begin": "([\\?])",
           "end": "(?=\\])",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.less"
-            }
-          },
           "patterns": [
             {
               "include": "#pattern-guard"
@@ -93,7 +84,12 @@
             {
               "include": "#pattern"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.less"
+            }
+          }
         },
         {
           "include": "#structure-expression-block-item"
@@ -106,6 +102,11 @@
     "class-item-inherit": {
       "begin": "\\b(inherit)\\b",
       "end": "(;)|(?=}|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
+      "patterns": [
+        {
+          "include": "#value-expression"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other"
@@ -115,16 +116,16 @@
         "1": {
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
-      },
-      "patterns": [
-        {
-          "include": "#value-expression"
-        }
-      ]
+      }
     },
     "class-item-method": {
       "begin": "\\b(method)\\b",
       "end": "(;)|(?=}|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|type|val|with)\\b)",
+      "patterns": [
+        {
+          "include": "#module-item-let-value-bind-name-params-type-body"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "storage.type"
@@ -134,12 +135,7 @@
         "1": {
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
-      },
-      "patterns": [
-        {
-          "include": "#module-item-let-value-bind-name-params-type-body"
-        }
-      ]
+      }
     },
     "comment": {
       "name": "comment",
@@ -153,9 +149,9 @@
       ]
     },
     "comment-block": {
+      "name": "comment.block",
       "begin": "/\\*",
       "end": "\\*/",
-      "name": "comment.block",
       "patterns": [
         {
           "include": "#comment"
@@ -163,9 +159,9 @@
       ]
     },
     "comment-block-doc": {
+      "name": "comment.block.documentation",
       "begin": "/\\*\\*(?!/)",
       "end": "\\*/",
-      "name": "comment.block.documentation",
       "patterns": [
         {
           "include": "#comment"
@@ -173,22 +169,22 @@
       ]
     },
     "condition-lhs": {
-      "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$\\\\])([\\?])(?![#\\-:!?.@*/&%^+<=>|~$\\\\])",
+      "begin": "(?\u003c![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])([\\?])(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])",
       "end": "(?=[\\)])",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control message.error variable.interpolation"
-        }
-      },
       "patterns": [
         {
-          "match": "(?:\\b|[[:space:]]+)([?])(?:\\b|[[:space:]]+)",
-          "name": "keyword.control message.error variable.interpolation"
+          "name": "keyword.control message.error variable.interpolation",
+          "match": "(?:\\b|[[:space:]]+)([?])(?:\\b|[[:space:]]+)"
         },
         {
           "include": "#value-expression"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control message.error variable.interpolation"
+        }
+      }
     },
     "extension-node": {
       "begin": "(?=\\[(%{1,3})[[:space:]]*[[:alpha:]])",
@@ -197,16 +193,16 @@
         {
           "begin": "\\[(%{1,3})",
           "end": "(?=[^_\\.'[:word:]])",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.less"
-            }
-          },
           "patterns": [
             {
               "include": "#attribute-identifier"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.less"
+            }
+          }
         },
         {
           "include": "#attribute-payload"
@@ -227,8 +223,12 @@
       "patterns": [
         {
           "begin": "\\b([[:lower:]][[:word:]]*)\\b[[:space:]]*(=)",
-          "end": "(?<![=])(?=[/>[:lower:]])",
-          "comment": "meta.separator",
+          "end": "(?\u003c![=])(?=[/\u003e[:lower:]])",
+          "patterns": [
+            {
+              "include": "#value-expression-atomic-with-paths"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "markup.inserted constant.language support.property-value entity.name.filename"
@@ -236,19 +236,12 @@
             "2": {
               "name": "keyword.control.less"
             }
-          },
-          "patterns": [
-            {
-              "include": "#value-expression-atomic-with-paths"
-            }
-          ]
+          }
         },
         {
           "match": "(\\b([[:lower:]][[:word:]]*)\\b[[:space:]]*+)",
           "captures": {
-            "1": {
-              "comment": "meta.separator"
-            },
+            "1": {},
             "2": {
               "name": "markup.inserted constant.language support.property-value entity.name.filename"
             }
@@ -257,58 +250,37 @@
       ]
     },
     "jsx-body": {
-      "begin": "((>))",
-      "end": "(?=</)",
-      "beginCaptures": {
-        "1": {
-          "comment": "meta.separator"
-        },
-        "2": {
-          "name": "punctuation.definition.tag.end.js"
-        }
-      },
+      "begin": "((\u003e))",
+      "end": "(?=\u003c/)",
       "patterns": [
         {
-          "comment": "FIXME: seems necessary in order to properly tokenize `[[:word:]]</` boundary",
           "match": "[[:lower:]][[:word:]]*"
         },
         {
           "include": "#value-expression"
         }
-      ]
-    },
-    "jsx-head": {
-      "begin": "((<))(?=[_[:alpha:]])",
-      "end": "((/>))|(?=</)",
-      "applyEndPatternLast": true,
+      ],
       "beginCaptures": {
-        "1": {
-          "comment": "meta.separator"
-        },
-        "2": {
-          "name": "punctuation.definition.tag.begin.js"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "comment": "meta.separator"
-        },
+        "1": {},
         "2": {
           "name": "punctuation.definition.tag.end.js"
         }
-      },
+      }
+    },
+    "jsx-head": {
+      "begin": "((\u003c))(?=[_[:alpha:]])",
+      "end": "((/\u003e))|(?=\u003c/)",
       "patterns": [
         {
           "begin": "\\G",
-          "end": "(?=[[:space:]/>])[[:space:]]*+",
-          "comment": "meta.separator",
+          "end": "(?=[[:space:]/\u003e])[[:space:]]*+",
           "patterns": [
             {
               "include": "#module-path-simple"
             },
             {
-              "match": "\\b[[:lower:]][[:word:]]*\\b",
-              "name": "entity.name.tag.inline.any.html"
+              "name": "entity.name.tag.inline.any.html",
+              "match": "\\b[[:lower:]][[:word:]]*\\b"
             }
           ]
         },
@@ -318,194 +290,69 @@
         {
           "include": "#jsx-body"
         }
-      ]
-    },
-    "jsx-tail": {
-      "begin": "\\G(/>)|(</)",
-      "end": "(>)",
-      "applyEndPatternLast": true,
-      "comment": "meta.separator",
+      ],
       "beginCaptures": {
-        "1": {
-          "name": "punctuation.definition.tag.end.js"
-        },
+        "1": {},
         "2": {
           "name": "punctuation.definition.tag.begin.js"
         }
       },
       "endCaptures": {
-        "1": {
+        "1": {},
+        "2": {
           "name": "punctuation.definition.tag.end.js"
         }
       },
-      "patterns": [
-        {
-          "include": "#module-path-simple"
-        },
-        {
-          "match": "\\b[[:lower:]][[:word:]]*\\b",
-          "name": "entity.name.tag.inline.any.html"
-        }
-      ]
+      "applyEndPatternLast": true
     },
-    "module-name-extended": {
-      "patterns": [
-        {
-          "include": "#module-name-simple"
-        },
-        {
-          "begin": "([\\(])",
-          "end": "([\\)])",
-          "captures": {
-            "1": {
-              "name": "entity.other.attribute-name.css constant.language constant.numeric"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#module-path-extended"
-            }
-          ]
-        }
-      ]
-    },
-    "module-name-simple": {
-      "match": "\\b[[:upper:]][[:word:]]*\\b",
-      "name": "support.class entity.name.class"
-    },
-    "module-path-extended": {
+    "jsx-tail": {
+      "begin": "\\G(/\u003e)|(\u003c/)",
+      "end": "(\u003e)",
       "patterns": [
         {
-          "include": "#module-name-extended"
-        },
-        {
-          "include": "#comment"
+          "include": "#module-path-simple"
         },
         {
-          "comment": "NOTE: end early to avoid too much reparsing",
-          "begin": "([\\.])",
-          "end": "(?<=[[:word:]\\)])|(?=[^\\.[:upper:]/])",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.less"
-            }
-          },
-          "patterns": [
-            {
-              "begin": "(?<=[\\.])",
-              "end": "(?<=[[:word:]\\)])|(?=[^\\.[:upper:]/])",
-              "patterns": [
-                {
-                  "include": "#comment"
-                },
-                {
-                  "include": "#module-name-extended"
-                }
-              ]
-            }
-          ]
+          "name": "entity.name.tag.inline.any.html",
+          "match": "\\b[[:lower:]][[:word:]]*\\b"
         }
-      ]
-    },
-    "module-path-extended-prefix": {
-      "begin": "(?=\\b[[:upper:]])",
-      "end": "([\\.])|(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "endCaptures": {
+      ],
+      "beginCaptures": {
         "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#module-path-extended"
-        }
-      ]
-    },
-    "module-path-simple": {
-      "patterns": [
-        {
-          "include": "#module-name-simple"
-        },
-        {
-          "include": "#comment"
+          "name": "punctuation.definition.tag.end.js"
         },
-        {
-          "comment": "NOTE: end early to avoid too much reparsing",
-          "begin": "([\\.])",
-          "end": "(?<=[[:word:]\\)])|(?=[^\\.[:upper:]/])",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-            }
-          },
-          "patterns": [
-            {
-              "begin": "(?<=[\\.])",
-              "end": "(?<=[[:word:]\\)])|(?=[^\\.[:upper:]/])",
-              "patterns": [
-                {
-                  "include": "#comment"
-                },
-                {
-                  "include": "#module-name-simple"
-                }
-              ]
-            }
-          ]
+        "2": {
+          "name": "punctuation.definition.tag.begin.js"
         }
-      ]
-    },
-    "module-path-simple-prefix": {
-      "begin": "(?=\\b[[:upper:]])",
-      "end": "([\\.])|(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
+      },
       "endCaptures": {
         "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+          "name": "punctuation.definition.tag.end.js"
         }
       },
-      "patterns": [
-        {
-          "include": "#module-path-simple"
-        }
-      ]
+      "applyEndPatternLast": true
     },
     "module-item-class-type": {
-      "comment": "FIXME: proper parsing",
       "begin": "\\b(class)\\b",
       "end": "(;)|(?=}|\\b(and|class|constraint|exception|external|include|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.other"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
       "patterns": [
         {
           "begin": "(?:\\G|^)[[:space:]]*\\b(type)\\b",
           "end": "(?==)",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.other.attribute-name.css constant.language constant.numeric"
-            }
-          },
           "patterns": [
             {
               "include": "#module-item-type-bind-name-tyvars"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.other.attribute-name.css constant.language constant.numeric"
+            }
+          }
         },
         {
           "begin": "(=)",
           "end": "(?=;)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.less"
-            }
-          },
           "patterns": [
             {
               "include": "#attribute"
@@ -519,13 +366,14 @@
             {
               "include": "#class-item-method"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.less"
+            }
+          }
         }
-      ]
-    },
-    "module-item-exception": {
-      "begin": "\\b(exception)\\b",
-      "end": "(;)|(?=}|\\b(class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|type|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other"
@@ -535,26 +383,30 @@
         "1": {
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
-      },
+      }
+    },
+    "module-item-exception": {
+      "begin": "\\b(exception)\\b",
+      "end": "(;)|(?=}|\\b(class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#module-item-type-bind-body-item"
         }
-      ]
-    },
-    "module-item-external": {
-      "begin": "\\b(external)\\b",
-      "end": "(;)|(?=}|\\b(class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|type|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "storage.type"
+          "name": "keyword.other"
         }
       },
       "endCaptures": {
         "1": {
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
-      },
+      }
+    },
+    "module-item-external": {
+      "begin": "\\b(external)\\b",
+      "end": "(;)|(?=}|\\b(class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#module-item-let-value-bind-name-or-pattern"
@@ -565,19 +417,14 @@
         {
           "begin": "(=)",
           "end": "(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.less"
-            }
-          },
           "patterns": [
             {
               "include": "#attribute"
             },
             {
+              "name": "string.double string.regexp",
               "begin": "\"",
               "end": "\"",
-              "name": "string.double string.regexp",
               "patterns": [
                 {
                   "include": "#value-literal-string-escape"
@@ -598,42 +445,47 @@
                 }
               ]
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.less"
+            }
+          }
         }
-      ]
-    },
-    "module-item-include": {
-      "begin": "\\b(include)\\b",
-      "end": "(;)|(?=}|\\b(class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|type|val)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.include"
+          "name": "storage.type"
         }
       },
       "endCaptures": {
         "1": {
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
-      },
+      }
+    },
+    "module-item-include": {
+      "begin": "\\b(include)\\b",
+      "end": "(;)|(?=}|\\b(class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|type|val)\\b)",
       "patterns": [
         {
           "include": "#signature-expression"
         }
-      ]
-    },
-    "module-item-let": {
-      "begin": "\\b(let)\\b",
-      "end": "(;)|(?=}|\\b(class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|type|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "storage.type"
+          "name": "keyword.control.include"
         }
       },
       "endCaptures": {
         "1": {
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
-      },
+      }
+    },
+    "module-item-let": {
+      "begin": "\\b(let)\\b",
+      "end": "(;)|(?=}|\\b(class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#module-item-let-module"
@@ -641,16 +493,21 @@
         {
           "include": "#module-item-let-value"
         }
-      ]
-    },
-    "module-item-let-module": {
-      "begin": "(?:\\G|^)[[:space:]]*\\b(module)\\b",
-      "end": "(?=[;}]|\\b(class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|type|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.control storage.type message.error"
+          "name": "storage.type"
         }
       },
+      "endCaptures": {
+        "1": {
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+        }
+      }
+    },
+    "module-item-let-module": {
+      "begin": "(?:\\G|^)[[:space:]]*\\b(module)\\b",
+      "end": "(?=[;}]|\\b(class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#comment"
@@ -664,44 +521,44 @@
         {
           "include": "#module-item-let-module-bind-name-params-type-body"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "variable.other.class.js variable.interpolation keyword.control storage.type message.error"
+        }
+      }
     },
     "module-item-let-module-and": {
       "begin": "\\b(and)\\b",
       "end": "(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type"
-        }
-      },
       "patterns": [
         {
           "include": "#module-item-let-module-bind-name-params-type-body"
         }
-      ]
-    },
-    "module-item-let-module-bind-body": {
-      "begin": "(=>?)",
-      "end": "(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.less"
+          "name": "storage.type"
         }
-      },
+      }
+    },
+    "module-item-let-module-bind-body": {
+      "begin": "(=\u003e?)",
+      "end": "(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#structure-expression"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.less"
+        }
+      }
     },
     "module-item-let-module-bind-name-params": {
       "begin": "\\b([[:upper:]][[:word:]]*)\\b",
       "end": "(?=[;:}=]|\\b(class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "support.class entity.name.class"
-        }
-      },
       "patterns": [
         {
           "include": "#comment"
@@ -709,7 +566,12 @@
         {
           "include": "#module-item-let-module-param"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "support.class entity.name.class"
+        }
+      }
     },
     "module-item-let-module-bind-name-params-type-body": {
       "begin": "(?:\\G|^)",
@@ -732,16 +594,16 @@
     "module-item-let-module-bind-type": {
       "begin": "(:)",
       "end": "(?=[;}=]|\\b(and|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
       "patterns": [
         {
           "include": "#signature-expression"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+        }
+      }
     },
     "module-item-let-module-param": {
       "begin": "(?=\\()",
@@ -758,36 +620,36 @@
               "include": "#module-name-simple"
             }
           ]
-        },
-        {
-          "begin": "(:)",
-          "end": "(?=\\))",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-            }
-          },
+        },
+        {
+          "begin": "(:)",
+          "end": "(?=\\))",
           "patterns": [
             {
               "include": "#signature-expression"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+            }
+          }
         }
       ]
     },
     "module-item-let-module-rec": {
       "begin": "(?:\\G|^)[[:space:]]*\\b(rec)\\b",
       "end": "(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control storage.modifier.rec"
-        }
-      },
       "patterns": [
         {
           "include": "#module-item-let-module-bind-name-params-type-body"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control storage.modifier.rec"
+        }
+      }
     },
     "module-item-let-value": {
       "patterns": [
@@ -805,34 +667,34 @@
     "module-item-let-value-and": {
       "begin": "\\b(and)\\b",
       "end": "(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type"
-        }
-      },
       "patterns": [
         {
           "include": "#module-item-let-value-bind-name-params-type-body"
         }
-      ]
-    },
-    "module-item-let-value-bind-body": {
-      "begin": "(=>?)",
-      "end": "(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.less"
+          "name": "storage.type"
         }
-      },
+      }
+    },
+    "module-item-let-value-bind-body": {
+      "begin": "(=\u003e?)",
+      "end": "(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#value-expression"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.less"
+        }
+      }
     },
     "module-item-let-value-bind-name-or-pattern": {
-      "begin": "(?<=[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]rec|^rec)[[:space:]]*",
-      "end": "(?<=[^[:space:]])|(?=[[:space:]]|[;:}=]|\\b(and|as|class|constraint|exception|external|for|include|inherit|let|method|module|nonrec|open|private|rec|switch|try|type|val|while|with)\\b)",
+      "begin": "(?\u003c=[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]rec|^rec)[[:space:]]*",
+      "end": "(?\u003c=[^[:space:]])|(?=[[:space:]]|[;:}=]|\\b(and|as|class|constraint|exception|external|for|include|inherit|let|method|module|nonrec|open|private|rec|switch|try|type|val|while|with)\\b)",
       "patterns": [
         {
           "include": "#comment"
@@ -857,25 +719,24 @@
       ]
     },
     "module-item-let-value-bind-name-params-type-body": {
-      "begin": "(?<=[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]rec|^rec)",
+      "begin": "(?\u003c=[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]rec|^rec)",
       "end": "(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
-          "comment": "FIXME; hack for punned arguments",
           "begin": "(::)",
-          "end": "(?<=[[:space:]])",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control"
-            }
-          },
+          "end": "(?\u003c=[[:space:]])",
           "patterns": [
             {
               "include": "#pattern"
             },
             {
               "begin": "(=)",
-              "end": "(\\?)|(?<=[^[:space:]=][[:space:]])(?=[[:space:]]*+[^\\.])",
+              "end": "(\\?)|(?\u003c=[^[:space:]=][[:space:]])(?=[[:space:]]*+[^\\.])",
+              "patterns": [
+                {
+                  "include": "#value-expression-atomic-with-paths"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "markup.inserted keyword.control.less message.error"
@@ -885,14 +746,14 @@
                 "1": {
                   "name": "storage.type"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "#value-expression-atomic-with-paths"
-                }
-              ]
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control"
+            }
+          }
         },
         {
           "include": "#module-item-let-value-bind-name-or-pattern"
@@ -919,18 +780,18 @@
           "include": "#module-item-let-value-param"
         },
         {
-          "begin": "(?<![:])(:)[[:space:]]*(?![[:space:]]*[:\\)])",
+          "begin": "(?\u003c![:])(:)[[:space:]]*(?![[:space:]]*[:\\)])",
           "end": "(?=[;}=]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|val|with)\\b)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-            }
-          },
           "patterns": [
             {
               "include": "#type-expression-atomic"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+            }
+          }
         }
       ]
     },
@@ -953,7 +814,7 @@
       ]
     },
     "module-item-let-value-bind-pattern": {
-      "begin": "(?<=[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]rec|^rec)",
+      "begin": "(?\u003c=[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]rec|^rec)",
       "end": "(?=[;:}=]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
@@ -968,18 +829,17 @@
       ]
     },
     "module-item-let-value-bind-type": {
-      "comment": "FIXME: lookahead",
-      "begin": "(?<![:])(:)(?![[:space:]]*[:\\)])",
-      "end": "(?==[^>]|[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
+      "begin": "(?\u003c![:])(:)(?![[:space:]]*[:\\)])",
+      "end": "(?==[^\u003e]|[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|val|with)\\b)",
       "patterns": [
         {
           "begin": "\\b(type)\\b",
           "end": "([\\.])",
+          "patterns": [
+            {
+              "include": "#pattern-variable"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "entity.other.attribute-name.css constant.language constant.numeric"
@@ -989,17 +849,17 @@
             "1": {
               "name": "entity.name.function"
             }
-          },
-          "patterns": [
-            {
-              "include": "#pattern-variable"
-            }
-          ]
+          }
         },
         {
           "include": "#type-expression"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+        }
+      }
     },
     "module-item-let-value-param": {
       "patterns": [
@@ -1021,22 +881,19 @@
       "patterns": [
         {
           "begin": "(\\b[[:lower:]][[:word:]]*\\b)?[[:space:]]*(::)",
-          "end": "(?<=[[:space:]])",
-          "beginCaptures": {
-            "1": {
-              "name": "markup.inserted constant.language support.property-value entity.name.filename"
-            },
-            "2": {
-              "name": "keyword.control"
-            }
-          },
+          "end": "(?\u003c=[[:space:]])",
           "patterns": [
             {
               "include": "#pattern"
             },
             {
               "begin": "(=)",
-              "end": "(\\?)|(?<=[^[:space:]=][[:space:]])(?=[[:space:]]*+[^\\.])",
+              "end": "(\\?)|(?\u003c=[^[:space:]=][[:space:]])(?=[[:space:]]*+[^\\.])",
+              "patterns": [
+                {
+                  "include": "#value-expression-atomic-with-paths"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "markup.inserted keyword.control.less message.error"
@@ -1046,88 +903,78 @@
                 "1": {
                   "name": "storage.type"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "#value-expression-atomic-with-paths"
-                }
-              ]
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "markup.inserted constant.language support.property-value entity.name.filename"
+            },
+            "2": {
+              "name": "keyword.control"
+            }
+          }
         }
       ]
     },
     "module-item-let-value-param-module": {
-      "comment": "FIXME: merge with pattern-parens",
       "begin": "\\([[:space:]]*(?=\\b(module)\\b)",
       "end": "\\)",
       "patterns": [
         {
           "begin": "\\b(module)\\b",
           "end": "(?=\\))",
+          "patterns": [
+            {
+              "name": "support.class entity.name.class",
+              "match": "\\b[[:upper:]][[:word:]]*\\b"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.other message.error"
             }
-          },
-          "patterns": [
-            {
-              "match": "\\b[[:upper:]][[:word:]]*\\b",
-              "name": "support.class entity.name.class"
-            }
-          ]
+          }
         }
       ]
     },
     "module-item-let-value-param-type": {
-      "comment": "FIXME: merge with pattern-parens",
       "begin": "\\((?=\\b(type)\\b)",
       "end": "\\)",
       "patterns": [
         {
           "begin": "\\b(type)\\b",
           "end": "(?=\\))",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.other.attribute-name.css constant.language constant.numeric"
-            }
-          },
           "patterns": [
             {
               "include": "#pattern-variable"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.other.attribute-name.css constant.language constant.numeric"
+            }
+          }
         }
       ]
     },
     "module-item-let-value-rec": {
       "begin": "(?:\\G|^)[[:space:]]*\\b(rec)\\b",
       "end": "(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control storage.modifier message.error"
-        }
-      },
       "patterns": [
         {
           "include": "#module-item-let-value-bind-name-params-type-body"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control storage.modifier message.error"
+        }
+      }
     },
     "module-item-module": {
-      "comment": "NOTE: this is to support the let-module case without the let prefix",
       "begin": "\\b(module)\\b[[:space:]]*(?!\\b(type)\\b|$)",
       "end": "(;)|(?=}|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "storage.type message.error"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
       "patterns": [
         {
           "include": "#module-item-let-module-and"
@@ -1138,30 +985,25 @@
         {
           "include": "#module-item-let-module-bind-name-params-type-body"
         }
-      ]
-    },
-    "module-item-module-type": {
-      "begin": "\\b(module)\\b[[:space:]]*(?=\\b(type)\\b|$)",
-      "end": "(;)|(?=}|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control message.error"
+          "name": "storage.type message.error"
         }
       },
       "endCaptures": {
         "1": {
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
-      },
+      }
+    },
+    "module-item-module-type": {
+      "begin": "\\b(module)\\b[[:space:]]*(?=\\b(type)\\b|$)",
+      "end": "(;)|(?=}|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|val|with)\\b)",
       "patterns": [
         {
           "begin": "(?:\\G|^)[[:space:]]*\\b(type)\\b",
           "end": "(?==)",
-          "beginCaptures": {
-            "1": {
-              "name": "entity.other.attribute-name.css constant.language constant.numeric"
-            }
-          },
           "patterns": [
             {
               "include": "#comment"
@@ -1174,16 +1016,16 @@
                 }
               }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "entity.other.attribute-name.css constant.language constant.numeric"
+            }
+          }
         },
         {
           "begin": "(=)",
           "end": "(?=;)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.less"
-            }
-          },
           "patterns": [
             {
               "include": "#comment"
@@ -1191,23 +1033,28 @@
             {
               "include": "#signature-expression"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.less"
+            }
+          }
         }
-      ]
-    },
-    "module-item-open": {
-      "begin": "\\b(open)\\b",
-      "end": "(;)|(?=}|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.open"
+          "name": "keyword.control message.error"
         }
       },
       "endCaptures": {
         "1": {
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
-      },
+      }
+    },
+    "module-item-open": {
+      "begin": "\\b(open)\\b",
+      "end": "(;)|(?=}|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#comment"
@@ -1215,22 +1062,21 @@
         {
           "include": "#module-path-simple"
         }
-      ]
-    },
-    "module-item-type": {
-      "comment": "FIXME: the semi-colon is optional so we can re-use this for hover, which does not print the trailing ;",
-      "begin": "\\b(type)\\b",
-      "end": "(;)|(?=[\\)}]|\\b(class|exception|external|include|inherit|let|method|nonrec|open|private|type|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.other"
+          "name": "keyword.control.open"
         }
       },
       "endCaptures": {
         "1": {
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
-      },
+      }
+    },
+    "module-item-type": {
+      "begin": "\\b(type)\\b",
+      "end": "(;)|(?=[\\)}]|\\b(class|exception|external|include|inherit|let|method|nonrec|open|private|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#module-item-type-and"
@@ -1241,12 +1087,26 @@
         {
           "include": "#module-item-type-bind"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+        }
+      }
     },
     "module-item-type-and": {
-      "comment": "FIXME: the optional `type` is for module constraints",
       "begin": "\\b(and)\\b([[:space:]]*type)?",
       "end": "(?=[;\\)}]|\\b(class|exception|external|include|inherit|let|method|nonrec|open|private|type|val|with)\\b)",
+      "patterns": [
+        {
+          "include": "#module-item-type-bind-name-tyvars-body"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other"
@@ -1254,15 +1114,9 @@
         "2": {
           "name": "entity.other.attribute-name.css constant.language constant.numeric"
         }
-      },
-      "patterns": [
-        {
-          "include": "#module-item-type-bind-name-tyvars-body"
-        }
-      ]
+      }
     },
     "module-item-type-bind": {
-      "comment": "FIXME: only allow module paths before type variables",
       "patterns": [
         {
           "include": "#module-item-type-bind-nonrec"
@@ -1273,24 +1127,23 @@
       ]
     },
     "module-item-type-bind-body": {
-      "comment": "FIXME: parsing",
       "begin": "(\\+?=)",
       "end": "(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.less"
-        }
-      },
       "patterns": [
         {
           "include": "#module-item-type-bind-body-item"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.less"
+        }
+      }
     },
     "module-item-type-bind-body-item": {
       "patterns": [
         {
-          "match": "(=)(?!>)|\\b(private)\\b",
+          "match": "(=)(?!\u003e)|\\b(private)\\b",
           "captures": {
             "1": {
               "name": "keyword.control.less"
@@ -1301,7 +1154,6 @@
           }
         },
         {
-          "comment": "FIXME: specialized version of variant rule that also scans for (",
           "match": "\\b([[:upper:]][[:word:]]*)\\b(?![[:space:]]*[\\.\\(])",
           "captures": {
             "1": {
@@ -1319,13 +1171,8 @@
           }
         },
         {
-          "begin": "(\\|)(?![#\\-:!?.@*/&%^+<=>|~$\\\\])[[:space:]]*",
-          "end": "(?=[;\\)}]|\\|(?![#\\-:!?.@*/&%^+<=>|~$\\\\])|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-            }
-          },
+          "begin": "(\\|)(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])[[:space:]]*",
+          "end": "(?=[;\\)}]|\\|(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
           "patterns": [
             {
               "include": "#value-expression-constructor"
@@ -1344,11 +1191,15 @@
             {
               "include": "#type-expression"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+            }
+          }
         },
         {
-          "comment": "FIXME: remove this once the pretty printer no longer outputs 'of'",
-          "match": "(:)|(\\|(?![#\\-:!?.@*/&%^+<=>|~$\\\\]))|\\b(of)\\b",
+          "match": "(:)|(\\|(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\]))|\\b(of)\\b",
           "captures": {
             "1": {
               "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
@@ -1367,13 +1218,8 @@
       ]
     },
     "module-item-type-bind-name-tyvars": {
-      "begin": "(?<=\\G|^|\\.)[[:space:]]*\\b([[:lower:]][[:word:]]*)\\b",
+      "begin": "(?\u003c=\\G|^|\\.)[[:space:]]*\\b([[:lower:]][[:word:]]*)\\b",
       "end": "(?=\\+?=|[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "entity.name.function"
-        }
-      },
       "patterns": [
         {
           "include": "#comment"
@@ -1382,11 +1228,10 @@
           "include": "#attribute"
         },
         {
-          "match": "_",
-          "name": "comment"
+          "name": "comment",
+          "match": "_"
         },
         {
-          "comment": "FIXME: add separate type-variable rule",
           "match": "([+\\-])?(?:(_)|(')([[:lower:]][[:word:]]*)\\b)(?!\\.[[:upper:]])",
           "captures": {
             "1": {
@@ -1403,7 +1248,12 @@
             }
           }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function"
+        }
+      }
     },
     "module-item-type-bind-name-tyvars-body": {
       "begin": "(?=(\\G|^)[[:space:]]*\\b[[:alpha:]])",
@@ -1423,29 +1273,22 @@
     "module-item-type-bind-nonrec": {
       "begin": "(?:\\G|^)[[:space:]]*\\b(nonrec)\\b",
       "end": "(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control storage.modifier message.error"
-        }
-      },
       "patterns": [
         {
           "include": "#module-item-type-bind-name-tyvars-body"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control storage.modifier message.error"
+        }
+      }
     },
     "module-item-type-constraint": {
-      "comment": "FIXME: proper parsing",
       "begin": "\\b(constraint)\\b",
       "end": "(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "variable.other.class.js variable.interpolation storage.modifier message.error"
-        }
-      },
       "patterns": [
         {
-          "comment": "FIXME: add separate type-variable rule",
           "match": "([+\\-])?(')([_[:lower:]][[:word:]]*)\\b(?!\\.[[:upper:]])",
           "captures": {
             "1": {
@@ -1460,28 +1303,152 @@
           }
         },
         {
-          "match": "=",
-          "name": "keyword.control.less"
+          "name": "keyword.control.less",
+          "match": "="
         },
         {
           "include": "#type-expression"
         }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "variable.other.class.js variable.interpolation storage.modifier message.error"
+        }
+      }
+    },
+    "module-name-extended": {
+      "patterns": [
+        {
+          "include": "#module-name-simple"
+        },
+        {
+          "begin": "([\\(])",
+          "end": "([\\)])",
+          "patterns": [
+            {
+              "include": "#module-path-extended"
+            }
+          ],
+          "captures": {
+            "1": {
+              "name": "entity.other.attribute-name.css constant.language constant.numeric"
+            }
+          }
+        }
       ]
     },
-    "object-item": {
-      "begin": "\\G|(;)",
-      "end": "(?=[;}]|\\b(class|constraint|exception|external|include|let|module|nonrec|open|private|type|val|with)\\b)",
-      "beginCaptures": {
+    "module-name-simple": {
+      "name": "support.class entity.name.class",
+      "match": "\\b[[:upper:]][[:word:]]*\\b"
+    },
+    "module-path-extended": {
+      "patterns": [
+        {
+          "include": "#module-name-extended"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "([\\.])",
+          "end": "(?\u003c=[[:word:]\\)])|(?=[^\\.[:upper:]/])",
+          "patterns": [
+            {
+              "begin": "(?\u003c=[\\.])",
+              "end": "(?\u003c=[[:word:]\\)])|(?=[^\\.[:upper:]/])",
+              "patterns": [
+                {
+                  "include": "#comment"
+                },
+                {
+                  "include": "#module-name-extended"
+                }
+              ]
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.less"
+            }
+          }
+        }
+      ]
+    },
+    "module-path-extended-prefix": {
+      "begin": "(?=\\b[[:upper:]])",
+      "end": "([\\.])|(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
+      "patterns": [
+        {
+          "include": "#module-path-extended"
+        }
+      ],
+      "endCaptures": {
         "1": {
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
-      },
+      }
+    },
+    "module-path-simple": {
       "patterns": [
         {
-          "include": "#class-item-method"
+          "include": "#module-name-simple"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "([\\.])",
+          "end": "(?\u003c=[[:word:]\\)])|(?=[^\\.[:upper:]/])",
+          "patterns": [
+            {
+              "begin": "(?\u003c=[\\.])",
+              "end": "(?\u003c=[[:word:]\\)])|(?=[^\\.[:upper:]/])",
+              "patterns": [
+                {
+                  "include": "#comment"
+                },
+                {
+                  "include": "#module-name-simple"
+                }
+              ]
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+            }
+          }
         }
       ]
     },
+    "module-path-simple-prefix": {
+      "begin": "(?=\\b[[:upper:]])",
+      "end": "([\\.])|(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
+      "patterns": [
+        {
+          "include": "#module-path-simple"
+        }
+      ],
+      "endCaptures": {
+        "1": {
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+        }
+      }
+    },
+    "object-item": {
+      "begin": "\\G|(;)",
+      "end": "(?=[;}]|\\b(class|constraint|exception|external|include|let|module|nonrec|open|private|type|val|with)\\b)",
+      "patterns": [
+        {
+          "include": "#class-item-method"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+        }
+      }
+    },
     "operator": {
       "patterns": [
         {
@@ -1495,8 +1462,8 @@
     "operator-infix": {
       "patterns": [
         {
-          "match": ";",
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error",
+          "match": ";"
         },
         {
           "include": "#operator-infix-assign"
@@ -1507,25 +1474,21 @@
         {
           "include": "#operator-infix-custom"
         },
-        {
-          "comment": "#operator-infix-custom-hash"
-        }
+        {}
       ]
     },
     "operator-infix-assign": {
-      "match": "(?<![#\\-:!?.@*/&%^+<=>|~$\\\\])(=)(?![#\\-:!?.@*/&%^+<=>|~$\\\\])",
-      "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control.less message.error"
+      "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control.less message.error",
+      "match": "(?\u003c![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])(=)(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])"
     },
     "operator-infix-builtin": {
-      "match": ":=",
-      "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control.less message.error"
+      "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control.less message.error",
+      "match": ":="
     },
     "operator-infix-custom": {
-      "match": "(?:(?<![#\\-:!?.@*/&%^+<=>|~$\\\\])((<>))(?![#\\-:!?.@*/&%^+<=>|~$\\\\]))|([#\\-@*/&%^+<=>$\\\\][#\\-:!?.@*/&%^+<=>|~$\\\\]*|[|][#\\-:!?.@*/&%^+<=>|~$\\\\]+)",
+      "match": "(?:(?\u003c![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])((\u003c\u003e))(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\]))|([#\\-@*/\u0026%^+\u003c=\u003e$\\\\][#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\]*|[|][#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\]+)",
       "captures": {
-        "1": {
-          "comment": "meta.separator"
-        },
+        "1": {},
         "2": {
           "name": "punctuation.definition.tag.begin.js"
         },
@@ -1535,8 +1498,8 @@
       }
     },
     "operator-infix-custom-hash": {
-      "match": "#[\\-:!?.@*/&%^+<=>|~$]+",
-      "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+      "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error",
+      "match": "#[\\-:!?.@*/\u0026%^+\u003c=\u003e|~$]+"
     },
     "operator-prefix": {
       "patterns": [
@@ -1549,12 +1512,12 @@
       ]
     },
     "operator-prefix-bang": {
-      "match": "![\\-:!?.@*/&%^+<=>|~$]*",
-      "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+      "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error",
+      "match": "![\\-:!?.@*/\u0026%^+\u003c=\u003e|~$]*"
     },
     "operator-prefix-label-token": {
-      "match": "[?~][\\-:!?.@*/&%^+<=>|~$]+",
-      "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+      "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error",
+      "match": "[?~][\\-:!?.@*/\u0026%^+\u003c=\u003e|~$]+"
     },
     "pattern": {
       "patterns": [
@@ -1568,7 +1531,7 @@
           "include": "#pattern-atomic"
         },
         {
-          "match": "[[:space:]]*+(?:(\\|(?![#\\-:!?.@*/&%^+<=>|~$\\\\]))|\\b(as)\\b|(\\.\\.\\.?))[[:space:]]*+",
+          "match": "[[:space:]]*+(?:(\\|(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\]))|\\b(as)\\b|(\\.\\.\\.?))[[:space:]]*+",
           "captures": {
             "1": {
               "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
@@ -1586,8 +1549,8 @@
     "pattern-atomic": {
       "patterns": [
         {
-          "match": "\\b(exception)\\b",
-          "name": "keyword.other"
+          "name": "keyword.other",
+          "match": "\\b(exception)\\b"
         },
         {
           "include": "#value-expression-literal"
@@ -1611,63 +1574,141 @@
     },
     "pattern-guard": {
       "begin": "\\b(when)\\b",
-      "end": "(?==>)",
+      "end": "(?==\u003e)",
+      "patterns": [
+        {
+          "include": "#value-expression"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.other"
         }
+      }
+    },
+    "pattern-list-or-array": {
+      "begin": "(\\[\\|?)(?![@%])",
+      "end": "(\\|?\\])",
+      "patterns": [
+        {
+          "include": "#value-expression-literal-list-or-array-separator"
+        },
+        {
+          "include": "#pattern"
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "entity.other.attribute-name.css constant.language constant.numeric"
+        }
       },
+      "endCaptures": {
+        "1": {
+          "name": "entity.other.attribute-name.css constant.language constant.numeric"
+        }
+      }
+    },
+    "pattern-parens": {
+      "begin": "(?=\\()",
+      "end": "\\)|(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
-          "include": "#value-expression"
+          "include": "#pattern-parens-lhs"
+        },
+        {
+          "include": "#type-annotation-rhs"
         }
       ]
     },
-    "pattern-list-or-array": {
-      "begin": "(\\[\\|?)(?![@%])",
-      "end": "(\\|?\\])",
+    "pattern-parens-lhs": {
+      "begin": "\\(|(,)",
+      "end": "(?=(?:[,:\\)]))|(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
+      "patterns": [
+        {
+          "include": "#pattern"
+        }
+      ],
       "beginCaptures": {
         "1": {
-          "name": "entity.other.attribute-name.css constant.language constant.numeric"
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+        }
+      }
+    },
+    "pattern-record": {
+      "begin": "{",
+      "end": "}",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#pattern-record-item"
+        }
+      ]
+    },
+    "pattern-record-field": {
+      "begin": "\\b([_][[:word:]]*)\\b|\\b([[:lower:]][[:word:]]*)\\b",
+      "end": "(,)|(?=})",
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "\\G(:)",
+          "end": "(?=[,}])",
+          "patterns": [
+            {
+              "include": "#pattern"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+            }
+          }
+        }
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "comment"
+        },
+        "2": {
+          "name": "markup.inserted constant.language support.property-value entity.name.filename"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "entity.other.attribute-name.css constant.language constant.numeric"
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
-      },
+      }
+    },
+    "pattern-record-item": {
       "patterns": [
         {
-          "include": "#value-expression-literal-list-or-array-separator"
+          "include": "#module-path-simple-prefix"
         },
         {
-          "include": "#pattern"
+          "include": "#pattern-record-field"
         }
       ]
     },
-    "pattern-parens": {
-      "begin": "(?=\\()",
-      "end": "\\)|(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
+    "pattern-variable": {
       "patterns": [
         {
-          "include": "#pattern-parens-lhs"
+          "match": "\\b(_(?:[[:lower:]][[:word:]]*)?)\\b(?!\\.[[:upper:]])",
+          "captures": {
+            "1": {
+              "name": "comment"
+            }
+          }
         },
         {
-          "include": "#type-annotation-rhs"
-        }
-      ]
-    },
-    "pattern-parens-lhs": {
-      "begin": "\\(|(,)",
-      "end": "(?=(?:[,:\\)]))|(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#pattern"
+          "match": "\\b([[:lower:]][[:word:]]*)\\b(?!\\.[[:upper:]])",
+          "captures": {
+            "1": {
+              "name": "variable.language string.other.link"
+            }
+          }
         }
       ]
     },
@@ -1686,22 +1727,6 @@
     "record-path-suffix": {
       "begin": "(\\.)",
       "end": "(\\))|\\b([[:upper:]][[:word:]]*)\\b|\\b([[:lower:]][[:word:]]*)\\b|(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "keyword.control"
-        },
-        "2": {
-          "name": "support.class entity.name.class"
-        },
-        "3": {
-          "name": "markup.inserted constant.language support.property-value entity.name.filename"
-        }
-      },
       "patterns": [
         {
           "include": "#comment"
@@ -1709,11 +1734,6 @@
         {
           "begin": "([\\(])",
           "end": "(?=[\\)])",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control"
-            }
-          },
           "patterns": [
             {
               "include": "#comment"
@@ -1730,8 +1750,8 @@
               }
             },
             {
-              "match": "([\\.])",
-              "name": "keyword.control.less"
+              "name": "keyword.control.less",
+              "match": "([\\.])"
             },
             {
               "match": "\\b([[:lower:]][[:word:]]*)\\b[[:space:]]*",
@@ -1744,98 +1764,40 @@
             {
               "include": "#value-expression"
             }
-          ]
-        }
-      ]
-    },
-    "pattern-record": {
-      "begin": "{",
-      "end": "}",
-      "patterns": [
-        {
-          "include": "#comment"
-        },
-        {
-          "include": "#pattern-record-item"
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control"
+            }
+          }
         }
-      ]
-    },
-    "pattern-record-field": {
-      "begin": "\\b([_][[:word:]]*)\\b|\\b([[:lower:]][[:word:]]*)\\b",
-      "end": "(,)|(?=})",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "comment"
-        },
-        "2": {
-          "name": "markup.inserted constant.language support.property-value entity.name.filename"
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
       },
       "endCaptures": {
         "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
-      "patterns": [
-        {
-          "include": "#comment"
-        },
-        {
-          "begin": "\\G(:)",
-          "end": "(?=[,}])",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#pattern"
-            }
-          ]
-        }
-      ]
-    },
-    "pattern-record-item": {
-      "patterns": [
-        {
-          "include": "#module-path-simple-prefix"
+          "name": "keyword.control"
         },
-        {
-          "include": "#pattern-record-field"
-        }
-      ]
-    },
-    "pattern-variable": {
-      "patterns": [
-        {
-          "match": "\\b(_(?:[[:lower:]][[:word:]]*)?)\\b(?!\\.[[:upper:]])",
-          "captures": {
-            "1": {
-              "name": "comment"
-            }
-          }
+        "2": {
+          "name": "support.class entity.name.class"
         },
-        {
-          "match": "\\b([[:lower:]][[:word:]]*)\\b(?!\\.[[:upper:]])",
-          "captures": {
-            "1": {
-              "name": "variable.language string.other.link"
-            }
-          }
+        "3": {
+          "name": "markup.inserted constant.language support.property-value entity.name.filename"
         }
-      ]
+      }
     },
     "signature-expression": {
       "patterns": [
         {
-          "comment": "FIXME: scan for :upper: to disambiguate type/signature in hover",
           "begin": "(?=\\([[:space:]]*[[:upper:]][[:word:]]*[[:space:]]*:)",
           "end": "(?=[;])",
           "patterns": [
             {
               "begin": "(?=\\()",
-              "end": "(?=[;]|=>)",
+              "end": "(?=[;]|=\u003e)",
               "patterns": [
                 {
                   "include": "#module-item-let-module-param"
@@ -1843,24 +1805,36 @@
               ]
             },
             {
-              "begin": "(=>)",
+              "begin": "(=\u003e)",
               "end": "(?=[;\\(])",
-              "beginCaptures": {
-                "1": {
-                  "name": "markup.inserted keyword.control.less"
-                }
-              },
               "patterns": [
                 {
                   "include": "#structure-expression"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "markup.inserted keyword.control.less"
+                }
+              }
             }
           ]
         },
         {
           "begin": "\\b(module)\\b[[:space:]]*\\b(type)\\b([[:space:]]*\\b(of)\\b)?",
           "end": "(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#module-path-simple"
+            },
+            {
+              "name": "support.class entity.name.class",
+              "match": "\\b([[:upper:]][[:word:]]*)\\b"
+            }
+          ],
           "beginCaptures": {
             "1": {
               "name": "markup.inserted keyword.other variable.other.readwrite.instance"
@@ -1871,19 +1845,7 @@
             "3": {
               "name": "markup.inserted keyword.other variable.other.readwrite.instance"
             }
-          },
-          "patterns": [
-            {
-              "include": "#comment"
-            },
-            {
-              "include": "#module-path-simple"
-            },
-            {
-              "match": "\\b([[:upper:]][[:word:]]*)\\b",
-              "name": "support.class entity.name.class"
-            }
-          ]
+          }
         },
         {
           "include": "#signature-expression-constraints"
@@ -1900,24 +1862,13 @@
         {
           "begin": "\\b(and|with)\\b",
           "end": "(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|val|with)\\b)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.class.js variable.interpolation storage.modifier message.error"
-            }
-          },
           "patterns": [
             {
               "include": "#comment"
             },
             {
-              "comment": "FIXME: special version of #module-item-type with non-consuming `;`. Atom seems to need this to work.",
               "begin": "\\b(type)\\b",
               "end": "(?=[;\\)}]|\\b(class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|val|with)\\b)",
-              "beginCaptures": {
-                "1": {
-                  "name": "entity.other.attribute-name.css constant.language constant.numeric"
-                }
-              },
               "patterns": [
                 {
                   "include": "#module-item-type-and"
@@ -1928,7 +1879,12 @@
                 {
                   "include": "#module-item-type-bind"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "entity.other.attribute-name.css constant.language constant.numeric"
+                }
+              }
             },
             {
               "begin": "(?=\\b(module)\\b)",
@@ -1937,11 +1893,6 @@
                 {
                   "begin": "\\b(module)\\b",
                   "end": "(?=:?=|[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|type|val|with)\\b)",
-                  "beginCaptures": {
-                    "1": {
-                      "name": "markup.inserted keyword.control storage.type variable.other.readwrite.instance"
-                    }
-                  },
                   "patterns": [
                     {
                       "include": "#comment"
@@ -1950,14 +1901,24 @@
                       "include": "#module-path-simple"
                     },
                     {
-                      "match": "[[:upper:]][[:word:]]*",
-                      "name": "support.class entity.name.class"
+                      "name": "support.class entity.name.class",
+                      "match": "[[:upper:]][[:word:]]*"
+                    }
+                  ],
+                  "beginCaptures": {
+                    "1": {
+                      "name": "markup.inserted keyword.control storage.type variable.other.readwrite.instance"
                     }
-                  ]
+                  }
                 },
                 {
                   "begin": "(:=)|(=)",
                   "end": "(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|type|val|with)\\b)",
+                  "patterns": [
+                    {
+                      "include": "#structure-expression"
+                    }
+                  ],
                   "beginCaptures": {
                     "1": {
                       "name": "markup.inserted keyword.control.less message.error"
@@ -1965,16 +1926,16 @@
                     "2": {
                       "name": "markup.inserted keyword.control.less"
                     }
-                  },
-                  "patterns": [
-                    {
-                      "include": "#structure-expression"
-                    }
-                  ]
+                  }
                 }
               ]
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.class.js variable.interpolation storage.modifier message.error"
+            }
+          }
         }
       ]
     },
@@ -1984,34 +1945,32 @@
           "include": "#comment"
         },
         {
-          "comment": "FIXME: scan for :upper: or `val` to disambiguate types from signatures for hover",
-          "begin": "\\((?=[[:space:]]*(\\b(val)\\b|[^'\\[<[:lower:]]))",
+          "begin": "\\((?=[[:space:]]*(\\b(val)\\b|[^'\\[\u003c[:lower:]]))",
           "end": "\\)|(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|with)\\b)",
           "patterns": [
             {
               "include": "#comment"
             },
             {
-              "comment": "FIXME: might need to refactor this or include more expressions",
               "include": "#structure-expression-block"
             },
             {
               "begin": "\\b(val)\\b",
               "end": "(?=\\))|(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-              "beginCaptures": {
-                "1": {
-                  "name": "keyword.other"
-                }
-              },
               "patterns": [
                 {
                   "include": "#comment"
                 },
                 {
-                  "match": "\\b([[:lower:]][[:word:]]*)\\b",
-                  "name": "support.class entity.name.class"
+                  "name": "support.class entity.name.class",
+                  "match": "\\b([[:lower:]][[:word:]]*)\\b"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "keyword.other"
+                }
+              }
             },
             {
               "include": "#module-path-simple"
@@ -2019,16 +1978,16 @@
             {
               "begin": "(:)",
               "end": "(?=[\\)])|(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val)\\b)",
-              "beginCaptures": {
-                "1": {
-                  "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-                }
-              },
               "patterns": [
                 {
                   "include": "#signature-expression"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+                }
+              }
             }
           ]
         },
@@ -2084,27 +2043,27 @@
         {
           "include": "#module-item-type"
         }
-      ]
-    },
-    "type-annotation-rhs": {
-      "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$\\\\])([:])(?![#\\-:!?.@*/&%^+<=>|~$\\\\])",
-      "end": "(?=\\))|(?=[,;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
+      ]
+    },
+    "type-annotation-rhs": {
+      "begin": "(?\u003c![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])([:])(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])",
+      "end": "(?=\\))|(?=[,;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#type-expression"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+        }
+      }
     },
     "type-expression": {
       "patterns": [
         {
-          "match": "([\\.])",
-          "name": "entity.name.function"
+          "name": "entity.name.function",
+          "match": "([\\.])"
         },
         {
           "include": "#type-expression-atomic"
@@ -2114,6 +2073,10 @@
         }
       ]
     },
+    "type-expression-arrow": {
+      "name": "markup.inserted keyword.control.less",
+      "match": "=\u003e"
+    },
     "type-expression-atomic": {
       "patterns": [
         {
@@ -2129,8 +2092,8 @@
           "include": "#type-expression-label"
         },
         {
-          "match": "\\b(as)\\b",
-          "name": "variable.other.class.js variable.interpolation storage.modifier message.error"
+          "name": "variable.other.class.js variable.interpolation storage.modifier message.error",
+          "match": "\\b(as)\\b"
         },
         {
           "include": "#type-expression-constructor"
@@ -2152,10 +2115,6 @@
         }
       ]
     },
-    "type-expression-arrow": {
-      "match": "=>",
-      "name": "markup.inserted keyword.control.less"
-    },
     "type-expression-constructor": {
       "match": "(_)(?![[:alnum:]])|\\b([_[:lower:]][[:word:]]*)\\b(?!\\.[[:upper:]])",
       "captures": {
@@ -2169,15 +2128,7 @@
     },
     "type-expression-label": {
       "begin": "\\b([_[:lower:]][[:word:]]*)\\b(::)",
-      "end": "(?<==>)",
-      "beginCaptures": {
-        "1": {
-          "name": "markup.inserted constant.language support.property-value entity.name.filename"
-        },
-        "2": {
-          "name": "keyword.control"
-        }
-      },
+      "end": "(?\u003c==\u003e)",
       "patterns": [
         {
           "include": "#type-expression"
@@ -2190,21 +2141,23 @@
             }
           }
         }
-      ]
-    },
-    "type-expression-object": {
-      "comment": "FIXME: separate sub-rules",
-      "begin": "(<)",
-      "end": "(>)",
-      "captures": {
+      ],
+      "beginCaptures": {
         "1": {
-          "name": "entity.name.function"
+          "name": "markup.inserted constant.language support.property-value entity.name.filename"
+        },
+        "2": {
+          "name": "keyword.control"
         }
-      },
+      }
+    },
+    "type-expression-object": {
+      "begin": "(\u003c)",
+      "end": "(\u003e)",
       "patterns": [
         {
           "begin": "(\\.\\.)",
-          "end": "(?=>)",
+          "end": "(?=\u003e)",
           "beginCaptures": {
             "1": {
               "name": "entity.other.attribute-name.css constant.language constant.numeric"
@@ -2212,17 +2165,10 @@
           }
         },
         {
-          "comment": "FIXME: method item",
           "begin": "(?=[_[:lower:]])",
-          "end": "(,)|(?=>)",
-          "endCaptures": {
-            "1": {
-              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-            }
-          },
+          "end": "(,)|(?=\u003e)",
           "patterns": [
             {
-              "comment": "FIXME: method name",
               "begin": "(?=[_[:lower:]])",
               "end": "(?=:)",
               "patterns": [
@@ -2237,37 +2183,40 @@
               ]
             },
             {
-              "comment": "FIXME: method type",
               "begin": "(:)",
-              "end": "(?=[,>])",
-              "beginCaptures": {
-                "1": {
-                  "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-                }
-              },
+              "end": "(?=[,\u003e])",
               "patterns": [
                 {
                   "include": "#type-expression"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+                }
+              }
             }
-          ]
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+            }
+          }
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "entity.name.function"
+        }
+      }
     },
     "type-expression-parens": {
-      "comment": "FIXME: proper tuple types",
       "begin": "\\(",
       "end": "\\)",
       "patterns": [
         {
           "begin": "\\b(module)\\b",
           "end": "(?=[\\)])",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other message.error"
-            }
-          },
           "patterns": [
             {
               "include": "#module-path-extended"
@@ -2275,11 +2224,16 @@
             {
               "include": "#signature-expression-constraints"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other message.error"
+            }
+          }
         },
         {
-          "match": ",",
-          "name": "keyword.control.less"
+          "name": "keyword.control.less",
+          "match": ","
         },
         {
           "include": "#type-expression"
@@ -2287,32 +2241,18 @@
       ]
     },
     "type-expression-polymorphic-variant": {
-      "comment": "FIXME: proper parsing",
-      "begin": "(\\[)([<>])?",
+      "begin": "(\\[)([\u003c\u003e])?",
       "end": "(\\])",
-      "captures": {
-        "1": {
-          "name": "entity.name.function"
-        },
-        "2": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
       "patterns": [
         {
-          "begin": "(\\|)?(?![#\\-:!?.@*/&%^+<=>|~$\\\\])[[:space:]]*",
-          "end": "(?=[;)}\\]]|\\|(?![#\\-:!?.@*/&%^+<=>|~$\\\\])|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-            }
-          },
+          "begin": "(\\|)?(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])[[:space:]]*",
+          "end": "(?=[;)}\\]]|\\|(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
           "patterns": [
             {
               "include": "#value-expression-constructor"
             },
             {
-              "match": "([:])|\\b(of)\\b|([&])",
+              "match": "([:])|\\b(of)\\b|([\u0026])",
               "captures": {
                 "1": {
                   "name": "keyword.control.less"
@@ -2331,9 +2271,22 @@
             {
               "include": "#type-expression"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+            }
+          }
         }
-      ]
+      ],
+      "captures": {
+        "1": {
+          "name": "entity.name.function"
+        },
+        "2": {
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+        }
+      }
     },
     "type-expression-record": {
       "begin": "{",
@@ -2344,19 +2297,30 @@
         }
       ]
     },
+    "type-expression-record-field": {
+      "patterns": [
+        {
+          "begin": "\\b(mutable)\\b",
+          "end": "(?\u003c=[,])|(?=})",
+          "patterns": [
+            {
+              "include": "#type-expression-record-field-sans-modifier"
+            }
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "variable.other.class.js variable.interpolation storage.modifier message.error"
+            }
+          }
+        },
+        {
+          "include": "#type-expression-record-field-sans-modifier"
+        }
+      ]
+    },
     "type-expression-record-field-sans-modifier": {
       "begin": "\\b([_[:lower:]][[:word:]]*)\\b",
       "end": "(,)|(?=[,}])",
-      "beginCaptures": {
-        "1": {
-          "name": "markup.inserted constant.language support.property-value entity.name.filename"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
       "patterns": [
         {
           "include": "#comment"
@@ -2364,39 +2328,28 @@
         {
           "begin": "(:)",
           "end": "(?=[,}])",
-          "beginCaptures": {
-            "1": {
-              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-            }
-          },
           "patterns": [
             {
               "include": "#type-expression"
             }
-          ]
-        }
-      ]
-    },
-    "type-expression-record-field": {
-      "patterns": [
-        {
-          "begin": "\\b(mutable)\\b",
-          "end": "(?<=[,])|(?=})",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "variable.other.class.js variable.interpolation storage.modifier message.error"
-            }
-          },
-          "patterns": [
-            {
-              "include": "#type-expression-record-field-sans-modifier"
+              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
             }
-          ]
-        },
-        {
-          "include": "#type-expression-record-field-sans-modifier"
+          }
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "markup.inserted constant.language support.property-value entity.name.filename"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+        }
+      }
     },
     "type-expression-record-item": {
       "patterns": [
@@ -2452,8 +2405,8 @@
           "include": "#module-path-simple-prefix"
         },
         {
-          "match": "[:?]",
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error",
+          "match": "[:?]"
         },
         {
           "include": "#record-path"
@@ -2591,7 +2544,7 @@
     },
     "value-expression-for": {
       "begin": "(?=\\b(for)\\b)",
-      "end": "(?<=})|(?=[;]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
+      "end": "(?\u003c=})|(?=[;]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#value-expression-for-head"
@@ -2608,11 +2561,6 @@
         {
           "begin": "\\b(for)\\b",
           "end": "(?=\\b(in)\\b)|(?=[;]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.loop"
-            }
-          },
           "patterns": [
             {
               "include": "#comment"
@@ -2620,16 +2568,16 @@
             {
               "include": "#pattern-variable"
             }
-          ]
-        },
-        {
-          "begin": "\\b(in)\\b",
-          "end": "(?=\\b(to)\\b)|(?=[;]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.loop"
             }
-          },
+          }
+        },
+        {
+          "begin": "\\b(in)\\b",
+          "end": "(?=\\b(to)\\b)|(?=[;]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
           "patterns": [
             {
               "include": "#comment"
@@ -2637,16 +2585,16 @@
             {
               "include": "#value-expression-atomic-with-paths"
             }
-          ]
-        },
-        {
-          "begin": "\\b(to)\\b",
-          "end": "(?={)|(?=[;]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
+          ],
           "beginCaptures": {
             "1": {
               "name": "keyword.control.loop"
             }
-          },
+          }
+        },
+        {
+          "begin": "\\b(to)\\b",
+          "end": "(?={)|(?=[;]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
           "patterns": [
             {
               "include": "#comment"
@@ -2654,7 +2602,12 @@
             {
               "include": "#value-expression-atomic-with-paths"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.loop"
+            }
+          }
         },
         {
           "include": "#value-expression-block"
@@ -2664,11 +2617,6 @@
     "value-expression-fun": {
       "begin": "\\b(fun)\\b",
       "end": "(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control"
-        }
-      },
       "patterns": [
         {
           "include": "#value-expression-fun-pattern-match-rule-lhs"
@@ -2676,12 +2624,21 @@
         {
           "include": "#value-expression-fun-pattern-match-rule-rhs"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control"
+        }
+      }
     },
     "value-expression-fun-pattern-match-rule-lhs": {
-      "begin": "(?=\\|(?![#\\-:!?.@*/&%^+<=>|~$\\\\]))|(?<=fun)",
-      "end": "(\\|(?![#\\-:!?.@*/&%^+<=>|~$\\\\]))|(?==>)|(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "applyEndPatternLast": true,
+      "begin": "(?=\\|(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\]))|(?\u003c=fun)",
+      "end": "(\\|(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\]))|(?==\u003e)|(?=[;\\)}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
+      "patterns": [
+        {
+          "include": "#module-item-let-value-param"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
@@ -2692,35 +2649,25 @@
           "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
         }
       },
+      "applyEndPatternLast": true
+    },
+    "value-expression-fun-pattern-match-rule-rhs": {
+      "begin": "(=\u003e)",
+      "end": "(?=[;\\)}]|\\|(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\])|\\b(and)\\b)",
       "patterns": [
         {
-          "include": "#module-item-let-value-param"
+          "include": "#value-expression"
         }
-      ]
-    },
-    "value-expression-fun-pattern-match-rule-rhs": {
-      "begin": "(=>)",
-      "end": "(?=[;\\)}]|\\|(?![#\\-:!?.@*/&%^+<=>|~$\\\\])|\\b(and)\\b)",
+      ],
       "beginCaptures": {
         "1": {
           "name": "keyword.control.less"
         }
-      },
-      "patterns": [
-        {
-          "include": "#value-expression"
-        }
-      ]
+      }
     },
     "value-expression-if-then-else": {
       "begin": "\\b(if)\\b",
       "end": "(?=[;\\)\\]}])",
-      "applyEndPatternLast": true,
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.conditional"
-        }
-      },
       "patterns": [
         {
           "include": "#comment"
@@ -2728,34 +2675,36 @@
         {
           "begin": "\\b(else)\\b",
           "end": "(?=[;\\)\\]}])",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control.conditional"
-            }
-          },
           "patterns": [
             {
               "include": "#value-expression"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.conditional"
+            }
+          }
         },
         {
           "include": "#value-expression-atomic-with-paths"
         }
-      ]
-    },
-    "value-expression-lazy": {
-      "comment": "FIXME",
-      "match": "\\b(lazy)\\b",
-      "captures": {
+      ],
+      "beginCaptures": {
         "1": {
-          "name": "keyword.other"
+          "name": "keyword.control.conditional"
         }
-      }
+      },
+      "applyEndPatternLast": true
     },
     "value-expression-label": {
       "begin": "\\b([_[:lower:]][[:word:]]*)\\b[[:space:]]*(::)(\\?)?",
       "end": "(?![[:space:]])",
+      "patterns": [
+        {
+          "include": "#value-expression"
+        }
+      ],
       "beginCaptures": {
         "1": {
           "name": "markup.inserted constant.language support.property-value entity.name.filename"
@@ -2766,12 +2715,15 @@
         "3": {
           "name": "storage.type"
         }
-      },
-      "patterns": [
-        {
-          "include": "#value-expression"
+      }
+    },
+    "value-expression-lazy": {
+      "match": "\\b(lazy)\\b",
+      "captures": {
+        "1": {
+          "name": "keyword.other"
         }
-      ]
+      }
     },
     "value-expression-literal": {
       "patterns": [
@@ -2802,26 +2754,16 @@
       ]
     },
     "value-expression-literal-boolean": {
-      "match": "\\b(false|true)\\b",
-      "name": "entity.other.attribute-name.css constant.language constant.numeric"
+      "name": "entity.other.attribute-name.css constant.language constant.numeric",
+      "match": "\\b(false|true)\\b"
     },
     "value-expression-literal-character": {
-      "match": "(')([[:space:]]|[[:graph:]]|\\\\[\\\\\"'ntbr]|\\\\[[:digit:]][[:digit:]][[:digit:]]|\\\\x[[:xdigit:]][[:xdigit:]]|\\\\o[0-3][0-7][0-7])(')",
-      "name": "constant.character"
+      "name": "constant.character",
+      "match": "(')([[:space:]]|[[:graph:]]|\\\\[\\\\\"'ntbr]|\\\\[[:digit:]][[:digit:]][[:digit:]]|\\\\x[[:xdigit:]][[:xdigit:]]|\\\\o[0-3][0-7][0-7])(')"
     },
     "value-expression-literal-list-or-array": {
       "begin": "(\\[\\|?)(?![@%])",
       "end": "(\\|?\\])",
-      "beginCaptures": {
-        "1": {
-          "name": "constant.language.list"
-        }
-      },
-      "endCaptures": {
-        "1": {
-          "name": "constant.language.list"
-        }
-      },
       "patterns": [
         {
           "include": "#value-expression-literal-list-or-array-separator"
@@ -2832,7 +2774,17 @@
         {
           "include": "#value-expression-literal-list-or-array"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "constant.language.list"
+        }
+      },
+      "endCaptures": {
+        "1": {
+          "name": "constant.language.list"
+        }
+      }
     },
     "value-expression-literal-list-or-array-separator": {
       "match": "(,)|(\\.\\.\\.)",
@@ -2935,24 +2887,17 @@
     "value-expression-literal-string": {
       "patterns": [
         {
-          "begin": "(?<![[:alpha:]])js_expr(?!=[[:word:]])",
-          "end": "(?<=\")|(\\|)([_[:lower:]]*)?(})|(?=[^[:space:]\"{])",
-          "endCaptures": {
-            "1": {
-              "name": "keyword.control.flow message.error"
-            },
-            "2": {
-              "name": "entity.other.attribute-name.css constant.language constant.numeric"
-            },
-            "3": {
-              "name": "keyword.control.flow message.error"
-            }
-          },
+          "begin": "(?\u003c![[:alpha:]])js_expr(?!=[[:word:]])",
+          "end": "(?\u003c=\")|(\\|)([_[:lower:]]*)?(})|(?=[^[:space:]\"{])",
           "patterns": [
             {
               "begin": "({)([_[:lower:]]*)?(\\|)",
               "end": "(?=\\|\\2})",
-              "comment": "meta.separator",
+              "patterns": [
+                {
+                  "include": "source.js"
+                }
+              ],
               "beginCaptures": {
                 "1": {
                   "name": "keyword.control.flow message.error"
@@ -2963,29 +2908,34 @@
                 "3": {
                   "name": "keyword.control.flow message.error"
                 }
-              },
-              "patterns": [
-                {
-                  "include": "source.js"
-                }
-              ]
+              }
             },
             {
               "begin": "\"",
               "end": "\"",
-              "comment": "meta.separator",
               "patterns": [
                 {
                   "include": "source.js"
                 }
               ]
             }
-          ]
+          ],
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.flow message.error"
+            },
+            "2": {
+              "name": "entity.other.attribute-name.css constant.language constant.numeric"
+            },
+            "3": {
+              "name": "keyword.control.flow message.error"
+            }
+          }
         },
         {
+          "name": "string.double string.regexp",
           "begin": "({)([_[:lower:]]*)?(\\|)",
           "end": "(\\|)(\\2)(})",
-          "name": "string.double string.regexp",
           "beginCaptures": {
             "1": {
               "name": "keyword.control.flow message.error"
@@ -3010,9 +2960,9 @@
           }
         },
         {
+          "name": "string.double string.regexp",
           "begin": "\"",
           "end": "\"",
-          "name": "string.double string.regexp",
           "patterns": [
             {
               "include": "#value-expression-literal-string-escape"
@@ -3024,9 +2974,8 @@
     "value-expression-literal-string-escape": {
       "patterns": [
         {
-          "comment": "FIXME: make escapes into separate rule",
-          "match": "\\\\[\\\\\"'ntbr ]|\\\\[[:digit:]][[:digit:]][[:digit:]]|\\\\x[[:xdigit:]][[:xdigit:]]|\\\\o[0-3][0-7][0-7]",
-          "name": "constant.character"
+          "name": "constant.character",
+          "match": "\\\\[\\\\\"'ntbr ]|\\\\[[:digit:]][[:digit:]][[:digit:]]|\\\\x[[:xdigit:]][[:xdigit:]]|\\\\o[0-3][0-7][0-7]"
         },
         {
           "match": "(@)([ \\[\\],.]|\\\\n)",
@@ -3040,7 +2989,6 @@
           }
         },
         {
-          "comment": "FIXME: don't highlight in external strings",
           "match": "(%)([ads])?",
           "captures": {
             "1": {
@@ -3054,11 +3002,10 @@
       ]
     },
     "value-expression-literal-unit": {
-      "match": "\\(\\)",
-      "name": "constant.language.unit"
+      "name": "constant.language.unit",
+      "match": "\\(\\)"
     },
     "value-expression-object-look": {
-      "comment": "FIXME: is there a better way than listing all the keywords?",
       "begin": "(?:\\G|^)[[:space:]]*(?=method)",
       "end": "(?=})",
       "patterns": [
@@ -3070,8 +3017,6 @@
     "value-expression-parens": {
       "begin": "(?=\\()",
       "end": "(\\))|(?=[;}]|\\b(and|class|constraint|exception|external|include|inherit|let|method|module|nonrec|open|private|rec|type|val|with)\\b)",
-      "endCaptures": {
-      },
       "patterns": [
         {
           "include": "#condition-lhs"
@@ -3087,46 +3032,36 @@
     "value-expression-parens-lhs": {
       "begin": "(\\()|(,)",
       "end": "(?=[?,:\\)]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
-      "beginCaptures": {
-        "2": {
-          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-        }
-      },
       "patterns": [
         {
           "begin": "\\b(module)\\b",
           "end": "(?=\\))",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.other message.error"
-            }
-          },
           "patterns": [
             {
               "include": "#module-path-simple"
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other message.error"
+            }
+          }
         },
         {
           "include": "#value-expression"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "2": {
+          "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+        }
+      }
     },
     "value-expression-record-field": {
       "patterns": [
         {
           "begin": "(\\.\\.\\.)",
           "end": "(,)|(?=})",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.control"
-            }
-          },
-          "endCaptures": {
-            "1": {
-              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-            }
-          },
           "patterns": [
             {
               "include": "#comment"
@@ -3139,40 +3074,40 @@
               "end": "(?=[:,])",
               "patterns": [
                 {
-                  "match": "\\b[[:lower:]][[:word:]]*\\b",
-                  "name": "markup.inserted constant.language support.property-value entity.name.filename"
+                  "name": "markup.inserted constant.language support.property-value entity.name.filename",
+                  "match": "\\b[[:lower:]][[:word:]]*\\b"
                 }
               ]
             },
             {
               "begin": "(:)",
               "end": "(?=[,}])",
-              "beginCaptures": {
-                "1": {
-                  "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-                }
-              },
               "patterns": [
                 {
                   "include": "#value-expression"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+                }
+              }
             }
-          ]
-        },
-        {
-          "begin": "\\b[[:upper:]][[:word:]]*\\b",
-          "end": "(,)|(?=})",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "support.class entity.name.class"
+              "name": "keyword.control"
             }
           },
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
             }
-          },
+          }
+        },
+        {
+          "begin": "\\b[[:upper:]][[:word:]]*\\b",
+          "end": "(,)|(?=})",
           "patterns": [
             {
               "include": "#module-path-simple-prefix"
@@ -3180,48 +3115,58 @@
             {
               "begin": "(:)",
               "end": "(?=[,}])",
-              "beginCaptures": {
-                "1": {
-                  "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-                }
-              },
               "patterns": [
                 {
                   "include": "#value-expression"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+                }
+              }
             }
-          ]
-        },
-        {
-          "begin": "\\b([[:lower:]][[:word:]]*)\\b",
-          "end": "(,)|(?=})",
+          ],
           "beginCaptures": {
             "1": {
-              "name": "markup.inserted constant.language support.property-value entity.name.filename"
+              "name": "support.class entity.name.class"
             }
           },
           "endCaptures": {
             "1": {
               "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
             }
-          },
+          }
+        },
+        {
+          "begin": "\\b([[:lower:]][[:word:]]*)\\b",
+          "end": "(,)|(?=})",
           "patterns": [
             {
               "begin": "(:)",
               "end": "(?=[,}])",
-              "beginCaptures": {
-                "1": {
-                  "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
-                }
-              },
               "patterns": [
                 {
                   "include": "#value-expression"
                 }
-              ]
+              ],
+              "beginCaptures": {
+                "1": {
+                  "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+                }
+              }
             }
-          ]
+          ],
+          "beginCaptures": {
+            "1": {
+              "name": "markup.inserted constant.language support.property-value entity.name.filename"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js variable.interpolation keyword.operator keyword.control message.error"
+            }
+          }
         }
       ]
     },
@@ -3238,14 +3183,18 @@
         }
       ]
     },
+    "value-expression-record-look": {
+      "begin": "(?=\\.\\.\\.|([[:upper:]][[:word:]]*\\.)*([[:lower:]][[:word:]]*)[[:space:]]*[,:}])",
+      "end": "(?=})",
+      "patterns": [
+        {
+          "include": "#value-expression-record-item"
+        }
+      ]
+    },
     "value-expression-switch": {
       "begin": "\\b(switch)\\b",
-      "end": "(?<=})",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.switch"
-        }
-      },
+      "end": "(?\u003c=})",
       "patterns": [
         {
           "include": "#value-expression-switch-head"
@@ -3253,7 +3202,12 @@
         {
           "include": "#value-expression-switch-body"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.switch"
+        }
+      }
     },
     "value-expression-switch-body": {
       "begin": "{",
@@ -3268,8 +3222,8 @@
       ]
     },
     "value-expression-switch-head": {
-      "begin": "(?<=switch)",
-      "end": "(?<!switch)(?={)|(?=[;\\)]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
+      "begin": "(?\u003c=switch)",
+      "end": "(?\u003c!switch)(?={)|(?=[;\\)]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#comment"
@@ -3299,8 +3253,8 @@
       ]
     },
     "value-expression-switch-pattern-match-rule-lhs": {
-      "begin": "(?=\\|(?![#\\-:!?.@*/&%^+<=>|~$\\\\]))",
-      "end": "(?==>|[;\\)}])",
+      "begin": "(?=\\|(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\]))",
+      "end": "(?==\u003e|[;\\)}])",
       "patterns": [
         {
           "include": "#pattern-guard"
@@ -3311,27 +3265,22 @@
       ]
     },
     "value-expression-switch-pattern-match-rule-rhs": {
-      "begin": "(=>)",
-      "end": "(?=}|\\|(?![#\\-:!?.@*/&%^+<=>|~$\\\\]))",
-      "beginCaptures": {
-        "1": {
-          "name": "keyword.control.less"
-        }
-      },
+      "begin": "(=\u003e)",
+      "end": "(?=}|\\|(?![#\\-:!?.@*/\u0026%^+\u003c=\u003e|~$\\\\]))",
       "patterns": [
         {
           "include": "#value-expression-block-item"
         }
-      ]
-    },
-    "value-expression-try": {
-      "begin": "\\b(try)\\b",
-      "end": "(?<=})|(?=[;\\)]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.trycatch"
+          "name": "keyword.control.less"
         }
-      },
+      }
+    },
+    "value-expression-try": {
+      "begin": "\\b(try)\\b",
+      "end": "(?\u003c=})|(?=[;\\)]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#value-expression-try-head"
@@ -3339,16 +3288,16 @@
         {
           "include": "#value-expression-switch-body"
         }
-      ]
-    },
-    "value-expression-try-head": {
-      "begin": "(?<=try)",
-      "end": "(?<!try)(?={)|(?=[;\\)]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control"
+          "name": "keyword.control.trycatch"
         }
-      },
+      }
+    },
+    "value-expression-try-head": {
+      "begin": "(?\u003c=try)",
+      "end": "(?\u003c!try)(?={)|(?=[;\\)]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#comment"
@@ -3365,16 +3314,16 @@
         {
           "include": "#value-expression-atomic-with-paths"
         }
-      ]
-    },
-    "value-expression-while": {
-      "begin": "\\b(while)\\b",
-      "end": "(?<=})|(?=[;\\)]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
+      ],
       "beginCaptures": {
         "1": {
-          "name": "keyword.control.loop"
+          "name": "keyword.control"
         }
-      },
+      }
+    },
+    "value-expression-while": {
+      "begin": "\\b(while)\\b",
+      "end": "(?\u003c=})|(?=[;\\)]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
           "include": "#value-expression-while-head"
@@ -3382,10 +3331,15 @@
         {
           "include": "#value-expression-block"
         }
-      ]
+      ],
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.control.loop"
+        }
+      }
     },
     "value-expression-while-head": {
-      "begin": "(?<=while)[[:space:]]*+",
+      "begin": "(?\u003c=while)[[:space:]]*+",
       "end": "(?={)|(?=[;\\)]|\\b(and|as|class|constraint|exception|external|include|inherit|let|method|nonrec|open|private|rec|type|val|with)\\b)",
       "patterns": [
         {
@@ -3395,15 +3349,6 @@
           "include": "#value-expression-atomic-with-paths"
         }
       ]
-    },
-    "value-expression-record-look": {
-      "begin": "(?=\\.\\.\\.|([[:upper:]][[:word:]]*\\.)*([[:lower:]][[:word:]]*)[[:space:]]*[,:}])",
-      "end": "(?=})",
-      "patterns": [
-        {
-          "include": "#value-expression-record-item"
-        }
-      ]
     }
   }
-}
+}