Merge pull request #348 from mnxn/ocaml-syntax-characters

Fix interaction between character literals and comments/escaped quotes in OCaml files
ocamllabs · Sep 2, 2020 · dd2ee74 · dd2ee74
2 parents 140d7f4 + b456554
commit dd2ee74
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## Unreleased
+
+- Fix interaction between character literals and comments/escaped quotes in
+  OCaml files (#348)
+
 ## 1.1.0
 
 - Highlight method keyword in ocaml interface (#340)

diff --git a/syntaxes/ocaml.json b/syntaxes/ocaml.json
@@ -151,6 +151,10 @@
 
     "strings-in-comments": {
       "patterns": [
+        {
+          "comment": "char literal",
+          "match": "'(\\\\)?.'"
+        },
         {
           "comment": "string literal",
           "begin": "\"",
@@ -234,11 +238,6 @@
 
     "characters": {
       "patterns": [
-        {
-          "comment": "character literal",
-          "name": "string.quoted.other.ocaml constant.character.ocaml",
-          "match": "'.'"
-        },
         {
           "comment": "character literal from escaped backslash",
           "name": "string.quoted.other.ocaml constant.character.ocaml",
@@ -276,6 +275,11 @@
           "captures": {
             "1": { "name": "invalid.illegal.unknown-escape.ocaml" }
           }
+        },
+        {
+          "comment": "character literal",
+          "name": "string.quoted.other.ocaml constant.character.ocaml",
+          "match": "'.'"
         }
       ]
     },