From fce62c24b08870c36d57551070b624b456c2245d Mon Sep 17 00:00:00 2001
From: Paul Nelissen <paul.nelissen@capgemini.com>
Date: Thu, 17 Sep 2026 09:08:55 +0200
Subject: [PATCH 1/2] Truncate first then escape

---
 .../nl/asml/matala/product/generator/Utils.xtend    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bundles/nl.asml.matala.product/src/nl/asml/matala/product/generator/Utils.xtend b/bundles/nl.asml.matala.product/src/nl/asml/matala/product/generator/Utils.xtend
index b67089d4..1d7cdfc3 100644
--- a/bundles/nl.asml.matala.product/src/nl/asml/matala/product/generator/Utils.xtend
+++ b/bundles/nl.asml.matala.product/src/nl/asml/matala/product/generator/Utils.xtend
@@ -1001,10 +1001,15 @@ class Utils
         return String.join("\n", result)
     }
 
-    static def String escapeAndLimitText(String text, int limit) {
-        if (text === null) {
+    static def String escapeAndLimitText(String inputText, int limit) {
+        if (inputText === null) {
             return ""
         }
+        var text = inputText 
+        if (text.length() > limit) {
+            text = text.substring(0, limit - 3) + "..."
+        }
+
         // Escape special characters for Python
         var escaped = text.trim()
             .replaceAll("\\s+", " ")
@@ -1013,10 +1018,6 @@ class Utils
             .replace("\n", "")
             .replace("\r", "")
             .replace("\t", " ")
-        // Limit to specified length with "..." suffix if truncated
-        if (escaped.length() > limit) {
-            escaped = escaped.substring(0, limit - 3) + "..."
-        }
         return escaped
     }
 

From 64e46db3d2c443907228515c62e8e397f3e129d1 Mon Sep 17 00:00:00 2001
From: Paul Nelissen <paul.nelissen@capgemini.com>
Date: Thu, 17 Sep 2026 14:43:55 +0200
Subject: [PATCH 2/2] Use XPlus XText Generator

---
 bundles/nl.asml.matala.product/build.properties               | 2 +-
 .../src/nl/asml/matala/product/GenerateProduct.mwe2           | 4 ++--
 .../nl.esi.comma.abstracttestspecification/build.properties   | 2 +-
 .../GenerateAbstractTestspecification.mwe2                    | 2 +-
 bundles/nl.esi.comma.assertthat/build.properties              | 2 +-
 .../src/nl/esi/comma/assertthat/GenerateAssertThat.mwe2       | 2 +-
 bundles/nl.esi.comma.behavior.scl/build.properties            | 2 +-
 .../src/nl/esi/comma/behavior/scl/GenerateScl.mwe2            | 2 +-
 bundles/nl.esi.comma.causalgraph/build.properties             | 2 +-
 .../src/nl/esi/comma/causalgraph/GenerateCausalGraph.mwe2     | 2 +-
 bundles/nl.esi.comma.constraints/build.properties             | 2 +-
 .../src/nl/esi/comma/constraints/GenerateConstraints.mwe2     | 2 +-
 bundles/nl.esi.comma.inputspecification/build.properties      | 2 +-
 .../comma/inputspecification/GenerateInputSpecification.mwe2  | 2 +-
 bundles/nl.esi.comma.project.standard/build.properties        | 2 +-
 .../esi/comma/project/standard/GenerateStandardProject.mwe2   | 2 +-
 bundles/nl.esi.comma.scenarios/build.properties               | 2 +-
 .../src/nl/esi/comma/scenarios/GenerateScenarios.mwe2         | 2 +-
 bundles/nl.esi.comma.steps/build.properties                   | 2 +-
 .../src/nl/esi/comma/steps/GenerateStep.mwe2                  | 2 +-
 bundles/nl.esi.comma.systemconfig/build.properties            | 2 +-
 .../src/nl/esi/comma/systemconfig/GenerateConfiguration.mwe2  | 2 +-
 bundles/nl.esi.comma.testspecification/build.properties       | 2 +-
 .../comma/testspecification/GenerateTestspecification.mwe2    | 2 +-
 releng/nl.esi.comma.target/nl.esi.comma.target.target         | 1 +
 25 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/bundles/nl.asml.matala.product/build.properties b/bundles/nl.asml.matala.product/build.properties
index 835e8a26..5256b2f9 100644
--- a/bundles/nl.asml.matala.product/build.properties
+++ b/bundles/nl.asml.matala.product/build.properties
@@ -31,4 +31,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
                      com.google.gson,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.asml.matala.product/src/nl/asml/matala/product/GenerateProduct.mwe2 b/bundles/nl.asml.matala.product/src/nl/asml/matala/product/GenerateProduct.mwe2
index ac103ea5..ffc09c25 100644
--- a/bundles/nl.asml.matala.product/src/nl/asml/matala/product/GenerateProduct.mwe2
+++ b/bundles/nl.asml.matala.product/src/nl/asml/matala/product/GenerateProduct.mwe2
@@ -58,10 +58,10 @@ Workflow {
 			junitSupport = {
 				junitVersion = "5"
 			}
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
                 generateXtendStub = true
             }
-			fragment = nl.esi.xtext.lsp.generator.lezer.LezerGrammarFragment {
+			fragment = nl.esi.xplus.xtext.generator.lezer.LezerGrammarFragment {
                 absolutePath = "${rootPath}/nl.asml.matala.product/target/lezer-grammar"
                 override = true
 			}
diff --git a/bundles/nl.esi.comma.abstracttestspecification/build.properties b/bundles/nl.esi.comma.abstracttestspecification/build.properties
index 4779a831..7ba1e3c6 100644
--- a/bundles/nl.esi.comma.abstracttestspecification/build.properties
+++ b/bundles/nl.esi.comma.abstracttestspecification/build.properties
@@ -30,4 +30,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.objectweb.asm,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.esi.comma.abstracttestspecification/src/nl/esi/comma/abstracttestspecification/GenerateAbstractTestspecification.mwe2 b/bundles/nl.esi.comma.abstracttestspecification/src/nl/esi/comma/abstracttestspecification/GenerateAbstractTestspecification.mwe2
index 1df25bad..292b75b2 100644
--- a/bundles/nl.esi.comma.abstracttestspecification/src/nl/esi/comma/abstracttestspecification/GenerateAbstractTestspecification.mwe2
+++ b/bundles/nl.esi.comma.abstracttestspecification/src/nl/esi/comma/abstracttestspecification/GenerateAbstractTestspecification.mwe2
@@ -59,7 +59,7 @@ Workflow {
 				generateDeprecationValidation = true
 			}
 			generator = null
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
 				generateXtendStub = true
 			}
 			junitSupport = {
diff --git a/bundles/nl.esi.comma.assertthat/build.properties b/bundles/nl.esi.comma.assertthat/build.properties
index 4779a831..7ba1e3c6 100644
--- a/bundles/nl.esi.comma.assertthat/build.properties
+++ b/bundles/nl.esi.comma.assertthat/build.properties
@@ -30,4 +30,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.objectweb.asm,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.esi.comma.assertthat/src/nl/esi/comma/assertthat/GenerateAssertThat.mwe2 b/bundles/nl.esi.comma.assertthat/src/nl/esi/comma/assertthat/GenerateAssertThat.mwe2
index e6875e7b..8b437c9a 100644
--- a/bundles/nl.esi.comma.assertthat/src/nl/esi/comma/assertthat/GenerateAssertThat.mwe2
+++ b/bundles/nl.esi.comma.assertthat/src/nl/esi/comma/assertthat/GenerateAssertThat.mwe2
@@ -58,7 +58,7 @@ Workflow {
 			junitSupport = {
 				junitVersion = "5"
 			}
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
                 generateXtendStub = true
             }
 		}
diff --git a/bundles/nl.esi.comma.behavior.scl/build.properties b/bundles/nl.esi.comma.behavior.scl/build.properties
index 4779a831..7ba1e3c6 100644
--- a/bundles/nl.esi.comma.behavior.scl/build.properties
+++ b/bundles/nl.esi.comma.behavior.scl/build.properties
@@ -30,4 +30,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.objectweb.asm,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.esi.comma.behavior.scl/src/nl/esi/comma/behavior/scl/GenerateScl.mwe2 b/bundles/nl.esi.comma.behavior.scl/src/nl/esi/comma/behavior/scl/GenerateScl.mwe2
index 97066a01..f292035a 100644
--- a/bundles/nl.esi.comma.behavior.scl/src/nl/esi/comma/behavior/scl/GenerateScl.mwe2
+++ b/bundles/nl.esi.comma.behavior.scl/src/nl/esi/comma/behavior/scl/GenerateScl.mwe2
@@ -50,7 +50,7 @@ Workflow {
             generator = {
                 generateStub = true
             }
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
                 generateStub = true
             }
             junitSupport = {
diff --git a/bundles/nl.esi.comma.causalgraph/build.properties b/bundles/nl.esi.comma.causalgraph/build.properties
index 4a416b8a..51132d60 100644
--- a/bundles/nl.esi.comma.causalgraph/build.properties
+++ b/bundles/nl.esi.comma.causalgraph/build.properties
@@ -30,4 +30,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.objectweb.asm,\
                      org.apache.log4j,\
                      org.apache.commons.logging,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.esi.comma.causalgraph/src/nl/esi/comma/causalgraph/GenerateCausalGraph.mwe2 b/bundles/nl.esi.comma.causalgraph/src/nl/esi/comma/causalgraph/GenerateCausalGraph.mwe2
index 35bd6e9b..b15ee86b 100644
--- a/bundles/nl.esi.comma.causalgraph/src/nl/esi/comma/causalgraph/GenerateCausalGraph.mwe2
+++ b/bundles/nl.esi.comma.causalgraph/src/nl/esi/comma/causalgraph/GenerateCausalGraph.mwe2
@@ -53,7 +53,7 @@ Workflow {
             generator = {
                 generateStub = true
             }
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
                 generateStub = true
             }
             quickFixProvider = {
diff --git a/bundles/nl.esi.comma.constraints/build.properties b/bundles/nl.esi.comma.constraints/build.properties
index 7c9ef93d..a200fd45 100644
--- a/bundles/nl.esi.comma.constraints/build.properties
+++ b/bundles/nl.esi.comma.constraints/build.properties
@@ -32,4 +32,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
                      com.ibm.icu,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.esi.comma.constraints/src/nl/esi/comma/constraints/GenerateConstraints.mwe2 b/bundles/nl.esi.comma.constraints/src/nl/esi/comma/constraints/GenerateConstraints.mwe2
index 53814ad4..8d175a1e 100644
--- a/bundles/nl.esi.comma.constraints/src/nl/esi/comma/constraints/GenerateConstraints.mwe2
+++ b/bundles/nl.esi.comma.constraints/src/nl/esi/comma/constraints/GenerateConstraints.mwe2
@@ -51,7 +51,7 @@ Workflow {
             generator = {
                 generateStub = true
             }
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
                 generateStub = true
             }
             junitSupport = {
diff --git a/bundles/nl.esi.comma.inputspecification/build.properties b/bundles/nl.esi.comma.inputspecification/build.properties
index b550942f..2ea83c8a 100644
--- a/bundles/nl.esi.comma.inputspecification/build.properties
+++ b/bundles/nl.esi.comma.inputspecification/build.properties
@@ -31,4 +31,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
                      com.ibm.icu,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.esi.comma.inputspecification/src/nl/esi/comma/inputspecification/GenerateInputSpecification.mwe2 b/bundles/nl.esi.comma.inputspecification/src/nl/esi/comma/inputspecification/GenerateInputSpecification.mwe2
index d19edd71..9241410c 100644
--- a/bundles/nl.esi.comma.inputspecification/src/nl/esi/comma/inputspecification/GenerateInputSpecification.mwe2
+++ b/bundles/nl.esi.comma.inputspecification/src/nl/esi/comma/inputspecification/GenerateInputSpecification.mwe2
@@ -47,7 +47,7 @@ Workflow {
 			validator = {
 				// composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
 			}
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
                 generateXtendStub = true
             }
 		}
diff --git a/bundles/nl.esi.comma.project.standard/build.properties b/bundles/nl.esi.comma.project.standard/build.properties
index b550942f..2ea83c8a 100644
--- a/bundles/nl.esi.comma.project.standard/build.properties
+++ b/bundles/nl.esi.comma.project.standard/build.properties
@@ -31,4 +31,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
                      com.ibm.icu,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.esi.comma.project.standard/src/nl/esi/comma/project/standard/GenerateStandardProject.mwe2 b/bundles/nl.esi.comma.project.standard/src/nl/esi/comma/project/standard/GenerateStandardProject.mwe2
index 3526891f..6e3cddaa 100644
--- a/bundles/nl.esi.comma.project.standard/src/nl/esi/comma/project/standard/GenerateStandardProject.mwe2
+++ b/bundles/nl.esi.comma.project.standard/src/nl/esi/comma/project/standard/GenerateStandardProject.mwe2
@@ -56,7 +56,7 @@ Workflow {
             formatter = formatting.Formatter2Fragment2 {
                 generateStub = true
             }
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
                 generateStub = true
             }
             junitSupport = {
diff --git a/bundles/nl.esi.comma.scenarios/build.properties b/bundles/nl.esi.comma.scenarios/build.properties
index d1c90c85..40176a3f 100644
--- a/bundles/nl.esi.comma.scenarios/build.properties
+++ b/bundles/nl.esi.comma.scenarios/build.properties
@@ -32,4 +32,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
                      com.ibm.icu,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.esi.comma.scenarios/src/nl/esi/comma/scenarios/GenerateScenarios.mwe2 b/bundles/nl.esi.comma.scenarios/src/nl/esi/comma/scenarios/GenerateScenarios.mwe2
index f6010781..d6b7f33f 100644
--- a/bundles/nl.esi.comma.scenarios/src/nl/esi/comma/scenarios/GenerateScenarios.mwe2
+++ b/bundles/nl.esi.comma.scenarios/src/nl/esi/comma/scenarios/GenerateScenarios.mwe2
@@ -51,7 +51,7 @@ Workflow {
 			validator = {
 				// composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
 			}
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
                 generateXtendStub = true
             }
 		}
diff --git a/bundles/nl.esi.comma.steps/build.properties b/bundles/nl.esi.comma.steps/build.properties
index b550942f..2ea83c8a 100644
--- a/bundles/nl.esi.comma.steps/build.properties
+++ b/bundles/nl.esi.comma.steps/build.properties
@@ -31,4 +31,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
                      com.ibm.icu,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.esi.comma.steps/src/nl/esi/comma/steps/GenerateStep.mwe2 b/bundles/nl.esi.comma.steps/src/nl/esi/comma/steps/GenerateStep.mwe2
index 2f74a56a..f1e7d3d6 100644
--- a/bundles/nl.esi.comma.steps/src/nl/esi/comma/steps/GenerateStep.mwe2
+++ b/bundles/nl.esi.comma.steps/src/nl/esi/comma/steps/GenerateStep.mwe2
@@ -50,7 +50,7 @@ Workflow {
             generator = {
                 generateStub = true
             }
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
                 generateStub = true
             }
             junitSupport = {
diff --git a/bundles/nl.esi.comma.systemconfig/build.properties b/bundles/nl.esi.comma.systemconfig/build.properties
index b550942f..2ea83c8a 100644
--- a/bundles/nl.esi.comma.systemconfig/build.properties
+++ b/bundles/nl.esi.comma.systemconfig/build.properties
@@ -31,4 +31,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
                      com.ibm.icu,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.esi.comma.systemconfig/src/nl/esi/comma/systemconfig/GenerateConfiguration.mwe2 b/bundles/nl.esi.comma.systemconfig/src/nl/esi/comma/systemconfig/GenerateConfiguration.mwe2
index 62772ce2..e4e8f59e 100644
--- a/bundles/nl.esi.comma.systemconfig/src/nl/esi/comma/systemconfig/GenerateConfiguration.mwe2
+++ b/bundles/nl.esi.comma.systemconfig/src/nl/esi/comma/systemconfig/GenerateConfiguration.mwe2
@@ -56,7 +56,7 @@ Workflow {
 			junitSupport = {
 				junitVersion = "5"
 			}
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
                 generateXtendStub = true
             }
 		}
diff --git a/bundles/nl.esi.comma.testspecification/build.properties b/bundles/nl.esi.comma.testspecification/build.properties
index 4779a831..7ba1e3c6 100644
--- a/bundles/nl.esi.comma.testspecification/build.properties
+++ b/bundles/nl.esi.comma.testspecification/build.properties
@@ -30,4 +30,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.objectweb.asm,\
                      org.apache.commons.logging,\
                      org.apache.log4j,\
-                     nl.esi.xtext.lsp.generator
+                     nl.esi.xplus.xtext.generator
diff --git a/bundles/nl.esi.comma.testspecification/src/nl/esi/comma/testspecification/GenerateTestspecification.mwe2 b/bundles/nl.esi.comma.testspecification/src/nl/esi/comma/testspecification/GenerateTestspecification.mwe2
index 699f5c48..36159073 100644
--- a/bundles/nl.esi.comma.testspecification/src/nl/esi/comma/testspecification/GenerateTestspecification.mwe2
+++ b/bundles/nl.esi.comma.testspecification/src/nl/esi/comma/testspecification/GenerateTestspecification.mwe2
@@ -51,7 +51,7 @@ Workflow {
 				generateDeprecationValidation = true
 			}
 			generator = null
-            contentAssist = nl.esi.xtext.lsp.generator.ide.contentassist.IdeContentAssistFragment2 {
+            contentAssist = nl.esi.xplus.xtext.generator.ide.contentassist.IdeContentAssistFragment2 {
                 generateXtendStub = true
             }
 			junitSupport = {
diff --git a/releng/nl.esi.comma.target/nl.esi.comma.target.target b/releng/nl.esi.comma.target/nl.esi.comma.target.target
index 45e47bc1..f97be16b 100644
--- a/releng/nl.esi.comma.target/nl.esi.comma.target.target
+++ b/releng/nl.esi.comma.target/nl.esi.comma.target.target
@@ -95,6 +95,7 @@
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="nl.esi.xplus.lsp.feature.feature.group" version="0.0.0"/>
       <unit id="nl.esi.xplus.ui.feature.feature.group" version="0.0.0"/>
+      <unit id="nl.esi.xplus.xtext.generator" version="0.0.0"/>
       <repository location="https://TNO.github.io/XPlus/nightly/"/>
     </location>
   </locations>