Skip to content

Commit 251aee5

Browse files
arimerarimer
authored
Merge pull request #1484 from IETS3/merge/mps20241
Merge maintenance/mps20241 into maintenance/mps20251
2 parents e7b783e + 5e7c6ed commit 251aee5

File tree

36 files changed

+18874
-7650
lines changed

36 files changed

+18874
-7650
lines changed

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,30 @@ 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+
## October 2025
9+
10+
### Added
11+
- Variability: Some changes regarding variant configurations:
12+
- A check has been added for duplicate names of configurations in the same container.
13+
- Configurations might become inconsistent due to errors during manual conflict merges. A couple of model checks have been added to detect this. Additionally, there are quickfixes to fix such errors.
14+
- The internal storage of configurations has changed, this requires a language migration. Note that after the execution of the migration, extended configurations must be adapted via intention to their changed base configuration.
15+
- A VCS merge hint has been added for the `__hash` property (e.g., for variant configurations). This avoids merge conflicts which cannot be resolved manually anyway (in those cases, the hash value has to be recomputed anyway).
16+
17+
### Fixed
18+
- Improved the readability of lists by enforcing a new line when a threshold of three elements per list is exeeded.
19+
20+
821
## September 2025
922

23+
### Added
24+
- Data tables, binary and multi-criteria decision tables now support deletion, copying and pasting when multiple cells are selected with the mouse.
25+
1026
### Fixed
1127
- The renderReadable/getPresentation implementations were improved and are now equivalent in all concepts.
1228
- 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.
1329
- 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.
1430

31+
1532
## July 2025
1633

1734
### Fixed

‎code/languages/org.iets3.opensource/languages/org.iets3.components.functional/models/typesystem.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3251,7 +3251,7 @@
32513251
<node concept="3clFbS" id="x8tpS_NsQ_" role="3clFbx">
32523252
<node concept="2MkqsV" id="x8tpS_NwyQ" role="3cqZAp">
32533253
<node concept="Xl_RD" id="x8tpS_Nwzb" role="2MkJ7o">
3254-
<property role="Xl_RC" value="must not be 0" />
3254+
<property role="Xl_RC" value="Upper bound must not be 0" />
32553255
</node>
32563256
<node concept="2ODE4t" id="x8tpS_Nw$_" role="1urrC5">
32573257
<ref role="2ODJFN" to="874t:x8tpS_w3Qp" resolve="upperBound" />
@@ -3284,7 +3284,7 @@
32843284
<node concept="3clFbS" id="x8tpS_Nx86" role="3clFbx">
32853285
<node concept="2MkqsV" id="x8tpS_NxyL" role="3cqZAp">
32863286
<node concept="Xl_RD" id="x8tpS_NxyM" role="2MkJ7o">
3287-
<property role="Xl_RC" value="lower bound must be smaller then upper bound" />
3287+
<property role="Xl_RC" value="Lower bound must be smaller then upper bound" />
32883288
</node>
32893289
<node concept="1YBJjd" id="x8tpS_NxyN" role="1urrMF">
32903290
<ref role="1YBMHb" node="x8tpS_NosR" resolve="cardinality" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.base/models/org.iets3.core.base.vcs.mps‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<model ref="r:27cfda35-f088-4205-ba49-6d4b30b5dc77(org.iets3.core.base.vcs)">
3+
<persistence version="9" />
4+
<languages>
5+
<use id="37e03aa1-7289-49bc-8269-30de5eceec76" name="jetbrains.mps.vcs.mergehints" version="2" />
6+
<devkit ref="0f6bec2b-49d8-431a-a099-4c072ba32b8e(jetbrains.mps.devkit.aspect.vcs)" />
7+
</languages>
8+
<imports>
9+
<import index="4kwy" ref="r:657c9fde-2f36-4e61-ae17-20f02b8630ad(org.iets3.core.base.structure)" implicit="true" />
10+
</imports>
11+
<registry>
12+
<language id="37e03aa1-7289-49bc-8269-30de5eceec76" name="jetbrains.mps.vcs.mergehints">
13+
<concept id="5705146868101871733" name="jetbrains.mps.vcs.mergehints.structure.FeatureVCSDescriptor" flags="ng" index="Zy3yG">
14+
<child id="5705146868101924671" name="strategy" index="ZygvA" />
15+
</concept>
16+
<concept id="5705146868101872080" name="jetbrains.mps.vcs.mergehints.structure.PropertyVCSDescriptor" flags="ng" index="Zy3$9">
17+
<reference id="5705146868101871735" name="prop" index="Zy3yI" />
18+
</concept>
19+
<concept id="5705146868101924608" name="jetbrains.mps.vcs.mergehints.structure.OursStrategy" flags="ng" index="Zygvp" />
20+
<concept id="4140018591229954297" name="jetbrains.mps.vcs.mergehints.structure.VCSHints" flags="ng" index="1GGwg0">
21+
<child id="4140018591229954298" name="concepts" index="1GGwg3" />
22+
</concept>
23+
<concept id="4140018591229954300" name="jetbrains.mps.vcs.mergehints.structure.ConceptVCSDescriptor" flags="ng" index="1GGwg5">
24+
<reference id="4140018591229954485" name="cncpt" index="1GGwlc" />
25+
<child id="5705146868101871817" name="features" index="Zy3wg" />
26+
</concept>
27+
</language>
28+
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
29+
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
30+
<property id="1193676396447" name="virtualPackage" index="3GE5qa" />
31+
</concept>
32+
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
33+
<property id="1169194664001" name="name" index="TrG5h" />
34+
</concept>
35+
</language>
36+
</registry>
37+
<node concept="1GGwg0" id="4FQsawJJshy">
38+
<property role="TrG5h" value="IDetectNeedToRunManually_Hints" />
39+
<property role="3GE5qa" value="adapter" />
40+
<node concept="1GGwg5" id="4FQsawJJshz" role="1GGwg3">
41+
<ref role="1GGwlc" to="4kwy:6MJy$PGsrHl" resolve="IDetectNeedToRunManually" />
42+
<node concept="Zy3$9" id="4FQsawJJslc" role="Zy3wg">
43+
<ref role="Zy3yI" to="4kwy:6MJy$PGsrHL" resolve="__hash" />
44+
<node concept="Zygvp" id="4FQsawJJsle" role="ZygvA" />
45+
</node>
46+
</node>
47+
</node>
48+
</model>
49+

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
5656
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
5757
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
58+
<language slang="l:37e03aa1-7289-49bc-8269-30de5eceec76:jetbrains.mps.vcs.mergehints" version="2" />
5859
</languageVersions>
5960
<dependencyVersions>
6061
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/models/editor.mps‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
</concept>
4747
<concept id="6089045305654894366" name="jetbrains.mps.lang.editor.structure.SubstituteMenuReference_Default" flags="ng" index="2kknPJ" />
4848
<concept id="1237303669825" name="jetbrains.mps.lang.editor.structure.CellLayout_Indent" flags="nn" index="l2Vlx" />
49+
<concept id="1237307900041" name="jetbrains.mps.lang.editor.structure.IndentLayoutIndentStyleClassItem" flags="ln" index="lj46D" />
4950
<concept id="784421273959492578" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_IncludeMenu" flags="ng" index="mvV$s">
5051
<child id="784421273959492606" name="nodeFunction" index="mvV$0" />
5152
</concept>
@@ -175,11 +176,13 @@
175176
<concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
176177
<reference id="1144433057691" name="classifier" index="1PxDUh" />
177178
</concept>
179+
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
178180
<concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
179181
<child id="1070534934091" name="type" index="10QFUM" />
180182
<child id="1070534934092" name="expression" index="10QFUP" />
181183
</concept>
182184
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
185+
<property id="1176718929932" name="isFinal" index="3TUv4t" />
183186
<child id="1068431790190" name="initializer" index="33vP2m" />
184187
</concept>
185188
<concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
@@ -215,6 +218,7 @@
215218
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
216219
<child id="1079359253376" name="expression" index="1eOMHV" />
217220
</concept>
221+
<concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
218222
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
219223
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
220224
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -490,6 +494,74 @@
490494
<property role="VOm3f" value="true" />
491495
</node>
492496
</node>
497+
<node concept="pVoyu" id="1B_b0w81IxR" role="3F10Kt">
498+
<property role="VOm3f" value="true" />
499+
<node concept="3nzxsE" id="1B_b0w833HR" role="3n$kyP">
500+
<node concept="3clFbS" id="1B_b0w833HS" role="2VODD2">
501+
<node concept="3cpWs8" id="qeznuD1TxR" role="3cqZAp">
502+
<node concept="3cpWsn" id="qeznuD1TxS" role="3cpWs9">
503+
<property role="TrG5h" value="THRESHOLD_FOR_NEW_LINES" />
504+
<property role="3TUv4t" value="true" />
505+
<node concept="10Oyi0" id="qeznuD1RGt" role="1tU5fm" />
506+
<node concept="3cmrfG" id="qeznuD1TxT" role="33vP2m">
507+
<property role="3cmrfH" value="3" />
508+
</node>
509+
</node>
510+
</node>
511+
<node concept="3clFbF" id="1B_b0w837L0" role="3cqZAp">
512+
<node concept="1Wc70l" id="qeznuD07mQ" role="3clFbG">
513+
<node concept="2OqwBi" id="1B_b0w8380K" role="3uHU7B">
514+
<node concept="2OqwBi" id="1B_b0w837Lx" role="2Oq$k0">
515+
<node concept="pncrf" id="1B_b0w837KZ" role="2Oq$k0" />
516+
<node concept="1mfA1w" id="1B_b0w837PF" role="2OqNvi" />
517+
</node>
518+
<node concept="1mIQ4w" id="1B_b0w838lP" role="2OqNvi">
519+
<node concept="chp4Y" id="1B_b0w838ot" role="cj9EA">
520+
<ref role="cht4Q" to="700h:6zmBjqUinVn" resolve="ListLiteral" />
521+
</node>
522+
</node>
523+
</node>
524+
<node concept="1eOMI4" id="qeznuD1Ph3" role="3uHU7w">
525+
<node concept="3eOSWO" id="qeznuD0jD$" role="1eOMHV">
526+
<node concept="37vLTw" id="qeznuD1TxU" role="3uHU7w">
527+
<ref role="3cqZAo" node="qeznuD1TxS" resolve="THRESHOLD_FOR_NEW_LINES" />
528+
</node>
529+
<node concept="2OqwBi" id="qeznuD0cQJ" role="3uHU7B">
530+
<node concept="2OqwBi" id="qeznuD07QZ" role="2Oq$k0">
531+
<node concept="pncrf" id="qeznuD07ob" role="2Oq$k0" />
532+
<node concept="3Tsc0h" id="qeznuD09Sn" role="2OqNvi">
533+
<ref role="3TtcxE" to="700h:6zmBjqUinVo" resolve="elements" />
534+
</node>
535+
</node>
536+
<node concept="34oBXx" id="qeznuD0gJp" role="2OqNvi" />
537+
</node>
538+
</node>
539+
</node>
540+
</node>
541+
</node>
542+
</node>
543+
</node>
544+
</node>
545+
<node concept="lj46D" id="1B_b0w84d$8" role="3F10Kt">
546+
<property role="VOm3f" value="true" />
547+
<node concept="3nzxsE" id="1B_b0w84d_6" role="3n$kyP">
548+
<node concept="3clFbS" id="1B_b0w84d_7" role="2VODD2">
549+
<node concept="3clFbF" id="1B_b0w84ecS" role="3cqZAp">
550+
<node concept="2OqwBi" id="1B_b0w84ecT" role="3clFbG">
551+
<node concept="2OqwBi" id="1B_b0w84ecU" role="2Oq$k0">
552+
<node concept="pncrf" id="1B_b0w84ecV" role="2Oq$k0" />
553+
<node concept="1mfA1w" id="1B_b0w84ecW" role="2OqNvi" />
554+
</node>
555+
<node concept="1mIQ4w" id="1B_b0w84ecX" role="2OqNvi">
556+
<node concept="chp4Y" id="1B_b0w84ecY" role="cj9EA">
557+
<ref role="cht4Q" to="700h:6zmBjqUinVn" resolve="ListLiteral" />
558+
</node>
559+
</node>
560+
</node>
561+
</node>
562+
</node>
563+
</node>
564+
</node>
493565
</node>
494566
<node concept="3EZMnI" id="4399ITQA59t" role="6VMZX">
495567
<node concept="3F0ifn" id="4399ITQA59x" role="3EZMnx">

0 commit comments

Comments
 (0)