Skip to content

Commit bca5eaa

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1721 from JetBrains/merge/mps20241
Merge maintenance/mps20232 into maintenance/mps20241
2 parents 0f4bb61 + 080fcbc commit bca5eaa

File tree

3 files changed

+113
-4
lines changed

3 files changed

+113
-4
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e
99
### Fixed
1010

1111
- *de.slisson.mps.editor.multiline* Generic placeholders like generic comments can't be inserted into words anymore (an exception was thrown).
12+
- *de.slisson.mps.tables.runtime* Prevent inserting a new row node before/after a singular cardinality child node
1213

1314
## December 2025
1415

‎code/solutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps‎

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,52 @@
296296
<property role="3oM_SC" value="thrown)." />
297297
</node>
298298
</node>
299+
<node concept="2DRihI" id="54TnD34INwR" role="15bAlk">
300+
<node concept="15Ami3" id="54TnD34INwT" role="1PaTwD">
301+
<node concept="37shsh" id="54TnD34INwU" role="15Aodc">
302+
<node concept="1dCxOk" id="54TnD34INA9" role="37shsm">
303+
<property role="1XweGW" value="da21218f-a674-474d-8b4e-d59e33007003" />
304+
<property role="1XxBO9" value="de.slisson.mps.tables.runtime" />
305+
</node>
306+
</node>
307+
</node>
308+
<node concept="3oM_SD" id="54TnD34INFr" role="1PaTwD">
309+
<property role="3oM_SC" value="Prevent" />
310+
</node>
311+
<node concept="3oM_SD" id="54TnD34INFs" role="1PaTwD">
312+
<property role="3oM_SC" value="inserting" />
313+
</node>
314+
<node concept="3oM_SD" id="54TnD34INKJ" role="1PaTwD">
315+
<property role="3oM_SC" value="a" />
316+
</node>
317+
<node concept="3oM_SD" id="54TnD34INPZ" role="1PaTwD">
318+
<property role="3oM_SC" value="new" />
319+
</node>
320+
<node concept="3oM_SD" id="54TnD34INQ0" role="1PaTwD">
321+
<property role="3oM_SC" value="row" />
322+
</node>
323+
<node concept="3oM_SD" id="54TnD34INPX" role="1PaTwD">
324+
<property role="3oM_SC" value="node" />
325+
</node>
326+
<node concept="3oM_SD" id="54TnD34INFt" role="1PaTwD">
327+
<property role="3oM_SC" value="before/after" />
328+
</node>
329+
<node concept="3oM_SD" id="54TnD34INFu" role="1PaTwD">
330+
<property role="3oM_SC" value="a" />
331+
</node>
332+
<node concept="3oM_SD" id="54TnD34INKG" role="1PaTwD">
333+
<property role="3oM_SC" value="singular" />
334+
</node>
335+
<node concept="3oM_SD" id="54TnD34INKH" role="1PaTwD">
336+
<property role="3oM_SC" value="cardinality" />
337+
</node>
338+
<node concept="3oM_SD" id="54TnD34INKI" role="1PaTwD">
339+
<property role="3oM_SC" value="child" />
340+
</node>
341+
<node concept="3oM_SD" id="54TnD34INPY" role="1PaTwD">
342+
<property role="3oM_SC" value="node" />
343+
</node>
344+
</node>
299345
</node>
300346
</node>
301347
<node concept="15bmVD" id="6xbWs8QlwdI" role="15bmVC">
@@ -852,10 +898,6 @@
852898
</node>
853899
</node>
854900
<node concept="15bmVD" id="4xFP9J_Gj2t" role="15bmVC">
855-
<node concept="15ShDW" id="4xFP9J_Gj2q" role="15bq2Y">
856-
<property role="15ShDY" value="Po4Z58IgB0/September" />
857-
<property role="15ShDw" value="2025" />
858-
</node>
859901
<node concept="15bAme" id="1vOmbReLlX0" role="15bAlL">
860902
<property role="15bAli" value="Po4Z58tnOE/added" />
861903
<node concept="2DRihI" id="1vOmbReLlX1" role="15bAlk">
@@ -1084,6 +1126,10 @@
10841126
</node>
10851127
</node>
10861128
</node>
1129+
<node concept="15ShDW" id="4xFP9J_Gj2q" role="15bq2Y">
1130+
<property role="15ShDY" value="Po4Z58IgB0/September" />
1131+
<property role="15ShDw" value="2025" />
1132+
</node>
10871133
<node concept="15bAme" id="4xFP9J_Gj2r" role="15bAlL">
10881134
<node concept="2DRihI" id="4xFP9J_Gj2s" role="15bAlk">
10891135
<node concept="15Ami3" id="4xFP9J_Gj2v" role="1PaTwD">

‎code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37125,6 +37125,65 @@
3712537125
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
3712637126
</node>
3712737127
</node>
37128+
<node concept="2tJIrI" id="6FKKvoE4Myw" role="jymVt" />
37129+
<node concept="3clFb_" id="6FKKvoE4Mzv" role="jymVt">
37130+
<property role="TrG5h" value="canExecute" />
37131+
<node concept="3Tm1VV" id="6FKKvoE4Mzw" role="1B3o_S" />
37132+
<node concept="10P_77" id="6FKKvoE4Mzx" role="3clF45" />
37133+
<node concept="37vLTG" id="6FKKvoE4Mzy" role="3clF46">
37134+
<property role="TrG5h" value="context" />
37135+
<node concept="3uibUv" id="6FKKvoE4Mzz" role="1tU5fm">
37136+
<ref role="3uigEE" to="cj4x:~EditorContext" resolve="EditorContext" />
37137+
</node>
37138+
</node>
37139+
<node concept="2AHcQZ" id="6FKKvoE4M$j" role="2AJF6D">
37140+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
37141+
</node>
37142+
<node concept="3clFbS" id="6FKKvoE4M$k" role="3clF47">
37143+
<node concept="3clFbJ" id="4gOm2JeHyMx" role="3cqZAp">
37144+
<node concept="3clFbS" id="4gOm2JeHyMz" role="3clFbx">
37145+
<node concept="3cpWs6" id="4gOm2JeHEan" role="3cqZAp">
37146+
<node concept="3clFbT" id="4gOm2JeHFU$" role="3cqZAk" />
37147+
</node>
37148+
</node>
37149+
<node concept="3fqX7Q" id="4gOm2JeHBPN" role="3clFbw">
37150+
<node concept="3nyPlj" id="4gOm2JeHBPP" role="3fr31v">
37151+
<ref role="37wK5l" node="7IUya7cjexf" resolve="canExecute" />
37152+
<node concept="37vLTw" id="4gOm2JeHHUx" role="37wK5m">
37153+
<ref role="3cqZAo" node="6FKKvoE4Mzy" resolve="context" />
37154+
</node>
37155+
</node>
37156+
</node>
37157+
</node>
37158+
<node concept="3clFbH" id="4gOm2JeHJ3z" role="3cqZAp" />
37159+
<node concept="3cpWs8" id="6FKKvoE4M$o" role="3cqZAp">
37160+
<node concept="3cpWsn" id="6FKKvoE4M$p" role="3cpWs9">
37161+
<property role="TrG5h" value="nodeOfRow" />
37162+
<node concept="3Tqbb2" id="6FKKvoE4M$q" role="1tU5fm" />
37163+
<node concept="2YIFZM" id="6FKKvoE4M$r" role="33vP2m">
37164+
<ref role="1Pybhc" node="6tOcB$JKlIC" resolve="TableUtils" />
37165+
<ref role="37wK5l" node="7IUya7c4DQS" resolve="getNodeOfRowNode" />
37166+
<node concept="1rXfSq" id="6FKKvoE4M$s" role="37wK5m">
37167+
<ref role="37wK5l" node="7IUya7cczGL" resolve="getGridCell" />
37168+
</node>
37169+
</node>
37170+
</node>
37171+
</node>
37172+
<node concept="3clFbF" id="6FKKvoE5B9C" role="3cqZAp">
37173+
<node concept="2OqwBi" id="6FKKvoE4M$x" role="3clFbG">
37174+
<node concept="2OqwBi" id="6FKKvoE4M$y" role="2Oq$k0">
37175+
<node concept="37vLTw" id="6FKKvoE4M$z" role="2Oq$k0">
37176+
<ref role="3cqZAo" node="6FKKvoE4M$p" resolve="nodeOfRow" />
37177+
</node>
37178+
<node concept="2NL2c5" id="6FKKvoE4M$$" role="2OqNvi" />
37179+
</node>
37180+
<node concept="liA8E" id="6FKKvoE4M$_" role="2OqNvi">
37181+
<ref role="37wK5l" to="c17a:~SAbstractLink.isMultiple()" resolve="isMultiple" />
37182+
</node>
37183+
</node>
37184+
</node>
37185+
</node>
37186+
</node>
3712837187
<node concept="2tJIrI" id="56WqtlUiF76" role="jymVt" />
3712937188
<node concept="3clFb_" id="4db20qfqkmQ" role="jymVt">
3713037189
<property role="1EzhhJ" value="false" />
@@ -37200,6 +37259,9 @@
3720037259
</node>
3720137260
</node>
3720237261
</node>
37262+
<node concept="2AHcQZ" id="6FKKvoE4MAb" role="2AJF6D">
37263+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
37264+
</node>
3720337265
</node>
3720437266
<node concept="3Tm1VV" id="7IUya7cfFCG" role="1B3o_S" />
3720537267
<node concept="3uibUv" id="7IUya7chVZy" role="1zkMxy">

0 commit comments

Comments
 (0)