From 55691918e619c5c1709723184264d16ab92bc12e Mon Sep 17 00:00:00 2001
From: ftovagliari <ftovagliari@gmail.com>
Date: Sun, 9 Aug 2026 17:41:51 +0200
Subject: [PATCH 1/2] feature: add syntax highlighting support for OCamllex and
 OCamlyacc

---
 THIRD-PARTY-LICENSES.md               |  16 +-
 src/Models/TextMateHelper.cs          |   2 +
 src/Resources/Grammars/ocamllex.json  | 302 +++++++++++++++++++++++
 src/Resources/Grammars/ocamlyacc.json | 343 ++++++++++++++++++++++++++
 4 files changed, 662 insertions(+), 1 deletion(-)
 create mode 100644 src/Resources/Grammars/ocamllex.json
 create mode 100644 src/Resources/Grammars/ocamlyacc.json

diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md
index d10d08be2..8a0d4a062 100644
--- a/THIRD-PARTY-LICENSES.md
+++ b/THIRD-PARTY-LICENSES.md
@@ -120,9 +120,23 @@ The project uses the following third-party libraries or assets
 - **License**: MIT License
 - **License Link**: https://github.com/shentao/vue-multiselect/blob/master/LICENSE
 
+### OCamllex
+
+- **Source**: https://github.com/textmate/ocaml.tmbundle/blob/master/Syntaxes/OCamllex.tmLanguage
+- **Commit**: 1eff26848b39368414cb4214183a2cba22f12d0e
+- **License**: Permission to copy, use, modify, sell and distribute this software is granted. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose.
+- **License Link**: https://github.com/textmate/ocaml.tmbundle/tree/master#license
+
+### OCamlyacc
+
+- **Source**: https://github.com/textmate/ocaml.tmbundle/blob/master/Syntaxes/OCamlyacc.tmLanguage
+- **Commit**: 08a892aef6a4b285b1902d9ed1427653fce53e31
+- **License**: Permission to copy, use, modify, sell and distribute this software is granted. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose.
+- **License Link**: https://github.com/textmate/ocaml.tmbundle/tree/master#license
+
 ### Erlang
 
 - **Source**: https://github.com/shentao/vue-multiselect/blob/master/docs/shiki/languages/erlang.tmLanguage.json
 - **Commit**: 8092917041f0ae02cbe4c6982deddc931c6adecd
 - **License**: MIT License
-- **License Link**: https://github.com/shentao/vue-multiselect/blob/master/LICENSE
\ No newline at end of file
+- **License Link**: https://github.com/shentao/vue-multiselect/blob/master/LICENSE
diff --git a/src/Models/TextMateHelper.cs b/src/Models/TextMateHelper.cs
index 0dd3b5ac7..3d01d57cc 100644
--- a/src/Models/TextMateHelper.cs
+++ b/src/Models/TextMateHelper.cs
@@ -29,6 +29,8 @@ public static class GrammarUtility
             new ExtraGrammar("source.vue", [".vue"], "vue.json"),
             new ExtraGrammar("source.erlang", [".erl", ".escript", ".hrl"], "erlang.json"),
             new ExtraGrammar("source.ocaml", [".ml", ".mli"], "ocaml.json"),
+            new ExtraGrammar("source.ocamllex", [".mll"], "ocamllex.json"),
+            new ExtraGrammar("source.ocamlyacc", [".mly"], "ocamlyacc.json"),
         ];
 
         private static readonly Dictionary<string, IRawGrammar> s_cachedRawGrammars = new();
diff --git a/src/Resources/Grammars/ocamllex.json b/src/Resources/Grammars/ocamllex.json
new file mode 100644
index 000000000..80795ad9e
--- /dev/null
+++ b/src/Resources/Grammars/ocamllex.json
@@ -0,0 +1,302 @@
+{
+  "name": "ocamllex",
+  "scopeName": "source.ocamllex",
+  "fileTypes": [ "mll" ],
+  "foldingStartMarker": "{",
+  "foldingStopMarker": "}",
+  "keyEquivalent": "^~O",
+  "patterns": [
+    {
+      "begin": "^\\s*({)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.section.embedded.ocaml.begin.ocamllex"
+        }
+      },
+      "end": "^\\s*(})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.section.embedded.ocaml.end.ocamllex"
+        }
+      },
+      "name": "meta.embedded.ocaml",
+      "patterns": [
+        {
+          "include": "source.ocaml"
+        }
+      ]
+    },
+    {
+      "begin": "\\b(let)\\s+([a-z][a-zA-Z0-9'_]*)\\s+=",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.pattern-definition.ocamllex"
+        },
+        "2": {
+          "name": "entity.name.type.pattern.stupid-goddamn-hack.ocamllex"
+        }
+      },
+      "end": "^(?:\\s*let)|(?:\\s*(rule|$))",
+      "name": "meta.pattern-definition.ocaml",
+      "patterns": [
+        {
+          "include": "#match-patterns"
+        }
+      ]
+    },
+    {
+      "begin": "(rule|and)\\s+([a-z][a-zA-Z0-9_]*)\\s+(=)\\s+(parse)(?=\\s*$)|((?<!\\|)(\\|)(?!\\|))",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.other.ocamllex"
+        },
+        "2": {
+          "name": "entity.name.function.entrypoint.ocamllex"
+        },
+        "3": {
+          "name": "keyword.operator.ocamllex"
+        },
+        "4": {
+          "name": "keyword.other.ocamllex"
+        },
+        "5": {
+          "name": "punctuation.separator.match-pattern.ocamllex"
+        }
+      },
+      "end": "(?:^\\s*((and)\\b|(?=\\|)|$))",
+      "endCaptures": {
+        "3": {
+          "name": "keyword.other.entry-definition.ocamllex"
+        }
+      },
+      "name": "meta.pattern-match.ocaml",
+      "patterns": [
+        {
+          "include": "#match-patterns"
+        },
+        {
+          "include": "#actions"
+        }
+      ]
+    },
+    {
+      "include": "#strings"
+    },
+    {
+      "include": "#comments"
+    },
+    {
+      "match": "=",
+      "name": "keyword.operator.symbol.ocamllex"
+    },
+    {
+      "begin": "\\(",
+      "end": "\\)",
+      "name": "meta.paren-group.ocamllex",
+      "patterns": [
+        {
+          "include": "$self"
+        }
+      ]
+    },
+    {
+      "match": "(’|‘|“|”)",
+      "name": "invalid.illegal.unrecognized-character.ocamllex"
+    }
+  ],
+  "repository": {
+    "actions": {
+      "patterns": [
+        {
+          "begin": "[^\\']({)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.action.begin.ocamllex"
+            }
+          },
+          "end": "(})",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.action.end.ocamllex"
+            }
+          },
+          "name": "meta.action.ocamllex",
+          "patterns": [
+            {
+              "include": "source.ocaml"
+            }
+          ]
+        }
+      ]
+    },
+    "chars": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.char.begin.ocamllex"
+            },
+            "4": {
+              "name": "punctuation.definition.char.end.ocamllex"
+            }
+          },
+          "match": "(')([^\\\\]|\\\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\]))(')",
+          "name": "constant.character.ocamllex"
+        }
+      ]
+    },
+    "comments": {
+      "patterns": [
+        {
+          "begin": "\\(\\*",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.begin.ocaml"
+            }
+          },
+          "end": "\\*\\)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.end.ocaml"
+            }
+          },
+          "name": "comment.block.ocaml",
+          "patterns": [
+            {
+              "include": "#comments"
+            }
+          ]
+        },
+        {
+          "begin": "(?=[^\\\\])(\")",
+          "end": "\"",
+          "name": "comment.block.string.quoted.double.ocaml",
+          "patterns": [
+            {
+              "match": "\\\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\])",
+              "name": "comment.block.string.constant.character.escape.ocaml"
+            }
+          ]
+        }
+      ]
+    },
+    "match-patterns": {
+      "patterns": [
+        {
+          "begin": "(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.sub-pattern.begin.ocamllex"
+            }
+          },
+          "end": "(\\))",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.sub-pattern.end.ocamllex"
+            }
+          },
+          "name": "meta.pattern.sub-pattern.ocamllex",
+          "patterns": [
+            {
+              "include": "#match-patterns"
+            }
+          ]
+        },
+        {
+          "match": "[a-z][a-zA-Z0-9'_]",
+          "name": "entity.name.type.pattern.reference.stupid-goddamn-hack.ocamllex"
+        },
+        {
+          "match": "\\bas\\b",
+          "name": "keyword.other.pattern.ocamllex"
+        },
+        {
+          "match": "eof",
+          "name": "constant.language.eof.ocamllex"
+        },
+        {
+          "match": "_",
+          "name": "constant.language.universal-match.ocamllex"
+        },
+        {
+          "begin": "(\\[)(\\^?)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.character-class.begin.ocamllex"
+            },
+            "2": {
+              "name": "punctuation.definition.character-class.negation.ocamllex"
+            }
+          },
+          "end": "(])(?!\\')",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.character-class.end.ocamllex"
+            }
+          },
+          "name": "meta.pattern.character-class.ocamllex",
+          "patterns": [
+            {
+              "match": "-",
+              "name": "punctuation.separator.character-class.range.ocamllex"
+            },
+            {
+              "include": "#chars"
+            }
+          ]
+        },
+        {
+          "match": "\\*|\\+|\\?",
+          "name": "keyword.operator.pattern.modifier.ocamllex"
+        },
+        {
+          "match": "\\|",
+          "name": "keyword.operator.pattern.alternation.ocamllex"
+        },
+        {
+          "include": "#chars"
+        },
+        {
+          "include": "#strings"
+        }
+      ]
+    },
+    "strings": {
+      "patterns": [
+        {
+          "begin": "(?=[^\\\\])(\")",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.begin.ocaml"
+            }
+          },
+          "end": "(\")",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.string.end.ocaml"
+            }
+          },
+          "name": "string.quoted.double.ocamllex",
+          "patterns": [
+            {
+              "match": "\\\\$[ \\t]*",
+              "name": "punctuation.separator.string.ignore-eol.ocaml"
+            },
+            {
+              "match": "\\\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\])",
+              "name": "constant.character.string.escape.ocaml"
+            },
+            {
+              "match": "\\\\[\\|\\(\\)1-9$^.*+?\\[\\]]",
+              "name": "constant.character.regexp.escape.ocaml"
+            },
+            {
+              "match": "\\\\(?!(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\]|[\\|\\(\\)1-9$^.*+?\\[\\]]|$[ \\t]*))(?:.)",
+              "name": "invalid.illegal.character.string.escape"
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/src/Resources/Grammars/ocamlyacc.json b/src/Resources/Grammars/ocamlyacc.json
new file mode 100644
index 000000000..847c8d74e
--- /dev/null
+++ b/src/Resources/Grammars/ocamlyacc.json
@@ -0,0 +1,343 @@
+{
+  "name": "ocamlyacc",
+  "scopeName": "source.ocamlyacc",
+  "fileTypes": [ "mly" ],
+  "foldingStartMarker": "%{|%%",
+  "foldingStopMarker": "%}|%%",
+  "keyEquivalent": "^~O",
+  "patterns": [
+    {
+      "begin": "(%{)\\s*$",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.section.header.begin.ocamlyacc"
+        }
+      },
+      "end": "^\\s*(%})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.section.header.end.ocamlyacc"
+        }
+      },
+      "name": "meta.header.ocamlyacc",
+      "patterns": [
+        {
+          "include": "source.ocaml"
+        }
+      ]
+    },
+    {
+      "begin": "(?<=%})\\s*$",
+      "end": "(?:^)(?=%%)",
+      "name": "meta.declarations.ocamlyacc",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#declaration-matches"
+        }
+      ]
+    },
+    {
+      "begin": "(%%)\\s*$",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.section.rules.begin.ocamlyacc"
+        }
+      },
+      "end": "^\\s*(%%)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.section.rules.end.ocamlyacc"
+        }
+      },
+      "name": "meta.rules.ocamlyacc",
+      "patterns": [
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#rules"
+        }
+      ]
+    },
+    {
+      "include": "source.ocaml"
+    },
+    {
+      "include": "#comments"
+    },
+    {
+      "match": "(’|‘|“|”)",
+      "name": "invalid.illegal.unrecognized-character.ocaml"
+    }
+  ],
+  "repository": {
+    "comments": {
+      "patterns": [
+        {
+          "begin": "/\\*",
+          "end": "\\*/",
+          "name": "comment.block.ocamlyacc",
+          "patterns": [
+            {
+              "include": "#comments"
+            }
+          ]
+        },
+        {
+          "begin": "(?=[^\\\\])(\")",
+          "end": "\"",
+          "name": "comment.block.string.quoted.double.ocamlyacc",
+          "patterns": [
+            {
+              "match": "\\\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\\d\\d|[bnrt'\"\\\\])",
+              "name": "comment.block.string.constant.character.escape.ocamlyacc"
+            }
+          ]
+        }
+      ]
+    },
+    "declaration-matches": {
+      "patterns": [
+        {
+          "begin": "(%)(token)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.decorator.token.ocamlyacc"
+            },
+            "2": {
+              "name": "keyword.other.token.ocamlyacc"
+            }
+          },
+          "end": "^\\s*($|(^\\s*(?=%)))",
+          "name": "meta.token.declaration.ocamlyacc",
+          "patterns": [
+            {
+              "include": "#symbol-types"
+            },
+            {
+              "match": "[A-Z][A-Za-z0-9_]*",
+              "name": "entity.name.type.token.ocamlyacc"
+            },
+            {
+              "include": "#comments"
+            }
+          ]
+        },
+        {
+          "begin": "(%)(left|right|nonassoc)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.decorator.token.associativity.ocamlyacc"
+            },
+            "2": {
+              "name": "keyword.other.token.associativity.ocamlyacc"
+            }
+          },
+          "end": "(^\\s*$)|(^\\s*(?=%))",
+          "name": "meta.token.associativity.ocamlyacc",
+          "patterns": [
+            {
+              "match": "[A-Z][A-Za-z0-9_]*",
+              "name": "entity.name.type.token.ocamlyacc"
+            },
+            {
+              "match": "[a-z][A-Za-z0-9_]*",
+              "name": "entity.name.function.non-terminal.reference.ocamlyacc"
+            },
+            {
+              "include": "#comments"
+            }
+          ]
+        },
+        {
+          "begin": "(%)(start)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.decorator.start-symbol.ocamlyacc"
+            },
+            "2": {
+              "name": "keyword.other.start-symbol.ocamlyacc"
+            }
+          },
+          "end": "(^\\s*$)|(^\\s*(?=%))",
+          "name": "meta.start-symbol.ocamlyacc",
+          "patterns": [
+            {
+              "match": "[a-z][A-Za-z0-9_]*",
+              "name": "entity.name.function.non-terminal.reference.ocamlyacc"
+            },
+            {
+              "include": "#comments"
+            }
+          ]
+        },
+        {
+          "begin": "(%)(type)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.other.decorator.symbol-type.ocamlyacc"
+            },
+            "2": {
+              "name": "keyword.other.symbol-type.ocamlyacc"
+            }
+          },
+          "end": "$\\s*(?!%)",
+          "name": "meta.symbol-type.ocamlyacc",
+          "patterns": [
+            {
+              "include": "#symbol-types"
+            },
+            {
+              "match": "[A-Z][A-Za-z0-9_]*",
+              "name": "entity.name.type.token.reference.ocamlyacc"
+            },
+            {
+              "match": "[a-z][A-Za-z0-9_]*",
+              "name": "entity.name.function.non-terminal.reference.ocamlyacc"
+            },
+            {
+              "include": "#comments"
+            }
+          ]
+        }
+      ]
+    },
+    "precs": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "keyword.other.decorator.precedence.ocamlyacc"
+            },
+            "2": {
+              "name": "keyword.other.precedence.ocamlyacc"
+            },
+            "4": {
+              "name": "entity.name.function.non-terminal.reference.ocamlyacc"
+            },
+            "5": {
+              "name": "entity.name.type.token.reference.ocamlyacc"
+            }
+          },
+          "match": "(%)(prec)\\s+(([a-z][a-zA-Z0-9_]*)|(([A-Z][a-zA-Z0-9_]*)))",
+          "name": "meta.precidence.declaration"
+        }
+      ]
+    },
+    "references": {
+      "patterns": [
+        {
+          "match": "[a-z][a-zA-Z0-9_]*",
+          "name": "entity.name.function.non-terminal.reference.ocamlyacc"
+        },
+        {
+          "match": "[A-Z][a-zA-Z0-9_]*",
+          "name": "entity.name.type.token.reference.ocamlyacc"
+        }
+      ]
+    },
+    "rule-patterns": {
+      "patterns": [
+        {
+          "begin": "((?<!\\||:)(\\||:)(?!\\||:))",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.separator.rule.ocamlyacc"
+            }
+          },
+          "end": "\\s*(?=\\||;)",
+          "name": "meta.rule-match.ocaml",
+          "patterns": [
+            {
+              "include": "#precs"
+            },
+            {
+              "include": "#semantic-actions"
+            },
+            {
+              "include": "#references"
+            },
+            {
+              "include": "#comments"
+            }
+          ]
+        }
+      ]
+    },
+    "rules": {
+      "patterns": [
+        {
+          "begin": "[a-z][a-zA-Z_]*",
+          "beginCaptures": {
+            "0": {
+              "name": "entity.name.function.non-terminal.ocamlyacc"
+            }
+          },
+          "end": ";",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.separator.rule.ocamlyacc"
+            }
+          },
+          "name": "meta.non-terminal.ocamlyacc",
+          "patterns": [
+            {
+              "include": "#rule-patterns"
+            }
+          ]
+        }
+      ]
+    },
+    "semantic-actions": {
+      "patterns": [
+        {
+          "begin": "[^\\']({)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.action.semantic.ocamlyacc"
+            }
+          },
+          "end": "(})",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.action.semantic.ocamlyacc"
+            }
+          },
+          "name": "meta.action.semantic.ocamlyacc",
+          "patterns": [
+            {
+              "include": "source.ocaml"
+            }
+          ]
+        }
+      ]
+    },
+    "symbol-types": {
+      "patterns": [
+        {
+          "begin": "<",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.type-declaration.begin.ocamlyacc"
+            }
+          },
+          "end": ">",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.type-declaration.end.ocamlyacc"
+            }
+          },
+          "name": "meta.token.type-declaration.ocamlyacc",
+          "patterns": [
+            {
+              "include": "source.ocaml"
+            }
+          ]
+        }
+      ]
+    }
+  }
+}

From f94ea2f5b552f0e15337f76865ef7e971699dbcf Mon Sep 17 00:00:00 2001
From: ftovagliari <ftovagliari@gmail.com>
Date: Sun, 9 Aug 2026 17:42:35 +0200
Subject: [PATCH 2/2] Fix: Simplify comment scopes in ocaml grammar

- Reduced the scope names for `commentBlock` and `commentDoc` to just "comment".
- Removed unnecessary `constant.regexp` and `meta.separator.markdown` scopes.
- Added a missing newline at the end of the file.
---
 src/Resources/Grammars/ocaml.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Resources/Grammars/ocaml.json b/src/Resources/Grammars/ocaml.json
index 84d6f82f3..26674d6eb 100644
--- a/src/Resources/Grammars/ocaml.json
+++ b/src/Resources/Grammars/ocaml.json
@@ -729,7 +729,7 @@
     "commentBlock": {
       "begin": "\\(\\*(?!\\*[^\\)])",
       "end": "\\*\\)",
-      "name": "comment constant.regexp meta.separator.markdown",
+      "name": "comment",
       "contentName": "emphasis",
       "patterns": [
         {
@@ -743,7 +743,7 @@
     "commentDoc": {
       "begin": "\\(\\*\\*",
       "end": "\\*\\)",
-      "name": "comment constant.regexp meta.separator.markdown",
+      "name": "comment",
       "patterns": [
         {
           "match": "\\*"
@@ -2958,4 +2958,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}