Skip to content

Commit fcbf735

Browse files
arimerarimer
authored
Merge pull request #1498 from IETS3/merge/mps20241
Merge maintenance/mps20241 into maintenance/mps20251
2 parents 251aee5 + 53ed8c9 commit fcbf735

File tree

6 files changed

+282
-60
lines changed

6 files changed

+282
-60
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented
1313
- 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.
1414
- 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.
1515
- 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+
- Requirements modeling (language `org.iets3.req.core`)
17+
- It now supports a "requires" relation, which can express that a requirement needs other requirements as a precondition.
18+
- 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.
19+
- Some additional internal changes (e.g., implementation of `ICanHide` interface, needed for variability support).
1620

1721
### Fixed
1822
- Improved the readability of lists by enforcing a new line when a threshold of three elements per list is exeeded.

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

Lines changed: 126 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
1313
<import index="2c95" ref="r:5f7188a9-e7b4-4a2e-bef9-38d2cf379fdc(com.mbeddr.doc.structure)" />
1414
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
15+
<import index="btm1" ref="b0f8641f-bd77-4421-8425-30d9088a82f7/java:org.apache.commons.lang3(org.apache.commons/)" />
1516
<import index="tpcu" ref="r:00000000-0000-4000-0000-011c89590282(jetbrains.mps.lang.core.behavior)" implicit="true" />
1617
<import index="4gky" ref="r:e1dfab1d-c7a7-43e7-9f26-028afd483e82(com.mbeddr.doc.behavior)" implicit="true" />
1718
</imports>
@@ -57,6 +58,7 @@
5758
<reference id="1144433194310" name="classConcept" index="1Pybhc" />
5859
</concept>
5960
<concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
61+
<concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
6062
<concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
6163
<concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
6264
<child id="1068431790190" name="initializer" index="33vP2m" />
@@ -78,6 +80,7 @@
7880
<concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
7981
<child id="1068580123156" name="expression" index="3clFbG" />
8082
</concept>
83+
<concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
8184
<concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
8285
<child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
8386
<child id="1068580123160" name="condition" index="3clFbw" />
@@ -86,7 +89,9 @@
8689
<concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
8790
<child id="1068581517665" name="statement" index="3cqZAp" />
8891
</concept>
89-
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
92+
<concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
93+
<property id="1068580123138" name="value" index="3clFbU" />
94+
</concept>
9095
<concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
9196
<property id="1068580320021" name="value" index="3cmrfH" />
9297
</concept>
@@ -102,6 +107,9 @@
102107
<concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
103108
<child id="1079359253376" name="expression" index="1eOMHV" />
104109
</concept>
110+
<concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
111+
<child id="1081516765348" name="expression" index="3fr31v" />
112+
</concept>
105113
<concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
106114
<reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
107115
<child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -118,6 +126,7 @@
118126
</concept>
119127
<concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
120128
<concept id="1146644641414" name="jetbrains.mps.baseLanguage.structure.ProtectedVisibility" flags="nn" index="3Tmbuc" />
129+
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
121130
</language>
122131
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
123132
<concept id="1204834851141" name="jetbrains.mps.lang.smodel.structure.PoundExpression" flags="ng" index="25Kdxt">
@@ -126,11 +135,15 @@
126135
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
127136
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
128137
</concept>
138+
<concept id="1138411891628" name="jetbrains.mps.lang.smodel.structure.SNodeOperation" flags="nn" index="eCIE_">
139+
<child id="1144104376918" name="parameter" index="1xVPHs" />
140+
</concept>
129141
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
130142
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
131143
<concept id="1138757581985" name="jetbrains.mps.lang.smodel.structure.Link_SetNewChildOperation" flags="nn" index="zfrQC">
132144
<reference id="1139880128956" name="concept" index="1A9B2P" />
133145
</concept>
146+
<concept id="1173122760281" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorsOperation" flags="nn" index="z$bX8" />
134147
<concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
135148
<child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
136149
<child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
@@ -150,6 +163,7 @@
150163
<concept id="1139184414036" name="jetbrains.mps.lang.smodel.structure.LinkList_AddNewChildOperation" flags="nn" index="WFELt">
151164
<reference id="1139877738879" name="concept" index="1A0vxQ" />
152165
</concept>
166+
<concept id="1171407110247" name="jetbrains.mps.lang.smodel.structure.Node_GetAncestorOperation" flags="nn" index="2Xjw5R" />
153167
<concept id="6677504323281689838" name="jetbrains.mps.lang.smodel.structure.SConceptType" flags="in" index="3bZ5Sz" />
154168
<concept id="1182511038748" name="jetbrains.mps.lang.smodel.structure.Model_NodesIncludingImportedOperation" flags="nn" index="1j9C0f">
155169
<child id="6750920497477143623" name="conceptArgument" index="3MHPCF" />
@@ -159,6 +173,10 @@
159173
<child id="1177027386292" name="conceptArgument" index="cj9EA" />
160174
</concept>
161175
<concept id="334628810661441841" name="jetbrains.mps.lang.smodel.structure.AsSConcept" flags="nn" index="1rGIog" />
176+
<concept id="1171999116870" name="jetbrains.mps.lang.smodel.structure.Node_IsNullOperation" flags="nn" index="3w_OXm" />
177+
<concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
178+
<child id="1207343664468" name="conceptArgument" index="ri$Ld" />
179+
</concept>
162180
<concept id="1180636770613" name="jetbrains.mps.lang.smodel.structure.SNodeCreator" flags="nn" index="3zrR0B">
163181
<child id="1180636770616" name="createdType" index="3zrR0E" />
164182
</concept>
@@ -195,6 +213,7 @@
195213
</concept>
196214
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
197215
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
216+
<concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
198217
</language>
199218
</registry>
200219
<node concept="13h7C7" id="4tXyFaWwpiP">
@@ -793,6 +812,112 @@
793812
</node>
794813
</node>
795814
</node>
815+
<node concept="13i0hz" id="4zL1IiCQnzF" role="13h7CS">
816+
<property role="TrG5h" value="getIndent" />
817+
<property role="13i0it" value="true" />
818+
<node concept="3Tm1VV" id="4zL1IiCQnzG" role="1B3o_S" />
819+
<node concept="17QB3L" id="4zL1IiCQpcZ" role="3clF45" />
820+
<node concept="3clFbS" id="4zL1IiCQnzI" role="3clF47">
821+
<node concept="3cpWs8" id="3FGEpLFjzYM" role="3cqZAp">
822+
<node concept="3cpWsn" id="3FGEpLFjzYN" role="3cpWs9">
823+
<property role="TrG5h" value="c" />
824+
<node concept="10Oyi0" id="3FGEpLFjzYO" role="1tU5fm" />
825+
<node concept="2OqwBi" id="3FGEpLFjzYP" role="33vP2m">
826+
<node concept="2OqwBi" id="3FGEpLFjzYQ" role="2Oq$k0">
827+
<node concept="13iPFW" id="4zL1IiCQw$3" role="2Oq$k0" />
828+
<node concept="z$bX8" id="3FGEpLFjzYS" role="2OqNvi">
829+
<node concept="1xMEDy" id="3FGEpLFjzYT" role="1xVPHs">
830+
<node concept="chp4Y" id="3FGEpLFjzYU" role="ri$Ld">
831+
<ref role="cht4Q" to="plfp:4tXyFaWwpmI" resolve="AbstractRequirement" />
832+
</node>
833+
</node>
834+
</node>
835+
</node>
836+
<node concept="34oBXx" id="3FGEpLFjzYV" role="2OqNvi" />
837+
</node>
838+
</node>
839+
</node>
840+
<node concept="3clFbF" id="3FGEpLFjzYW" role="3cqZAp">
841+
<node concept="2YIFZM" id="3FGEpLFjzYX" role="3clFbG">
842+
<ref role="37wK5l" to="btm1:~StringUtils.repeat(java.lang.String,int)" resolve="repeat" />
843+
<ref role="1Pybhc" to="btm1:~StringUtils" resolve="StringUtils" />
844+
<node concept="Xl_RD" id="3FGEpLFjzYY" role="37wK5m">
845+
<property role="Xl_RC" value=" " />
846+
</node>
847+
<node concept="37vLTw" id="3FGEpLFjzYZ" role="37wK5m">
848+
<ref role="3cqZAo" node="3FGEpLFjzYN" resolve="c" />
849+
</node>
850+
</node>
851+
</node>
852+
</node>
853+
</node>
854+
<node concept="13i0hz" id="4zL1IiCStbX" role="13h7CS">
855+
<property role="13i0it" value="true" />
856+
<property role="TrG5h" value="showChildReqs" />
857+
<node concept="3Tm1VV" id="4zL1IiCStbY" role="1B3o_S" />
858+
<node concept="10P_77" id="4zL1IiCSuM1" role="3clF45" />
859+
<node concept="3clFbS" id="4zL1IiCStc0" role="3clF47">
860+
<node concept="3cpWs8" id="4zL1IiCSvDC" role="3cqZAp">
861+
<node concept="3cpWsn" id="4zL1IiCSvDD" role="3cpWs9">
862+
<property role="TrG5h" value="chunk" />
863+
<node concept="3Tqbb2" id="4zL1IiCSvDc" role="1tU5fm">
864+
<ref role="ehGHo" to="plfp:4tXyFaWwpis" resolve="RequirementsChunk" />
865+
</node>
866+
<node concept="2OqwBi" id="4zL1IiCSvDE" role="33vP2m">
867+
<node concept="13iPFW" id="4zL1IiCSvDF" role="2Oq$k0" />
868+
<node concept="2Xjw5R" id="4zL1IiCSvDG" role="2OqNvi">
869+
<node concept="1xMEDy" id="4zL1IiCSvDH" role="1xVPHs">
870+
<node concept="chp4Y" id="4zL1IiCSvDI" role="ri$Ld">
871+
<ref role="cht4Q" to="plfp:4tXyFaWwpis" resolve="RequirementsChunk" />
872+
</node>
873+
</node>
874+
</node>
875+
</node>
876+
</node>
877+
</node>
878+
<node concept="3clFbJ" id="4zL1IiCSBn1" role="3cqZAp">
879+
<node concept="3clFbS" id="4zL1IiCSBn3" role="3clFbx">
880+
<node concept="3cpWs6" id="4zL1IiCSC1R" role="3cqZAp">
881+
<node concept="3clFbT" id="4zL1IiCSC4M" role="3cqZAk">
882+
<property role="3clFbU" value="true" />
883+
</node>
884+
</node>
885+
</node>
886+
<node concept="2OqwBi" id="4zL1IiCSBMX" role="3clFbw">
887+
<node concept="37vLTw" id="4zL1IiCSBon" role="2Oq$k0">
888+
<ref role="3cqZAo" node="4zL1IiCSvDD" resolve="chunk" />
889+
</node>
890+
<node concept="3w_OXm" id="4zL1IiCSBQY" role="2OqNvi" />
891+
</node>
892+
</node>
893+
<node concept="3clFbH" id="4zL1IiCSC6k" role="3cqZAp" />
894+
<node concept="3clFbF" id="4zL1IiCSvJO" role="3cqZAp">
895+
<node concept="3fqX7Q" id="4zL1IiCSRVM" role="3clFbG">
896+
<node concept="1eOMI4" id="4zL1IiCSRVO" role="3fr31v">
897+
<node concept="1Wc70l" id="4zL1IiCSRVP" role="1eOMHV">
898+
<node concept="2OqwBi" id="4zL1IiCSRVQ" role="3uHU7w">
899+
<node concept="2OqwBi" id="4zL1IiCSRVR" role="2Oq$k0">
900+
<node concept="13iPFW" id="4zL1IiCSRVS" role="2Oq$k0" />
901+
<node concept="3Tsc0h" id="4zL1IiCSRVT" role="2OqNvi">
902+
<ref role="3TtcxE" to="plfp:4tXyFaWxWA_" resolve="requirements" />
903+
</node>
904+
</node>
905+
<node concept="1v1jN8" id="4zL1IiCSRVU" role="2OqNvi" />
906+
</node>
907+
<node concept="2OqwBi" id="4zL1IiCSRVV" role="3uHU7B">
908+
<node concept="37vLTw" id="4zL1IiCSRVW" role="2Oq$k0">
909+
<ref role="3cqZAo" node="4zL1IiCSvDD" resolve="chunk" />
910+
</node>
911+
<node concept="3TrcHB" id="4zL1IiCSRVX" role="2OqNvi">
912+
<ref role="3TsBF5" to="plfp:4zL1IiCSr1P" resolve="hideEmptyChildReqsSection" />
913+
</node>
914+
</node>
915+
</node>
916+
</node>
917+
</node>
918+
</node>
919+
</node>
920+
</node>
796921
</node>
797922
<node concept="13h7C7" id="4tXyFaWylOq">
798923
<ref role="13h7C2" to="plfp:4tXyFaWwpmT" resolve="DefaultRequirement" />

0 commit comments

Comments
 (0)