'"' in comments confuses comment recognition (#469)

giraud · Jul 5, 2024 · 2b78165 · 2b78165
1 parent e7e54d5
commit 2b78165
Show file tree

Hide file tree

Showing 3 changed files with 572 additions and 538 deletions.
diff --git a/src/main/java/com/reason/lang/ocaml/OCaml.flex b/src/main/java/com/reason/lang/ocaml/OCaml.flex
@@ -18,6 +18,7 @@ import static com.intellij.psi.TokenType.*;
     private CharSequence quotedStringId;
     private int commentDepth;
     private boolean inCommentString = false;
+    private boolean inCommentChar = false;
 
     // Store the start index of a token
     private void tokenStart() {
@@ -169,7 +170,7 @@ ESCAPE_CHAR= {ESCAPE_BACKSLASH} | {ESCAPE_SINGLE_QUOTE} | {ESCAPE_LF} | {ESCAPE_
     "`"{LOWERCASE}{IDENTCHAR}*       { return types.POLY_VARIANT; }
 
     "\"" { yybegin(IN_STRING); tokenStart(); }
-    "(*" { yybegin(IN_OCAML_ML_COMMENT); inCommentString = false; commentDepth = 1; tokenStart(); }
+    "(*" { yybegin(IN_OCAML_ML_COMMENT); inCommentString = false; inCommentChar = false; commentDepth = 1; tokenStart(); }
 
     "#if"     { return types.DIRECTIVE_IF; }
     "#else"   { return types.DIRECTIVE_ELSE; }
@@ -259,11 +260,12 @@ ESCAPE_CHAR= {ESCAPE_BACKSLASH} | {ESCAPE_SINGLE_QUOTE} | {ESCAPE_LF} | {ESCAPE_
 }
 
 <IN_OCAML_ML_COMMENT> {
-    "(*" { if (!inCommentString) commentDepth += 1; }
-    "*)" { if (!inCommentString) { commentDepth -= 1; if(commentDepth == 0) { yybegin(INITIAL); tokenEnd(); return types.MULTI_COMMENT; } } }
-    "\"" { inCommentString = !inCommentString; }
+    "'" . "'"      { /* a char */ }
+    "(*"           { if (!inCommentString) commentDepth += 1; }
+    "*)"           { if (!inCommentString) { commentDepth -= 1; if(commentDepth == 0) { yybegin(INITIAL); tokenEnd(); return types.MULTI_COMMENT; } } }
+    "\""           { inCommentString = !inCommentString; }
      . | {NEWLINE} { }
-    <<EOF>> { yybegin(INITIAL); tokenEnd(); return types.MULTI_COMMENT; }
+    <<EOF>>        { yybegin(INITIAL); tokenEnd(); return types.MULTI_COMMENT; }
 }
 
 [^] { return BAD_CHARACTER; }