Skip to content

Commit 555c3f0

Browse files
alexanderpannalexanderpann
authored
Merge branch 'maintenance/mps20241' into bugfix/bug_1421_improve_layout_of_imbricated_list_literals
2 parents 636d47a + e9e2e32 commit 555c3f0

File tree

10 files changed

+15267
-6339
lines changed

10 files changed

+15267
-6339
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1717
- Variability: For feature attributes, the inspector in the configuration editor shows the current value of the attribute and what caused this value (manual input by user, default, forced by tool, etc). This assignment cause is read-only now. An intention is added to manually set it to 'manual' state.
1818
- Variability: In the configuration editor, pressing Return/Enter anywhere will create an empty line after the configuration. Pressing Shift-Return/Enter on the header line of a configuration will create an empty line before the configuration.
1919

20+
### Added
21+
22+
- Data tables, binary and multi-criteria decision tables now support deletion, copying and pasting when multiple cells are selected with the mouse.
23+
2024
## July 2025
2125

2226
### Fixed

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/models/org.iets3.core.expr.data.behavior.mps‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
4343
<child id="1082485599096" name="statements" index="9aQI4" />
4444
</concept>
45+
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
4546
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
4647
<child id="1197027771414" name="operand" index="2Oq$k0" />
4748
<child id="1197027833540" name="operation" index="2OqNvi" />
@@ -55,6 +56,7 @@
5556
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
5657
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
5758
</concept>
59+
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
5860
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
5961
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
6062
<child id="1068431790190" name="initializer" index="33vP2m" />
@@ -64,6 +66,7 @@
6466
</concept>
6567
<concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
6668
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
69+
<concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
6770
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
6871
<child id="5680397130376446158" name="type" index="1tU5fm" />
6972
</concept>
@@ -76,6 +79,7 @@
7679
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
7780
<child id="1068580123156" name="expression" index="3clFbG" />
7881
</concept>
82+
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
7983
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
8084
<child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
8185
<child id="1068580123160" name="condition" index="3clFbw" />
@@ -114,6 +118,13 @@
114118
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
115119
<concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
116120
</language>
121+
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
122+
<concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
123+
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
124+
<child id="1199569906740" name="parameter" index="1bW2Oz" />
125+
<child id="1199569916463" name="body" index="1bW5cS" />
126+
</concept>
127+
</language>
117128
<language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
118129
<concept id="5455284157994012186" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitLink" flags="ng" index="2pIpSj">
119130
<reference id="5455284157994012188" name="link" index="2pIpSl" />
@@ -160,6 +171,7 @@
160171
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
161172
<concept id="1139613262185" name="jetbrains.mps.lang.smodel.structure.Node_GetParentOperation" flags="nn" index="1mfA1w" />
162173
<concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
174+
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
163175
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
164176
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
165177
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
@@ -193,6 +205,9 @@
193205
</concept>
194206
</language>
195207
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
208+
<concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
209+
<child id="1204796294226" name="closure" index="23t8la" />
210+
</concept>
196211
<concept id="1176903168877" name="jetbrains.mps.baseLanguage.collections.structure.UnionOperation" flags="nn" index="4Tj9Z" />
197212
<concept id="1176906603202" name="jetbrains.mps.baseLanguage.collections.structure.BinaryOperation" flags="nn" index="56pJg">
198213
<child id="1176906787974" name="rightExpression" index="576Qk" />
@@ -210,6 +225,7 @@
210225
<concept id="1205753630278" name="jetbrains.mps.baseLanguage.collections.structure.TailOperation" flags="nn" index="2Wx4Xu" />
211226
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
212227
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
228+
<concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
213229
</language>
214230
</registry>
215231
<node concept="13h7C7" id="cPLa7Fr1kl">
@@ -586,6 +602,94 @@
586602
<ref role="3uigEE" to="o8zo:3fifI_xCtN$" resolve="Scope" />
587603
</node>
588604
</node>
605+
<node concept="13i0hz" id="5LghDpmkwQU" role="13h7CS">
606+
<property role="TrG5h" value="getValue" />
607+
<node concept="3Tm1VV" id="5LghDpmkwQV" role="1B3o_S" />
608+
<node concept="3clFbS" id="5LghDpmkwQX" role="3clF47">
609+
<node concept="3cpWs8" id="5LghDpmqTgQ" role="3cqZAp">
610+
<node concept="3cpWsn" id="5LghDpmqTgR" role="3cpWs9">
611+
<property role="TrG5h" value="cell" />
612+
<node concept="3Tqbb2" id="5LghDpmpXt5" role="1tU5fm">
613+
<ref role="ehGHo" to="e9k1:cPLa7FpcCS" resolve="DataCell" />
614+
</node>
615+
<node concept="2OqwBi" id="5LghDpmqTgS" role="33vP2m">
616+
<node concept="2OqwBi" id="5LghDpmqTgT" role="2Oq$k0">
617+
<node concept="37vLTw" id="5LghDpmqTgU" role="2Oq$k0">
618+
<ref role="3cqZAo" node="5LghDpmky$e" resolve="row" />
619+
</node>
620+
<node concept="3Tsc0h" id="5LghDpmqTgV" role="2OqNvi">
621+
<ref role="3TtcxE" to="e9k1:cPLa7FpcRm" resolve="cells" />
622+
</node>
623+
</node>
624+
<node concept="1z4cxt" id="5BfEdcHWrm1" role="2OqNvi">
625+
<node concept="1bVj0M" id="5BfEdcHWrm3" role="23t8la">
626+
<node concept="3clFbS" id="5BfEdcHWrm4" role="1bW5cS">
627+
<node concept="3clFbF" id="5BfEdcHWrC$" role="3cqZAp">
628+
<node concept="17R0WA" id="5BfEdcHWu3T" role="3clFbG">
629+
<node concept="37vLTw" id="5BfEdcHWvuh" role="3uHU7w">
630+
<ref role="3cqZAo" node="5LghDpmky$y" resolve="column" />
631+
</node>
632+
<node concept="2OqwBi" id="5BfEdcHWs18" role="3uHU7B">
633+
<node concept="37vLTw" id="5BfEdcHWrCz" role="2Oq$k0">
634+
<ref role="3cqZAo" node="5BfEdcHWrm5" resolve="it" />
635+
</node>
636+
<node concept="3TrEf2" id="5BfEdcHWs_Y" role="2OqNvi">
637+
<ref role="3Tt5mk" to="e9k1:cPLa7FpdsY" resolve="col" />
638+
</node>
639+
</node>
640+
</node>
641+
</node>
642+
</node>
643+
<node concept="gl6BB" id="5BfEdcHWrm5" role="1bW2Oz">
644+
<property role="TrG5h" value="it" />
645+
<node concept="2jxLKc" id="5BfEdcHWrm6" role="1tU5fm" />
646+
</node>
647+
</node>
648+
</node>
649+
</node>
650+
</node>
651+
</node>
652+
<node concept="3clFbJ" id="5LghDpmqTNf" role="3cqZAp">
653+
<node concept="3clFbS" id="5LghDpmqTNh" role="3clFbx">
654+
<node concept="3cpWs6" id="5LghDpmqUMs" role="3cqZAp">
655+
<node concept="10Nm6u" id="5LghDpmqUUO" role="3cqZAk" />
656+
</node>
657+
</node>
658+
<node concept="2OqwBi" id="5LghDpmqUni" role="3clFbw">
659+
<node concept="37vLTw" id="5LghDpmqU5P" role="2Oq$k0">
660+
<ref role="3cqZAo" node="5LghDpmqTgR" resolve="cell" />
661+
</node>
662+
<node concept="3w_OXm" id="5LghDpmqUCs" role="2OqNvi" />
663+
</node>
664+
</node>
665+
<node concept="3clFbH" id="5LghDpmqV34" role="3cqZAp" />
666+
<node concept="3clFbF" id="5LghDpmky_v" role="3cqZAp">
667+
<node concept="2OqwBi" id="5LghDpmkRt7" role="3clFbG">
668+
<node concept="37vLTw" id="5LghDpmqTgY" role="2Oq$k0">
669+
<ref role="3cqZAo" node="5LghDpmqTgR" resolve="cell" />
670+
</node>
671+
<node concept="3TrEf2" id="5LghDpmkRN$" role="2OqNvi">
672+
<ref role="3Tt5mk" to="e9k1:cPLa7Fpe9f" resolve="value" />
673+
</node>
674+
</node>
675+
</node>
676+
</node>
677+
<node concept="3Tqbb2" id="5LghDpmkxgc" role="3clF45">
678+
<ref role="ehGHo" to="hm2y:6sdnDbSla17" resolve="Expression" />
679+
</node>
680+
<node concept="37vLTG" id="5LghDpmky$e" role="3clF46">
681+
<property role="TrG5h" value="row" />
682+
<node concept="3Tqbb2" id="4nqxrdKwyjM" role="1tU5fm">
683+
<ref role="ehGHo" to="e9k1:cPLa7Fpiy9" resolve="DataRow" />
684+
</node>
685+
</node>
686+
<node concept="37vLTG" id="5LghDpmky$y" role="3clF46">
687+
<property role="TrG5h" value="column" />
688+
<node concept="3Tqbb2" id="4nqxrdKw_N8" role="1tU5fm">
689+
<ref role="ehGHo" to="e9k1:cPLa7FpaUQ" resolve="DataColDef" />
690+
</node>
691+
</node>
692+
</node>
589693
</node>
590694
<node concept="13h7C7" id="cPLa7FtsME">
591695
<ref role="13h7C2" to="e9k1:cPLa7Ft09N" resolve="DataColOp" />

0 commit comments

Comments
 (0)