From 8f83febbee5ac9c3de17964119eeb1bc498170b1 Mon Sep 17 00:00:00 2001
From: Alexander Pann <alexander@f1re.io>
Date: Thu, 15 Jan 2026 12:55:46 +0100
Subject: [PATCH 1/2] bugfix(editor.multiline): prevent placeholder insertion
 for words

---
 CHANGELOG.md                                  |  6 ++
 .../de/slisson/mps/editor/multiline/cells.mps | 33 ++++++++++
 .../de.itemis.mps.extensions.changelog.mps    | 63 +++++++++++++++++++
 3 files changed, 102 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 167b4187dd..27da2e4186 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project are documented in this file.
 
 The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## January 2026
+
+### Fixed
+
+- *de.slisson.mps.editor.multiline* Generic placeholders like generic comments can't be inserted into words anymore (an exception was thrown).
+
 ## December 2025
 
 ### Added
diff --git a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps
index ac5bce9259..c947440fe3 100644
--- a/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps
+++ b/code/multiline/solutions/de.slisson.mps.editor.multiline.runtime/models/de/slisson/mps/editor/multiline/cells.mps
@@ -162,6 +162,9 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
+        <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
+      </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
         <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
       </concept>
@@ -7247,6 +7250,36 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="1Mwb2kIqhVM" role="3cqZAp">
+          <node concept="1rXfSq" id="1Mwb2kIqhVK" role="3clFbG">
+            <ref role="37wK5l" to="g51k:~EditorCell_Basic.setAction(jetbrains.mps.openapi.editor.cells.CellActionType,jetbrains.mps.openapi.editor.cells.CellAction)" resolve="setAction" />
+            <node concept="Rm8GO" id="1Mwb2kIqCDl" role="37wK5m">
+              <ref role="Rm8GQ" to="f4zo:~CellActionType.INSERT_PLACEHOLDER" resolve="INSERT_PLACEHOLDER" />
+              <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+            </node>
+            <node concept="2ShNRf" id="1Mwb2kIsn32" role="37wK5m">
+              <node concept="1pGfFk" id="1Mwb2kItG2w" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="3ahc:~EmptyCellAction.&lt;init&gt;()" resolve="EmptyCellAction" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1Mwb2kItSMk" role="3cqZAp">
+          <node concept="1rXfSq" id="1Mwb2kItSMl" role="3clFbG">
+            <ref role="37wK5l" to="g51k:~EditorCell_Basic.setAction(jetbrains.mps.openapi.editor.cells.CellActionType,jetbrains.mps.openapi.editor.cells.CellAction)" resolve="setAction" />
+            <node concept="Rm8GO" id="1Mwb2kIu4_e" role="37wK5m">
+              <ref role="Rm8GQ" to="f4zo:~CellActionType.INSERT_PLACEHOLDER_BEFORE" resolve="INSERT_PLACEHOLDER_BEFORE" />
+              <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+            </node>
+            <node concept="2ShNRf" id="1Mwb2kItSMn" role="37wK5m">
+              <node concept="1pGfFk" id="1Mwb2kItSMo" role="2ShVmc">
+                <property role="373rjd" value="true" />
+                <ref role="37wK5l" to="3ahc:~EmptyCellAction.&lt;init&gt;()" resolve="EmptyCellAction" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3cpWs8" id="6tLsdkfI1c$" role="3cqZAp">
           <node concept="3cpWsn" id="6tLsdkfI1c_" role="3cpWs9">
             <property role="TrG5h" value="km" />
diff --git a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
index b3aa9219f2..2c4bbc385a 100644
--- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
+++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
@@ -235,6 +235,69 @@
         </node>
       </node>
     </node>
+    <node concept="15bmVD" id="1Mwb2kI$RVD" role="15bmVC">
+      <node concept="15ShDW" id="1Mwb2kI$RVA" role="15bq2Y">
+        <property role="15ShDY" value="Po4Z58IgAl/January" />
+        <property role="15ShDw" value="2026" />
+      </node>
+      <node concept="15bAme" id="1Mwb2kI$RVB" role="15bAlL">
+        <node concept="2DRihI" id="1Mwb2kI$RVC" role="15bAlk">
+          <node concept="15Ami3" id="1Mwb2kI$RVK" role="1PaTwD">
+            <node concept="37shsh" id="1Mwb2kI$RVL" role="15Aodc">
+              <node concept="1dCxOk" id="1Mwb2kI$RVQ" role="37shsm">
+                <property role="1XweGW" value="31c91def-a131-41a1-9018-102874f49a12" />
+                <property role="1XxBO9" value="de.slisson.mps.editor.multiline" />
+              </node>
+            </node>
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RVV" role="1PaTwD">
+            <property role="3oM_SC" value="Generic" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RVW" role="1PaTwD">
+            <property role="3oM_SC" value="placeholders" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RVX" role="1PaTwD">
+            <property role="3oM_SC" value="like" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RVY" role="1PaTwD">
+            <property role="3oM_SC" value="generic" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RVZ" role="1PaTwD">
+            <property role="3oM_SC" value="comments" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RW0" role="1PaTwD">
+            <property role="3oM_SC" value="can't" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RW1" role="1PaTwD">
+            <property role="3oM_SC" value="be" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RW2" role="1PaTwD">
+            <property role="3oM_SC" value="inserted" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RW3" role="1PaTwD">
+            <property role="3oM_SC" value="into" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RW4" role="1PaTwD">
+            <property role="3oM_SC" value="words" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RW7" role="1PaTwD">
+            <property role="3oM_SC" value="anymore" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RW8" role="1PaTwD">
+            <property role="3oM_SC" value="(an" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RW9" role="1PaTwD">
+            <property role="3oM_SC" value="exception" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RWa" role="1PaTwD">
+            <property role="3oM_SC" value="was" />
+          </node>
+          <node concept="3oM_SD" id="1Mwb2kI$RWb" role="1PaTwD">
+            <property role="3oM_SC" value="thrown)." />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="15bmVD" id="6xbWs8QlwdI" role="15bmVC">
       <node concept="15bAme" id="6Vb09dgv4Sc" role="15bAlL">
         <property role="15bAli" value="Po4Z58tnOE/added" />

From 48adf450dce6f81901a9beb4b539c2c8a9bafc79 Mon Sep 17 00:00:00 2001
From: Wladimir Safonov <wladimir.safonov@itemis.de>
Date: Fri, 23 Jan 2026 17:32:23 +0100
Subject: [PATCH 2/2] fix(tables): prevent inserting before/after a singular
 child

---
 CHANGELOG.md                                  |  6 ++
 .../de.itemis.mps.extensions.changelog.mps    | 54 ++++++++++++++++
 .../de/slisson/mps/tables/runtime/cells.mps   | 62 +++++++++++++++++++
 3 files changed, 122 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b06cfb93af..d08f49cd29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project are documented in this file.
 
 The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) .The project does *not* follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## January 2026
+
+### Fixed
+
+- *de.slisson.mps.tables.runtime* Prevent inserting a new row node before/after a singular cardinality child node
+
 ## November 2025
 
 ### Fixed
diff --git a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
index f487a017a6..6c7b406fa9 100644
--- a/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
+++ b/code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
@@ -234,6 +234,60 @@
         </node>
       </node>
     </node>
+    <node concept="15bmVD" id="54TnD34INwS" role="15bmVC">
+      <node concept="15ShDW" id="54TnD34INwP" role="15bq2Y">
+        <property role="15ShDY" value="Po4Z58IgAl/January" />
+        <property role="15ShDw" value="2026" />
+      </node>
+      <node concept="15bAme" id="54TnD34INwQ" role="15bAlL">
+        <node concept="2DRihI" id="54TnD34INwR" role="15bAlk">
+          <node concept="15Ami3" id="54TnD34INwT" role="1PaTwD">
+            <node concept="37shsh" id="54TnD34INwU" role="15Aodc">
+              <node concept="1dCxOk" id="54TnD34INA9" role="37shsm">
+                <property role="1XweGW" value="da21218f-a674-474d-8b4e-d59e33007003" />
+                <property role="1XxBO9" value="de.slisson.mps.tables.runtime" />
+              </node>
+            </node>
+          </node>
+          <node concept="3oM_SD" id="54TnD34INFr" role="1PaTwD">
+            <property role="3oM_SC" value="Prevent" />
+          </node>
+          <node concept="3oM_SD" id="54TnD34INFs" role="1PaTwD">
+            <property role="3oM_SC" value="inserting" />
+          </node>
+          <node concept="3oM_SD" id="54TnD34INKJ" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="54TnD34INPZ" role="1PaTwD">
+            <property role="3oM_SC" value="new" />
+          </node>
+          <node concept="3oM_SD" id="54TnD34INQ0" role="1PaTwD">
+            <property role="3oM_SC" value="row" />
+          </node>
+          <node concept="3oM_SD" id="54TnD34INPX" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+          <node concept="3oM_SD" id="54TnD34INFt" role="1PaTwD">
+            <property role="3oM_SC" value="before/after" />
+          </node>
+          <node concept="3oM_SD" id="54TnD34INFu" role="1PaTwD">
+            <property role="3oM_SC" value="a" />
+          </node>
+          <node concept="3oM_SD" id="54TnD34INKG" role="1PaTwD">
+            <property role="3oM_SC" value="singular" />
+          </node>
+          <node concept="3oM_SD" id="54TnD34INKH" role="1PaTwD">
+            <property role="3oM_SC" value="cardinality" />
+          </node>
+          <node concept="3oM_SD" id="54TnD34INKI" role="1PaTwD">
+            <property role="3oM_SC" value="child" />
+          </node>
+          <node concept="3oM_SD" id="54TnD34INPY" role="1PaTwD">
+            <property role="3oM_SC" value="node" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="15bmVD" id="6Qwtr1aMjHs" role="15bmVC">
       <node concept="15ShDW" id="6Qwtr1aMjHp" role="15bq2Y">
         <property role="15ShDY" value="Po4Z58IgBl/November" />
diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
index da672059a7..6e102d44d8 100644
--- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
+++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
@@ -37125,6 +37125,65 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
+      <node concept="2tJIrI" id="6FKKvoE4Myw" role="jymVt" />
+      <node concept="3clFb_" id="6FKKvoE4Mzv" role="jymVt">
+        <property role="TrG5h" value="canExecute" />
+        <node concept="3Tm1VV" id="6FKKvoE4Mzw" role="1B3o_S" />
+        <node concept="10P_77" id="6FKKvoE4Mzx" role="3clF45" />
+        <node concept="37vLTG" id="6FKKvoE4Mzy" role="3clF46">
+          <property role="TrG5h" value="context" />
+          <node concept="3uibUv" id="6FKKvoE4Mzz" role="1tU5fm">
+            <ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
+          </node>
+        </node>
+        <node concept="2AHcQZ" id="6FKKvoE4M$j" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
+        <node concept="3clFbS" id="6FKKvoE4M$k" role="3clF47">
+          <node concept="3clFbJ" id="4gOm2JeHyMx" role="3cqZAp">
+            <node concept="3clFbS" id="4gOm2JeHyMz" role="3clFbx">
+              <node concept="3cpWs6" id="4gOm2JeHEan" role="3cqZAp">
+                <node concept="3clFbT" id="4gOm2JeHFU$" role="3cqZAk" />
+              </node>
+            </node>
+            <node concept="3fqX7Q" id="4gOm2JeHBPN" role="3clFbw">
+              <node concept="3nyPlj" id="4gOm2JeHBPP" role="3fr31v">
+                <ref role="37wK5l" node="7IUya7cjexf" resolve="canExecute" />
+                <node concept="37vLTw" id="4gOm2JeHHUx" role="37wK5m">
+                  <ref role="3cqZAo" node="6FKKvoE4Mzy" resolve="context" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="4gOm2JeHJ3z" role="3cqZAp" />
+          <node concept="3cpWs8" id="6FKKvoE4M$o" role="3cqZAp">
+            <node concept="3cpWsn" id="6FKKvoE4M$p" role="3cpWs9">
+              <property role="TrG5h" value="nodeOfRow" />
+              <node concept="3Tqbb2" id="6FKKvoE4M$q" role="1tU5fm" />
+              <node concept="2YIFZM" id="6FKKvoE4M$r" role="33vP2m">
+                <ref role="1Pybhc" node="6tOcB$JKlIC" resolve="TableUtils" />
+                <ref role="37wK5l" node="7IUya7c4DQS" resolve="getNodeOfRowNode" />
+                <node concept="1rXfSq" id="6FKKvoE4M$s" role="37wK5m">
+                  <ref role="37wK5l" node="7IUya7cczGL" resolve="getGridCell" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="6FKKvoE5B9C" role="3cqZAp">
+            <node concept="2OqwBi" id="6FKKvoE4M$x" role="3clFbG">
+              <node concept="2OqwBi" id="6FKKvoE4M$y" role="2Oq$k0">
+                <node concept="37vLTw" id="6FKKvoE4M$z" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6FKKvoE4M$p" resolve="nodeOfRow" />
+                </node>
+                <node concept="2NL2c5" id="6FKKvoE4M$$" role="2OqNvi" />
+              </node>
+              <node concept="liA8E" id="6FKKvoE4M$_" role="2OqNvi">
+                <ref role="37wK5l" to="c17a:~SAbstractLink.isMultiple()" resolve="isMultiple" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="56WqtlUiF76" role="jymVt" />
       <node concept="3clFb_" id="4db20qfqkmQ" role="jymVt">
         <property role="1EzhhJ" value="false" />
@@ -37200,6 +37259,9 @@
             </node>
           </node>
         </node>
+        <node concept="2AHcQZ" id="6FKKvoE4MAb" role="2AJF6D">
+          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+        </node>
       </node>
       <node concept="3Tm1VV" id="7IUya7cfFCG" role="1B3o_S" />
       <node concept="3uibUv" id="7IUya7chVZy" role="1zkMxy">