From c44337968e022f13be522868254ec6c3fb368382 Mon Sep 17 00:00:00 2001
From: phannebohm <phannebohm@hsbi.de>
Date: Thu, 4 Apr 2024 16:26:48 +0200
Subject: [PATCH] Allow enumeration to have end comment

---
 syntaxes/metamodelica.tmGrammar.yaml  | 7 +++++--
 test/metamodelica/Enumeration.test.mo | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/syntaxes/metamodelica.tmGrammar.yaml b/syntaxes/metamodelica.tmGrammar.yaml
index 186ad32..9003d1c 100644
--- a/syntaxes/metamodelica.tmGrammar.yaml
+++ b/syntaxes/metamodelica.tmGrammar.yaml
@@ -18,11 +18,14 @@ patterns:
 
   # Storage
   ## Enumeration
-  - begin: \b(enumeration)\b\s*\(
+  - begin: \b(enumeration)\s*\(
     beginCaptures:
       1:
         name: storage.type.enumeration
-    end: \)\s*;
+    end: \)\s*("([^"]|\\")*(?<!\\)")?\s*;
+    endCaptures:
+      1:
+        name: comment.line
     patterns:
       - include: '#enumeration'
 
diff --git a/test/metamodelica/Enumeration.test.mo b/test/metamodelica/Enumeration.test.mo
index 96553bb..a2abfa0 100644
--- a/test/metamodelica/Enumeration.test.mo
+++ b/test/metamodelica/Enumeration.test.mo
@@ -17,9 +17,9 @@ type FavouriteMinionFood = enumeration(
   PAPAYA  "Wikipedia tells me the fruit is a berry. I don't agree."
 //^^^^^^ source.metamodelica variable.other.enummember
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.metamodelica comment.line
-);
-
-type FavouriteMinionFood = enumeration(BANANA "A banana", APPLE "An apple", GELATO "Ice-cream from the italian \"gelato\"", PAPAYA "Wikipedia tells me the fruit is a berry. I don't agree.");
+) "No mushrooms here";
+//^^^^^^^^^^^^^^^^^^^ source.metamodelica comment.line
+type FavouriteMinionFood = enumeration(BANANA "A banana", APPLE "An apple", GELATO "Ice-cream from the italian \"gelato\"", PAPAYA "Wikipedia tells me the fruit is a berry. I don't agree.") "No mushrooms here" ;
 //<--- source.metamodelica storage.type
 //   ^^^^^^^^^^^^^^^^^^^ source.metamodelica entity.name.type
 //                       ^ source.metamodelica keyword.operator.assignment
@@ -32,3 +32,4 @@ type FavouriteMinionFood = enumeration(BANANA "A banana", APPLE "An apple", GELA
 //                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.metamodelica comment.line
 //                                                                                                                          ^^^^^^ source.metamodelica variable.other.enummember
 //                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.metamodelica comment.line
+//                                                                                                                                                                                            ^^^^^^^^^^^^^^^^^^^ source.metamodelica comment.line