From a2a5db3c901a3c2f28eaab029fd5ce83e943522e Mon Sep 17 00:00:00 2001
From: Ryan Goulden <percontation@gmail.com>
Date: Thu, 16 Feb 2017 14:06:58 -0800
Subject: [PATCH 1/3] Fix '"' in comments

Previously, the strings '"' and '\"' (literal, incl. the single quotes and
backslash) were misdetected as starting a string inside comment blocks.
---
 Syntaxes/OCaml.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Syntaxes/OCaml.plist b/Syntaxes/OCaml.plist
index c28d2ed..d34adba 100644
--- a/Syntaxes/OCaml.plist
+++ b/Syntaxes/OCaml.plist
@@ -1275,7 +1275,7 @@
 				</dict>
 				<dict>
 					<key>begin</key>
-					<string>(?=[^\\])(")</string>
+					<string>(")(?:(?&lt;!\x27")(?&lt;!\x27\x5c")|(?!\x27))</string>
 					<key>end</key>
 					<string>"</string>
 					<key>name</key>

From 0fd5ebee196f22ddeac286a68bf806041257dca1 Mon Sep 17 00:00:00 2001
From: Ryan Goulden <percontation@gmail.com>
Date: Fri, 17 Feb 2017 01:54:24 -0800
Subject: [PATCH 2/3] fix fun()->...

There doesn't need to be a space after fun.
---
 Syntaxes/OCaml.plist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Syntaxes/OCaml.plist b/Syntaxes/OCaml.plist
index d34adba..9371ba9 100644
--- a/Syntaxes/OCaml.plist
+++ b/Syntaxes/OCaml.plist
@@ -152,7 +152,7 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>(\(|\s)(?=fun\s)</string>
+			<string>(\(|\s)(?=fun\b)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -177,7 +177,7 @@
 			<array>
 				<dict>
 					<key>begin</key>
-					<string>(?&lt;=(\(|\s))(fun)\s</string>
+					<string>(?&lt;=(\(|\s))(fun)\b</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>2</key>

From 74ccddeabbba983bf2e26fc2a3ba191b3b360023 Mon Sep 17 00:00:00 2001
From: Ryan Goulden <percontation@gmail.com>
Date: Wed, 18 Oct 2017 02:23:40 -0700
Subject: [PATCH 3/3] Module signatures syntax fixes

Properly highlight val ( op ) : ...
Fix meta.module.signature.val.ocaml end regex
---
 Syntaxes/OCaml.plist | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Syntaxes/OCaml.plist b/Syntaxes/OCaml.plist
index 9371ba9..827e766 100644
--- a/Syntaxes/OCaml.plist
+++ b/Syntaxes/OCaml.plist
@@ -1498,7 +1498,7 @@
 			<array>
 				<dict>
 					<key>begin</key>
-					<string>(val)\s+([a-z_][a-zA-Z0-9_']*)\s*(:)</string>
+					<string>(val)\s+([a-z_][a-zA-Z0-9_']*|\(\s*([#!$%&amp;*+./:&lt;=&gt;?@^|~-]+|and|land|lor|lsl|lsr|asr|lxor|mod|or)\s*\))\s*(:)</string>
 					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
@@ -1512,13 +1512,18 @@
 							<string>entity.name.type.value-signature.ocaml</string>
 						</dict>
 						<key>3</key>
+						<dict>
+							<key>name</key>
+							<string>keyword.operator.ocaml</string>
+						</dict>
+						<key>4</key>
 						<dict>
 							<key>name</key>
 							<string>punctuation.separator.type-constraint.ocaml</string>
 						</dict>
 					</dict>
 					<key>end</key>
-					<string>(?=\b(type|val|external|class|module|end)\b)|^\s*$</string>
+					<string>(?=\s*\b(type|val|external|class|module|end)\b)|^\s*$</string>
 					<key>name</key>
 					<string>meta.module.signature.val.ocaml</string>
 					<key>patterns</key>