Skip to content

Commit ebe72a4

Browse files
arimerarimer
authored
Merge pull request #1449 from IETS3/merge/mps20232
Merge maintenance/mps20232 into maintenance/mps20241
2 parents ad06b0c + c8997ca commit ebe72a4

File tree

76 files changed

+5750
-424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+5750
-424
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ All notable changes to this project are documented in this file.
55
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
77

8-
98
## September 2025
109

1110
### Fixed
11+
- The renderReadable/getPresentation implementations were improved and are now equivalent in all concepts.
1212
- 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.
1313
- 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.
1414

15-
1615
## July 2025
1716

1817
### Fixed

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/behavior.mps‎

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<import index="5zyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.concurrent(JDK/)" />
2121
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
2222
<import index="dzyv" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.time.temporal(JDK/)" />
23+
<import index="ao3" ref="7124e466-fc92-4803-a656-d7a6b7eb3910/java:jetbrains.mps.text(MPS.TextGen/)" />
24+
<import index="kpbf" ref="7124e466-fc92-4803-a656-d7a6b7eb3910/java:jetbrains.mps.text.impl(MPS.TextGen/)" />
25+
<import index="xfg9" ref="r:ac28053f-2041-47f6-806b-ecfaca05a64a(org.iets3.core.expr.base.runtime.runtime)" />
2326
</imports>
2427
<registry>
2528
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -1551,10 +1554,185 @@
15511554
</node>
15521555
</node>
15531556
</node>
1557+
<node concept="13i0hz" id="4oS6BnMaYjr" role="13h7CS">
1558+
<property role="TrG5h" value="getPresentation" />
1559+
<ref role="13i0hy" to="tpcu:hEwIMiw" resolve="getPresentation" />
1560+
<node concept="3Tm1VV" id="4oS6BnMaYjQ" role="1B3o_S" />
1561+
<node concept="3clFbS" id="4oS6BnMaYjR" role="3clF47">
1562+
<node concept="3cpWs8" id="4oS6BnMfgFk" role="3cqZAp">
1563+
<node concept="3cpWsn" id="4oS6BnMfgFl" role="3cpWs9">
1564+
<property role="TrG5h" value="text" />
1565+
<node concept="3uibUv" id="4oS6BnMfgFm" role="1tU5fm">
1566+
<ref role="3uigEE" to="xfg9:4oS6BnMcix1" resolve="StringRepresentation" />
1567+
</node>
1568+
<node concept="2YIFZM" id="4oS6BnMfk5a" role="33vP2m">
1569+
<ref role="37wK5l" to="xfg9:4oS6BnMcjBJ" resolve="forShortSentence" />
1570+
<ref role="1Pybhc" to="xfg9:4oS6BnMcix1" resolve="StringRepresentation" />
1571+
</node>
1572+
</node>
1573+
</node>
1574+
<node concept="3clFbF" id="4oS6BnMfkeX" role="3cqZAp">
1575+
<node concept="2OqwBi" id="4oS6BnMfkyQ" role="3clFbG">
1576+
<node concept="37vLTw" id="4oS6BnMfkeV" role="2Oq$k0">
1577+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1578+
</node>
1579+
<node concept="liA8E" id="4oS6BnMfkVv" role="2OqNvi">
1580+
<ref role="37wK5l" to="kpbf:~TextAreaImpl.append(java.lang.CharSequence)" resolve="append" />
1581+
<node concept="Xl_RD" id="4oS6BnMb3gG" role="37wK5m">
1582+
<property role="Xl_RC" value="@solver:" />
1583+
</node>
1584+
</node>
1585+
</node>
1586+
</node>
1587+
<node concept="3clFbF" id="4oS6BnMgE_V" role="3cqZAp">
1588+
<node concept="2OqwBi" id="4oS6BnMgEUO" role="3clFbG">
1589+
<node concept="37vLTw" id="4oS6BnMgE_T" role="2Oq$k0">
1590+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1591+
</node>
1592+
<node concept="liA8E" id="4oS6BnMgFmw" role="2OqNvi">
1593+
<ref role="37wK5l" to="xfg9:4oS6BnMgQjs" resolve="appendWithSpace" />
1594+
<node concept="2OqwBi" id="4oS6BnMgFQ3" role="37wK5m">
1595+
<node concept="13iPFW" id="4oS6BnMgFsl" role="2Oq$k0" />
1596+
<node concept="3TrcHB" id="4oS6BnMgGdX" role="2OqNvi">
1597+
<ref role="3TsBF5" to="l80j:17Nm8oCo8O2" resolve="mode" />
1598+
</node>
1599+
</node>
1600+
</node>
1601+
</node>
1602+
</node>
1603+
<node concept="3clFbJ" id="4oS6BnMblFd" role="3cqZAp">
1604+
<node concept="3clFbS" id="4oS6BnMblFf" role="3clFbx">
1605+
<node concept="3clFbF" id="4oS6BnMhFv7" role="3cqZAp">
1606+
<node concept="2OqwBi" id="4oS6BnMhGpr" role="3clFbG">
1607+
<node concept="37vLTw" id="4oS6BnMhFv6" role="2Oq$k0">
1608+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1609+
</node>
1610+
<node concept="liA8E" id="4oS6BnMhGX4" role="2OqNvi">
1611+
<ref role="37wK5l" to="xfg9:4oS6BnMfnH9" resolve="appendWithSpace" />
1612+
<node concept="Xl_RD" id="4oS6BnMhH2z" role="37wK5m">
1613+
<property role="Xl_RC" value="with timeout = " />
1614+
</node>
1615+
</node>
1616+
</node>
1617+
</node>
1618+
<node concept="3clFbF" id="4oS6BnMhIE_" role="3cqZAp">
1619+
<node concept="2OqwBi" id="4oS6BnMhIGD" role="3clFbG">
1620+
<node concept="37vLTw" id="4oS6BnMhIEz" role="2Oq$k0">
1621+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1622+
</node>
1623+
<node concept="liA8E" id="4oS6BnMhIQh" role="2OqNvi">
1624+
<ref role="37wK5l" to="xfg9:4oS6BnMjbhG" resolve="append" />
1625+
<node concept="2OqwBi" id="4oS6BnMhKwZ" role="37wK5m">
1626+
<node concept="13iPFW" id="4oS6BnMhIWM" role="2Oq$k0" />
1627+
<node concept="3TrcHB" id="4oS6BnMhKTQ" role="2OqNvi">
1628+
<ref role="3TsBF5" to="l80j:2GQBRFCFk_3" resolve="timeout" />
1629+
</node>
1630+
</node>
1631+
</node>
1632+
</node>
1633+
</node>
1634+
<node concept="3clFbF" id="4oS6BnMiTlf" role="3cqZAp">
1635+
<node concept="2OqwBi" id="4oS6BnMiTMH" role="3clFbG">
1636+
<node concept="37vLTw" id="4oS6BnMiTld" role="2Oq$k0">
1637+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1638+
</node>
1639+
<node concept="liA8E" id="4oS6BnMiURh" role="2OqNvi">
1640+
<ref role="37wK5l" to="kpbf:~TextAreaImpl.append(java.lang.CharSequence)" resolve="append" />
1641+
<node concept="Xl_RD" id="4oS6BnMiUZY" role="37wK5m">
1642+
<property role="Xl_RC" value="s" />
1643+
</node>
1644+
</node>
1645+
</node>
1646+
</node>
1647+
</node>
1648+
<node concept="3eOSWO" id="2ZalWa8IAb0" role="3clFbw">
1649+
<node concept="2OqwBi" id="2ZalWa8IzFd" role="3uHU7B">
1650+
<node concept="13iPFW" id="4oS6BnMbmOb" role="2Oq$k0" />
1651+
<node concept="3TrcHB" id="2ZalWa8I$e6" role="2OqNvi">
1652+
<ref role="3TsBF5" to="l80j:2GQBRFCFk_3" resolve="timeout" />
1653+
</node>
1654+
</node>
1655+
<node concept="3cmrfG" id="2ZalWa8IAom" role="3uHU7w">
1656+
<property role="3cmrfH" value="0" />
1657+
</node>
1658+
</node>
1659+
</node>
1660+
<node concept="3clFbF" id="4oS6BnMbZ39" role="3cqZAp">
1661+
<node concept="2OqwBi" id="4oS6BnMc0xy" role="3clFbG">
1662+
<node concept="37vLTw" id="4oS6BnMbZ37" role="2Oq$k0">
1663+
<ref role="3cqZAo" node="4oS6BnMfgFl" resolve="text" />
1664+
</node>
1665+
<node concept="liA8E" id="4oS6BnMc1M8" role="2OqNvi">
1666+
<ref role="37wK5l" to="xfg9:4oS6BnMUIdM" resolve="toString" />
1667+
</node>
1668+
</node>
1669+
</node>
1670+
</node>
1671+
<node concept="17QB3L" id="4oS6BnMaYjS" role="3clF45" />
1672+
</node>
15541673
</node>
15551674
<node concept="13h7C7" id="XhdFKvYcsC">
15561675
<property role="3GE5qa" value="adapter" />
15571676
<ref role="13h7C2" to="l80j:XhdFKvXQxo" resolve="ErrorSolverTask" />
1677+
<node concept="13i0hz" id="4oS6BnMakhZ" role="13h7CS">
1678+
<property role="TrG5h" value="getPresentation" />
1679+
<ref role="13i0hy" to="tpcu:hEwIMiw" resolve="getPresentation" />
1680+
<node concept="3Tm1VV" id="4oS6BnMakiq" role="1B3o_S" />
1681+
<node concept="3clFbS" id="4oS6BnMakir" role="3clF47">
1682+
<node concept="3cpWs8" id="4oS6BnMcKyQ" role="3cqZAp">
1683+
<node concept="3cpWsn" id="4oS6BnMcKyR" role="3cpWs9">
1684+
<property role="TrG5h" value="text" />
1685+
<node concept="3uibUv" id="4oS6BnMcKyS" role="1tU5fm">
1686+
<ref role="3uigEE" to="xfg9:4oS6BnMcix1" resolve="StringRepresentation" />
1687+
</node>
1688+
<node concept="2YIFZM" id="4oS6BnMdltY" role="33vP2m">
1689+
<ref role="37wK5l" to="xfg9:4oS6BnMcl4R" resolve="forMultipleSentences" />
1690+
<ref role="1Pybhc" to="xfg9:4oS6BnMcix1" resolve="StringRepresentation" />
1691+
</node>
1692+
</node>
1693+
</node>
1694+
<node concept="3clFbF" id="4oS6BnMdlA3" role="3cqZAp">
1695+
<node concept="2OqwBi" id="4oS6BnMdmE0" role="3clFbG">
1696+
<node concept="37vLTw" id="4oS6BnMdlA1" role="2Oq$k0">
1697+
<ref role="3cqZAo" node="4oS6BnMcKyR" resolve="text" />
1698+
</node>
1699+
<node concept="liA8E" id="4oS6BnMdn4D" role="2OqNvi">
1700+
<ref role="37wK5l" to="kpbf:~TextAreaImpl.append(java.lang.CharSequence)" resolve="append" />
1701+
<node concept="Xl_RD" id="4oS6BnMan87" role="37wK5m">
1702+
<property role="Xl_RC" value="Errors during task creation:" />
1703+
</node>
1704+
</node>
1705+
</node>
1706+
</node>
1707+
<node concept="3clFbF" id="4oS6BnMdnOn" role="3cqZAp">
1708+
<node concept="2OqwBi" id="4oS6BnMdoIl" role="3clFbG">
1709+
<node concept="37vLTw" id="4oS6BnMdnOl" role="2Oq$k0">
1710+
<ref role="3cqZAo" node="4oS6BnMcKyR" resolve="text" />
1711+
</node>
1712+
<node concept="liA8E" id="4oS6BnMdW2n" role="2OqNvi">
1713+
<ref role="37wK5l" to="xfg9:4oS6BnMeeyx" resolve="appendVertically" />
1714+
<node concept="2OqwBi" id="4oS6BnMdWvC" role="37wK5m">
1715+
<node concept="13iPFW" id="4oS6BnMdW6k" role="2Oq$k0" />
1716+
<node concept="3Tsc0h" id="4oS6BnMdWP_" role="2OqNvi">
1717+
<ref role="3TtcxE" to="l80j:XhdFKvXSNY" resolve="errors" />
1718+
</node>
1719+
</node>
1720+
</node>
1721+
</node>
1722+
</node>
1723+
<node concept="3clFbF" id="4oS6BnMaH9B" role="3cqZAp">
1724+
<node concept="2OqwBi" id="4oS6BnMaHrn" role="3clFbG">
1725+
<node concept="37vLTw" id="4oS6BnMaH9_" role="2Oq$k0">
1726+
<ref role="3cqZAo" node="4oS6BnMcKyR" resolve="text" />
1727+
</node>
1728+
<node concept="liA8E" id="4oS6BnMaH$3" role="2OqNvi">
1729+
<ref role="37wK5l" to="xfg9:4oS6BnMUIdM" resolve="toString" />
1730+
</node>
1731+
</node>
1732+
</node>
1733+
</node>
1734+
<node concept="17QB3L" id="4oS6BnMakis" role="3clF45" />
1735+
</node>
15581736
<node concept="13hLZK" id="XhdFKvYcsD" role="13h7CW">
15591737
<node concept="3clFbS" id="XhdFKvYcsE" role="2VODD2" />
15601738
</node>
@@ -2065,5 +2243,28 @@
20652243
<node concept="3clFbS" id="1ScogIcAG8g" role="2VODD2" />
20662244
</node>
20672245
</node>
2246+
<node concept="13h7C7" id="4oS6BnMai2W">
2247+
<property role="3GE5qa" value="adapter" />
2248+
<ref role="13h7C2" to="l80j:XhdFKvXSNr" resolve="ErrorMessage" />
2249+
<node concept="13hLZK" id="4oS6BnMai2X" role="13h7CW">
2250+
<node concept="3clFbS" id="4oS6BnMai2Y" role="2VODD2" />
2251+
</node>
2252+
<node concept="13i0hz" id="4oS6BnMai3f" role="13h7CS">
2253+
<property role="TrG5h" value="getPresentation" />
2254+
<ref role="13i0hy" to="tpcu:hEwIMiw" resolve="getPresentation" />
2255+
<node concept="3Tm1VV" id="4oS6BnMai3E" role="1B3o_S" />
2256+
<node concept="3clFbS" id="4oS6BnMai3F" role="3clF47">
2257+
<node concept="3clFbF" id="4oS6BnMaiRX" role="3cqZAp">
2258+
<node concept="2OqwBi" id="4oS6BnMaj3W" role="3clFbG">
2259+
<node concept="13iPFW" id="4oS6BnMaiRS" role="2Oq$k0" />
2260+
<node concept="3TrcHB" id="4oS6BnMajhj" role="2OqNvi">
2261+
<ref role="3TsBF5" to="l80j:XhdFKvXSNs" resolve="msg" />
2262+
</node>
2263+
</node>
2264+
</node>
2265+
</node>
2266+
<node concept="17QB3L" id="4oS6BnMai3G" role="3clF45" />
2267+
</node>
2268+
</node>
20682269
</model>
20692270

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/org.iets3.analysis.base.mpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
2222
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
2323
<dependency reexport="false">b0f8641f-bd77-4421-8425-30d9088a82f7(org.apache.commons)</dependency>
24+
<dependency reexport="false">7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)</dependency>
25+
<dependency reexport="false">dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</dependency>
2426
</dependencies>
2527
<languageVersions>
2628
<language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
@@ -76,6 +78,7 @@
7678
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
7779
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
7880
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
81+
<module reference="7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)" version="0" />
7982
<module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
8083
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
8184
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
@@ -109,6 +112,7 @@
109112
<module reference="db8bd035-3f51-41d8-8fed-954c202d18be(org.iets3.analysis.base)" version="1" />
110113
<module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
111114
<module reference="cfaa4966-b7d5-4b69-b66a-309a6e1a7290(org.iets3.core.expr.base)" version="20" />
115+
<module reference="dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)" version="0" />
112116
</dependencyVersions>
113117
<extendedLanguages>
114118
<extendedLanguage>7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)</extendedLanguage>

‎code/languages/org.iets3.opensource/languages/org.iets3.analysis.logic.operator/org.iets3.analysis.logic.operator.mpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
6363
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
6464
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
65+
<module reference="7124e466-fc92-4803-a656-d7a6b7eb3910(MPS.TextGen)" version="0" />
6566
<module reference="d4280a54-f6df-4383-aa41-d1b2bffa7eb1(com.mbeddr.core.base)" version="3" />
6667
<module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
6768
<module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />

0 commit comments

Comments
 (0)