Skip to content

Commit 9f29ccf

Browse files
arimerarimer
authored
Merge pull request #1500 from IETS3/merge/mps20232
Merge maintenance/mps20232 into maintenance/mps20241
2 parents 9d9ef3b + 0c46edc commit 9f29ccf

File tree

7 files changed

+1157
-7
lines changed

7 files changed

+1157
-7
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1717
- It now supports a "requires" relation, which can express that a requirement needs other requirements as a precondition.
1818
- The requirements chunk provides a flag "hide empty child requirements sections" (in the inspector). If selected, the flag hides empty child requirements sections in the tabular requirements view.
1919
- Some additional internal changes (e.g., implementation of `ICanHide` interface, needed for variability support).
20+
- A new intention is available to split kernelF StringLiterals into concatenation parts
2021

2122
### Fixed
2223
- Improved the readability of lists by enforcing a new line when a threshold of three elements per list is exeeded.
24+
- A DecTab bug not respecting the default value was fixed and a corresponding warning was added to warn users which default value takes precedence
2325

2426

2527
## September 2025
@@ -33,6 +35,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
3335
- 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.
3436

3537

38+
### Added
39+
40+
- Data tables, binary and multi-criteria decision tables now support deletion, copying and pasting when multiple cells are selected with the mouse.
41+
3642
## July 2025
3743

3844
### Fixed

‎build/scripts/build-allScripts.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<property name="com.mbeddr.platform.minor.version" value="${import.com.mbeddr.platform.com.mbeddr.platform.minor.version}" />
2828
<property name="com.mbeddr.platform.build" value="${import.com.mbeddr.platform.com.mbeddr.platform.build}" />
2929
<property name="com.mbeddr.platform.mbeddr.version" value="${import.com.mbeddr.platform.com.mbeddr.platform.mbeddr.version}" />
30-
<property name="de.itemis.mps.extensions.versionNumber" value="${import.com.mbeddr.platform.de.itemis.mps.extensions.versionNumber}" />
30+
<property name="de.itemis.mps.extensions.version" value="${import.com.mbeddr.platform.de.itemis.mps.extensions.version}" />
3131
<property name="com.mbeddr.mpsutil.actionsfilter.major.version" value="${import.com.mbeddr.platform.com.mbeddr.mpsutil.actionsfilter.major.version}" />
3232
<property name="com.mbeddr.mpsutil.actionsfilter.minor.version" value="${import.com.mbeddr.platform.com.mbeddr.mpsutil.actionsfilter.minor.version}" />
3333
<property name="com.mbeddr.mpsutil.actionsfilter.build" value="${import.com.mbeddr.platform.com.mbeddr.mpsutil.actionsfilter.build}" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.genjava.util/generator/template/[email protected]‎

Lines changed: 223 additions & 6 deletions
Large diffs are not rendered by default.

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/intentions.mps‎

Lines changed: 210 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717
<import index="b1h1" ref="r:ac5f749f-6179-4d4f-ad24-ad9edbd8077b(org.iets3.core.expr.simpleTypes.behavior)" />
1818
<import index="hm2y" ref="r:66e07cb4-a4b0-4bf3-a36d-5e9ed1ff1bd3(org.iets3.core.expr.base.structure)" />
1919
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
20+
<import index="g51k" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor.cells(MPS.Editor/)" />
2021
<import index="pbu6" ref="r:83e946de-2a7f-4a4c-b3c9-4f671aa7f2db(org.iets3.core.expr.base.behavior)" implicit="true" />
22+
<import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" implicit="true" />
23+
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
2124
</imports>
2225
<registry>
2326
<language id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts">
@@ -40,6 +43,7 @@
4043
<child id="1068498886295" name="lValue" index="37vLTJ" />
4144
</concept>
4245
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
46+
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
4347
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
4448
<child id="1197027771414" name="operand" index="2Oq$k0" />
4549
<child id="1197027833540" name="operation" index="2OqNvi" />
@@ -56,14 +60,24 @@
5660
<concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
5761
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
5862
</concept>
63+
<concept id="1081256982272" name="jetbrains.mps.baseLanguage.structure.InstanceOfExpression" flags="nn" index="2ZW3vV">
64+
<child id="1081256993305" name="classType" index="2ZW6by" />
65+
<child id="1081256993304" name="leftExpression" index="2ZW6bz" />
66+
</concept>
5967
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
68+
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
69+
<concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
70+
<child id="1070534934091" name="type" index="10QFUM" />
71+
<child id="1070534934092" name="expression" index="10QFUP" />
72+
</concept>
6073
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
6174
<child id="1068431790190" name="initializer" index="33vP2m" />
6275
</concept>
6376
<concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
6477
<reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
6578
</concept>
6679
<concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
80+
<concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
6781
<concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
6882
<child id="5680397130376446158" name="type" index="1tU5fm" />
6983
</concept>
@@ -103,10 +117,14 @@
103117
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
104118
<child id="1068499141038" name="actualArgument" index="37wK5m" />
105119
</concept>
120+
<concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
121+
<reference id="1107535924139" name="classifier" index="3uigEE" />
122+
</concept>
106123
<concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
107124
<child id="1081773367579" name="rightExpression" index="3uHU7w" />
108125
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
109126
</concept>
127+
<concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
110128
<concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
111129
<child id="1163668914799" name="condition" index="3K4Cdx" />
112130
<child id="1163668922816" name="ifTrue" index="3K4E3e" />
@@ -1328,5 +1346,197 @@
13281346
</node>
13291347
</node>
13301348
</node>
1349+
<node concept="2S6QgY" id="2wqTDZJZvwg">
1350+
<property role="3GE5qa" value="string" />
1351+
<property role="TrG5h" value="SplitStringIntoConcatenation" />
1352+
<ref role="2ZfgGC" to="5qo5:4rZeNQ6OYR8" resolve="StringLiteral" />
1353+
<node concept="2S6ZIM" id="2wqTDZJZvwh" role="2ZfVej">
1354+
<node concept="3clFbS" id="2wqTDZJZvwi" role="2VODD2">
1355+
<node concept="3clFbF" id="2wqTDZJZvO0" role="3cqZAp">
1356+
<node concept="Xl_RD" id="2wqTDZJZvNZ" role="3clFbG">
1357+
<property role="Xl_RC" value="Split String into Concatenation" />
1358+
</node>
1359+
</node>
1360+
</node>
1361+
</node>
1362+
<node concept="2Sbjvc" id="2wqTDZJZvwj" role="2ZfgGD">
1363+
<node concept="3clFbS" id="2wqTDZJZvwk" role="2VODD2">
1364+
<node concept="3cpWs8" id="2wqTDZJZEpX" role="3cqZAp">
1365+
<node concept="3cpWsn" id="2wqTDZJZEpY" role="3cpWs9">
1366+
<property role="TrG5h" value="cell" />
1367+
<node concept="3uibUv" id="2wqTDZJZEpZ" role="1tU5fm">
1368+
<ref role="3uigEE" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
1369+
</node>
1370+
<node concept="1eOMI4" id="2wqTDZJZErV" role="33vP2m">
1371+
<node concept="10QFUN" id="2wqTDZJZErS" role="1eOMHV">
1372+
<node concept="3uibUv" id="2wqTDZJZErX" role="10QFUM">
1373+
<ref role="3uigEE" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
1374+
</node>
1375+
<node concept="2OqwBi" id="2wqTDZJZExK" role="10QFUP">
1376+
<node concept="1XNTG" id="2wqTDZJZEsx" role="2Oq$k0" />
1377+
<node concept="liA8E" id="2wqTDZJZEMR" role="2OqNvi">
1378+
<ref role="37wK5l" to="cj4x:~EditorContext.getContextCell()" resolve="getContextCell" />
1379+
</node>
1380+
</node>
1381+
</node>
1382+
</node>
1383+
</node>
1384+
</node>
1385+
<node concept="3cpWs8" id="2wqTDZJZFjR" role="3cqZAp">
1386+
<node concept="3cpWsn" id="2wqTDZJZFjU" role="3cpWs9">
1387+
<property role="TrG5h" value="caretPosition" />
1388+
<node concept="10Oyi0" id="2wqTDZJZFjP" role="1tU5fm" />
1389+
<node concept="2OqwBi" id="2wqTDZJZG9F" role="33vP2m">
1390+
<node concept="37vLTw" id="2wqTDZJZFlK" role="2Oq$k0">
1391+
<ref role="3cqZAo" node="2wqTDZJZEpY" resolve="cell" />
1392+
</node>
1393+
<node concept="liA8E" id="2wqTDZJZIbu" role="2OqNvi">
1394+
<ref role="37wK5l" to="g51k:~EditorCell_Label.getCaretPosition()" resolve="getCaretPosition" />
1395+
</node>
1396+
</node>
1397+
</node>
1398+
</node>
1399+
<node concept="3cpWs8" id="2wqTDZJZIg5" role="3cqZAp">
1400+
<node concept="3cpWsn" id="2wqTDZJZIg8" role="3cpWs9">
1401+
<property role="TrG5h" value="l" />
1402+
<node concept="17QB3L" id="2wqTDZJZIg3" role="1tU5fm" />
1403+
<node concept="3K4zz7" id="2wqTDZJZLSN" role="33vP2m">
1404+
<node concept="2OqwBi" id="2wqTDZJZNDH" role="3K4E3e">
1405+
<node concept="2OqwBi" id="2wqTDZJZM4p" role="2Oq$k0">
1406+
<node concept="2Sf5sV" id="2wqTDZJZLTC" role="2Oq$k0" />
1407+
<node concept="3TrcHB" id="2wqTDZJZMSg" role="2OqNvi">
1408+
<ref role="3TsBF5" to="5qo5:4rZeNQ6OYRb" resolve="value" />
1409+
</node>
1410+
</node>
1411+
<node concept="liA8E" id="2wqTDZJZPs$" role="2OqNvi">
1412+
<ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
1413+
<node concept="3cmrfG" id="2wqTDZJZQ26" role="37wK5m">
1414+
<property role="3cmrfH" value="0" />
1415+
</node>
1416+
<node concept="37vLTw" id="2wqTDZJZRBd" role="37wK5m">
1417+
<ref role="3cqZAo" node="2wqTDZJZFjU" resolve="caretPosition" />
1418+
</node>
1419+
</node>
1420+
</node>
1421+
<node concept="Xl_RD" id="2wqTDZJZRCW" role="3K4GZi">
1422+
<property role="Xl_RC" value="" />
1423+
</node>
1424+
<node concept="3y3z36" id="2wqTDZJZKuw" role="3K4Cdx">
1425+
<node concept="10Nm6u" id="2wqTDZJZLES" role="3uHU7w" />
1426+
<node concept="2OqwBi" id="2wqTDZJZIvH" role="3uHU7B">
1427+
<node concept="2Sf5sV" id="2wqTDZJZIiq" role="2Oq$k0" />
1428+
<node concept="3TrcHB" id="2wqTDZJZIUF" role="2OqNvi">
1429+
<ref role="3TsBF5" to="5qo5:4rZeNQ6OYRb" resolve="value" />
1430+
</node>
1431+
</node>
1432+
</node>
1433+
</node>
1434+
</node>
1435+
</node>
1436+
<node concept="3cpWs8" id="2wqTDZJZRPb" role="3cqZAp">
1437+
<node concept="3cpWsn" id="2wqTDZJZRPe" role="3cpWs9">
1438+
<property role="TrG5h" value="r" />
1439+
<node concept="17QB3L" id="2wqTDZJZRP9" role="1tU5fm" />
1440+
<node concept="3K4zz7" id="2wqTDZJZV0r" role="33vP2m">
1441+
<node concept="2OqwBi" id="2wqTDZJZV6R" role="3K4E3e">
1442+
<node concept="2OqwBi" id="2wqTDZJZV1N" role="2Oq$k0">
1443+
<node concept="2Sf5sV" id="2wqTDZJZV1g" role="2Oq$k0" />
1444+
<node concept="3TrcHB" id="2wqTDZJZV5B" role="2OqNvi">
1445+
<ref role="3TsBF5" to="5qo5:4rZeNQ6OYRb" resolve="value" />
1446+
</node>
1447+
</node>
1448+
<node concept="liA8E" id="2wqTDZJZWSq" role="2OqNvi">
1449+
<ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
1450+
<node concept="37vLTw" id="2wqTDZJZXzo" role="37wK5m">
1451+
<ref role="3cqZAo" node="2wqTDZJZFjU" resolve="caretPosition" />
1452+
</node>
1453+
</node>
1454+
</node>
1455+
<node concept="Xl_RD" id="2wqTDZJZX_W" role="3K4GZi">
1456+
<property role="Xl_RC" value="" />
1457+
</node>
1458+
<node concept="3y3z36" id="2wqTDZJZU2V" role="3K4Cdx">
1459+
<node concept="10Nm6u" id="2wqTDZJZUZA" role="3uHU7w" />
1460+
<node concept="2OqwBi" id="2wqTDZJZS6X" role="3uHU7B">
1461+
<node concept="2Sf5sV" id="2wqTDZJZRTE" role="2Oq$k0" />
1462+
<node concept="3TrcHB" id="2wqTDZJZSxV" role="2OqNvi">
1463+
<ref role="3TsBF5" to="5qo5:4rZeNQ6OYRb" resolve="value" />
1464+
</node>
1465+
</node>
1466+
</node>
1467+
</node>
1468+
</node>
1469+
</node>
1470+
<node concept="3cpWs8" id="2wqTDZJZYq6" role="3cqZAp">
1471+
<node concept="3cpWsn" id="2wqTDZJZYq9" role="3cpWs9">
1472+
<property role="TrG5h" value="plusExpression" />
1473+
<node concept="3Tqbb2" id="2wqTDZJZYq4" role="1tU5fm">
1474+
<ref role="ehGHo" to="hm2y:4rZeNQ6MqjM" resolve="PlusExpression" />
1475+
</node>
1476+
<node concept="2pJPEk" id="2wqTDZJZZAE" role="33vP2m">
1477+
<node concept="2pJPED" id="2wqTDZJZZAG" role="2pJPEn">
1478+
<ref role="2pJxaS" to="hm2y:4rZeNQ6MqjM" resolve="PlusExpression" />
1479+
<node concept="2pIpSj" id="2wqTDZK00kq" role="2pJxcM">
1480+
<ref role="2pIpSl" to="hm2y:4rZeNQ6MpKm" resolve="left" />
1481+
<node concept="2pJPED" id="2wqTDZK00kZ" role="28nt2d">
1482+
<ref role="2pJxaS" to="5qo5:4rZeNQ6OYR8" resolve="StringLiteral" />
1483+
<node concept="2pJxcG" id="2wqTDZK00lp" role="2pJxcM">
1484+
<ref role="2pJxcJ" to="5qo5:4rZeNQ6OYRb" resolve="value" />
1485+
<node concept="WxPPo" id="2wqTDZK00m0" role="28ntcv">
1486+
<node concept="37vLTw" id="2wqTDZK00lY" role="WxPPp">
1487+
<ref role="3cqZAo" node="2wqTDZJZIg8" resolve="l" />
1488+
</node>
1489+
</node>
1490+
</node>
1491+
</node>
1492+
</node>
1493+
<node concept="2pIpSj" id="2wqTDZK00n0" role="2pJxcM">
1494+
<ref role="2pIpSl" to="hm2y:4rZeNQ6MpKo" resolve="right" />
1495+
<node concept="2pJPED" id="2wqTDZK00n_" role="28nt2d">
1496+
<ref role="2pJxaS" to="5qo5:4rZeNQ6OYR8" resolve="StringLiteral" />
1497+
<node concept="2pJxcG" id="2wqTDZK00nZ" role="2pJxcM">
1498+
<ref role="2pJxcJ" to="5qo5:4rZeNQ6OYRb" resolve="value" />
1499+
<node concept="WxPPo" id="2wqTDZK00oA" role="28ntcv">
1500+
<node concept="37vLTw" id="2wqTDZK00o$" role="WxPPp">
1501+
<ref role="3cqZAo" node="2wqTDZJZRPe" resolve="r" />
1502+
</node>
1503+
</node>
1504+
</node>
1505+
</node>
1506+
</node>
1507+
</node>
1508+
</node>
1509+
</node>
1510+
</node>
1511+
<node concept="3clFbF" id="2wqTDZK00BJ" role="3cqZAp">
1512+
<node concept="2OqwBi" id="2wqTDZK00TR" role="3clFbG">
1513+
<node concept="2Sf5sV" id="2wqTDZK00BI" role="2Oq$k0" />
1514+
<node concept="1P9Npp" id="2wqTDZK01KN" role="2OqNvi">
1515+
<node concept="37vLTw" id="2wqTDZK01Lz" role="1P9ThW">
1516+
<ref role="3cqZAo" node="2wqTDZJZYq9" resolve="plusExpression" />
1517+
</node>
1518+
</node>
1519+
</node>
1520+
</node>
1521+
</node>
1522+
</node>
1523+
<node concept="2SaL7w" id="2wqTDZJZwci" role="2ZfVeh">
1524+
<node concept="3clFbS" id="2wqTDZJZwcj" role="2VODD2">
1525+
<node concept="3clFbF" id="2wqTDZJZA2H" role="3cqZAp">
1526+
<node concept="2ZW3vV" id="2wqTDZJZCGU" role="3clFbG">
1527+
<node concept="3uibUv" id="2wqTDZJZCNY" role="2ZW6by">
1528+
<ref role="3uigEE" to="g51k:~EditorCell_Property" resolve="EditorCell_Property" />
1529+
</node>
1530+
<node concept="2OqwBi" id="2wqTDZJZAnN" role="2ZW6bz">
1531+
<node concept="1XNTG" id="2wqTDZJZA2G" role="2Oq$k0" />
1532+
<node concept="liA8E" id="2wqTDZJZCiZ" role="2OqNvi">
1533+
<ref role="37wK5l" to="cj4x:~EditorContext.getSelectedCell()" resolve="getSelectedCell" />
1534+
</node>
1535+
</node>
1536+
</node>
1537+
</node>
1538+
</node>
1539+
</node>
1540+
</node>
13311541
</model>
13321542

0 commit comments

Comments
 (0)