From 6e23f81bcefcfb3cc435f84815e29dad9218b02b Mon Sep 17 00:00:00 2001
From: Florian Loitsch <florian@toit.io>
Date: Sun, 18 Feb 2024 18:50:25 +0100
Subject: [PATCH] Fix coloring of Types with '-' in their name. (#245)

Types like `X-Of` weren't highlighted as type.
---
 vscode/syntaxes/toit.tmLanguage.json | 4 ++--
 vscode/syntaxes/toit.tmLanguage.yaml | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/vscode/syntaxes/toit.tmLanguage.json b/vscode/syntaxes/toit.tmLanguage.json
index 8abe7b1..50bc786 100644
--- a/vscode/syntaxes/toit.tmLanguage.json
+++ b/vscode/syntaxes/toit.tmLanguage.json
@@ -741,11 +741,11 @@
       "patterns": [
         {
           "name": "entity.name.type.toit",
-          "match": "\\b(?<!-)_?[A-Z][0-9]*(?<!-)\\b[?]?"
+          "match": "\\b(?<!-)_?[A-Z][A-Z_-]*[a-z][\\w-]*(?<!-)\\b[?]?"
         },
         {
           "name": "entity.name.type.toit",
-          "match": "\\b(?<!-)_?[A-Z][A-Z_-]*[a-z][\\w-]*(?<!-)\\b[?]?"
+          "match": "\\b(?<!-)_?[A-Z][0-9]*_?(?<!-)\\b[?]?"
         },
         {
           "name": "entity.name.type.shorts.toit",
diff --git a/vscode/syntaxes/toit.tmLanguage.yaml b/vscode/syntaxes/toit.tmLanguage.yaml
index b087dc4..d57138e 100644
--- a/vscode/syntaxes/toit.tmLanguage.yaml
+++ b/vscode/syntaxes/toit.tmLanguage.yaml
@@ -459,10 +459,12 @@ repository:
     #  - single capitalized character -> a type: 'class A'.
     #  - single capitalized character followed by a number -> also a type: `class C1`.
     #  - capitalized identifier with at least on lower-case character: a type.
-    - name: entity.name.type.toit
-      match: \b(?<!-)_?[A-Z][0-9]*(?<!-)\b[?]?
+
+    # Match the longer type first, so that we match something like `X-Of`.
     - name: entity.name.type.toit
       match: \b(?<!-)_?[A-Z][A-Z_-]*[a-z][\w-]*(?<!-)\b[?]?
+    - name: entity.name.type.toit
+      match: \b(?<!-)_?[A-Z][0-9]*_?(?<!-)\b[?]?
     - name: entity.name.type.shorts.toit
       match: \b(?<!-)(int|bool|float|string)(?<!-)\b[?]?
     - name: entity.name.type.any_none.toit