From 5625931c4c47ecbee34d2e909e41bc90b9eddeac Mon Sep 17 00:00:00 2001
From: Andreas <38031952+AnHeuermann@users.noreply.github.com>
Date: Fri, 15 Mar 2024 14:54:10 +0100
Subject: [PATCH] Simplify regex (#44)

* Simplify regex
  - Fixes exponential grow of possible matches crashing long lines
* Improve enumeration highlighting
---
 package-lock.json                     |  4 ++--
 package.json                          |  2 +-
 syntaxes/metamodelica.tmGrammar.yaml  |  8 ++++----
 syntaxes/modelica.tmGrammar.yaml      |  6 +++---
 test/metamodelica/Enumeration.test.mo | 22 ++++++++++++++++++----
 test/metamodelica/FunctionDoc.test.mo | 10 ++++++++++
 6 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 874b3be..07dce7f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "metamodelica",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "metamodelica",
-      "version": "1.3.1",
+      "version": "1.3.2",
       "license": "See LICENSE.txt",
       "devDependencies": {
         "@vscode/vsce": "^2.21.1",
diff --git a/package.json b/package.json
index e7425f8..64b90d8 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "metamodelica",
   "displayName": "MetaModelica",
   "description": "MetaModelica, Susan and Modelica language support.",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "publisher": "AnHeuermann",
   "license": "See LICENSE.txt",
   "engines": {
diff --git a/syntaxes/metamodelica.tmGrammar.yaml b/syntaxes/metamodelica.tmGrammar.yaml
index e9040d4..186ad32 100644
--- a/syntaxes/metamodelica.tmGrammar.yaml
+++ b/syntaxes/metamodelica.tmGrammar.yaml
@@ -67,7 +67,7 @@ patterns:
     name: keyword.operator.arithmetic
   - match: \=|\:\=
     name: keyword.operator.assignment
-  - match: \b(algorithm|equation|protected|public|end|external|in)\b
+  - match: \b(algorithm|equation|protected|public|end|external|in|encapsulated)\b
     name: keyword
   - match: \b(matchcontinue|match|local|case|try|end matchcontinue|end match|end try)\b
     name: keyword.control
@@ -85,7 +85,7 @@ patterns:
     name: support.type
 
   # Class Type
-  - begin: \b(record|type|package|function|uniontype)\s+(\w+)\s*((?<!\\)"([^"]*|\\")*(?<!\\)")?
+  - begin: \b(record|type|package|function|uniontype)\s+(\w+)\s*("([^"]|\\")*(?<!\\)")?
     beginCaptures:
       1:
         name: keyword
@@ -132,10 +132,10 @@ repository:
 
   enumeration:
     patterns:
-      - match: \b(\w+)\b\s*((?<!\\)"([^"]*|\\")*(?<!\\)")?
+      - match: \b(\w+)\s*("([^"]|\\")*(?<!\\)")?
         captures:
           1:
-            name: entity.name.type
+            name: variable.other.enummember
           2:
             name: comment.line
       - include: "source.modelica"
diff --git a/syntaxes/modelica.tmGrammar.yaml b/syntaxes/modelica.tmGrammar.yaml
index ea3f79d..6bb87eb 100644
--- a/syntaxes/modelica.tmGrammar.yaml
+++ b/syntaxes/modelica.tmGrammar.yaml
@@ -51,7 +51,7 @@ patterns:
     name: support.type
 
   # Class definitions
-  - begin: \b(model|class|record|block|package|function)\s+(\w+)\s*((?<!\\)"([^"]|\\")*(?<!\\)")?
+  - begin: \b(model|class|record|block|package|function)\s+(\w+)\s*("([^"]|\\")*(?<!\\)")?
     beginCaptures:
       1:
         name: keyword
@@ -69,7 +69,7 @@ patterns:
       - include: "source.modelica"
 
   # Function calls
-  - match: \b([\w|\.]+)\b\(
+  - match: \b(?<!\.)(\w|\w+[\.\w+]*\w)s*\(
     name: entity.name.function
 
   # Annotations
@@ -102,7 +102,7 @@ repository:
     patterns:
       - match: \b(Evaluate|version|versionDate|dateModified|HideResult|singleInstance|mustBeConnected|mayOnlyConnectOnce|Inline|LateInline)\b
         name: keyword
-      - begin: \b(experiment)\b\s*\(
+      - begin: \b(experiment)\s*\(
         beginCaptures:
           - name: keyword
         end: \)
diff --git a/test/metamodelica/Enumeration.test.mo b/test/metamodelica/Enumeration.test.mo
index 914fc43..96553bb 100644
--- a/test/metamodelica/Enumeration.test.mo
+++ b/test/metamodelica/Enumeration.test.mo
@@ -6,15 +6,29 @@ type FavouriteMinionFood = enumeration(
 //                       ^ source.metamodelica keyword.operator.assignment
 //                         ^^^^^^^^^^^ source.metamodelica storage.type.enumeration
   BANANA  "A banana",
-//^^^^^^ source.metamodelica entity.name.type
+//^^^^^^ source.metamodelica variable.other.enummember
 //        ^^^^^^^^^^ source.metamodelica comment.line
   APPLE   "An apple",
-//^^^^^ source.metamodelica entity.name.type
+//^^^^^ source.metamodelica variable.other.enummember
 //        ^^^^^^^^^^ source.metamodelica comment.line
   GELATO  "Ice-cream from the italian \"gelato\"",
-//^^^^^^ source.metamodelica entity.name.type
+//^^^^^^ source.metamodelica variable.other.enummember
 //        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.metamodelica comment.line
   PAPAYA  "Wikipedia tells me the fruit is a berry. I don't agree."
-//^^^^^^ source.metamodelica entity.name.type
+//^^^^^^ 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.");
+//<--- source.metamodelica storage.type
+//   ^^^^^^^^^^^^^^^^^^^ source.metamodelica entity.name.type
+//                       ^ source.metamodelica keyword.operator.assignment
+//                         ^^^^^^^^^^^ source.metamodelica storage.type.enumeration
+//                                     ^^^^^^ source.metamodelica variable.other.enummember
+//                                            ^^^^^^^^^^  source.metamodelica comment.line
+//                                                        ^^^^^ source.metamodelica variable.other.enummember
+//                                                              ^^^^^^^^^^  source.metamodelica comment.line
+//                                                                          ^^^^^^ source.metamodelica variable.other.enummember
+//                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.metamodelica comment.line
+//                                                                                                                          ^^^^^^ source.metamodelica variable.other.enummember
+//                                                                                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.metamodelica comment.line
diff --git a/test/metamodelica/FunctionDoc.test.mo b/test/metamodelica/FunctionDoc.test.mo
index 8ff5c23..d8f4b18 100644
--- a/test/metamodelica/FunctionDoc.test.mo
+++ b/test/metamodelica/FunctionDoc.test.mo
@@ -13,3 +13,13 @@ public function foo
 //       ^^^^^^^^^^^^^^^^^^^^^^^ source.metamodelica storage.type
 // [...]
 end foo;
+
+function bar"I'm a comment"
+//          ^^^^^^^^^^^^^^^ source.metamodelica comment.line
+end bar;
+
+function f "Does a thing, but must be shorter than this string.
+author: Author name  TUD-2015-04"
+  input BackendDAE.Equation eq;
+//^^^^^ source.metamodelica keyword.control
+end f;