Skip to content

Commit ea619d2

Browse files
arimerarimer
authored
Merge pull request #1558 from IETS3/merge/mps20241
Merge maintenance/mps20241 into maintenance/mps20251
2 parents 4cdab5d + 9accb92 commit ea619d2

File tree

10 files changed

+1219
-750
lines changed

10 files changed

+1219
-750
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,6 +1013,17 @@
10131013
</node>
10141014
</node>
10151015
</node>
1016+
<node concept="13i0hz" id="4358bbCIl2g" role="13h7CS">
1017+
<property role="13i0it" value="true" />
1018+
<property role="TrG5h" value="highlightWarning" />
1019+
<node concept="3Tm1VV" id="4358bbCIl2h" role="1B3o_S" />
1020+
<node concept="10P_77" id="4358bbCIpKu" role="3clF45" />
1021+
<node concept="3clFbS" id="4358bbCIl2j" role="3clF47">
1022+
<node concept="3clFbF" id="4358bbCIpLX" role="3cqZAp">
1023+
<node concept="3clFbT" id="4358bbCIpLW" role="3clFbG" />
1024+
</node>
1025+
</node>
1026+
</node>
10161027
<node concept="13i0hz" id="4MH81Y0VldB" role="13h7CS">
10171028
<property role="13i0iv" value="false" />
10181029
<property role="13i0it" value="true" />

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

Lines changed: 2 additions & 255 deletions
Large diffs are not rendered by default.

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

Lines changed: 799 additions & 489 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
1818
<dependency reexport="false">5454dbfd-2075-4de0-b85e-fa645eb6957e(de.itemis.mps.utils.serializer.xml)</dependency>
1919
<dependency reexport="false">f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)</dependency>
20+
<dependency reexport="false">20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)</dependency>
2021
</dependencies>
2122
<languageVersions>
2223
<language slang="l:b92f861d-0184-446d-b88b-6dcf0e070241:com.mbeddr.mpsutil.intentions" version="0" />
@@ -91,6 +92,7 @@
9192
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
9293
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
9394
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
95+
<module reference="20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)" version="0" />
9496
<module reference="7b68d745-a7b8-48b9-bd9c-05c0f8725a35(org.iets3.core.base)" version="0" />
9597
</dependencyVersions>
9698
<extendedLanguages>

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6324,6 +6324,19 @@
63246324
</node>
63256325
</node>
63266326
</node>
6327+
<node concept="13i0hz" id="4Wh0rOTGomo" role="13h7CS">
6328+
<property role="TrG5h" value="highlightWarning" />
6329+
<ref role="13i0hy" to="gdgh:4358bbCIl2g" resolve="highlightWarning" />
6330+
<node concept="3Tm1VV" id="4Wh0rOTGomp" role="1B3o_S" />
6331+
<node concept="3clFbS" id="4Wh0rOTGomu" role="3clF47">
6332+
<node concept="3clFbF" id="4Wh0rOTGrx5" role="3cqZAp">
6333+
<node concept="3clFbT" id="4Wh0rOTGrx4" role="3clFbG">
6334+
<property role="3clFbU" value="true" />
6335+
</node>
6336+
</node>
6337+
</node>
6338+
<node concept="10P_77" id="4Wh0rOTGomv" role="3clF45" />
6339+
</node>
63276340
</node>
63286341
<node concept="312cEu" id="220xVKpl3fR">
63296342
<property role="3GE5qa" value="skeleton" />
@@ -13076,6 +13089,19 @@
1307613089
</node>
1307713090
</node>
1307813091
</node>
13092+
<node concept="13i0hz" id="4Wh0rOTGcEo" role="13h7CS">
13093+
<property role="TrG5h" value="highlightWarning" />
13094+
<ref role="13i0hy" to="gdgh:4358bbCIl2g" resolve="highlightWarning" />
13095+
<node concept="3Tm1VV" id="4Wh0rOTGcEp" role="1B3o_S" />
13096+
<node concept="3clFbS" id="4Wh0rOTGcEu" role="3clF47">
13097+
<node concept="3clFbF" id="4Wh0rOTGiWt" role="3cqZAp">
13098+
<node concept="3clFbT" id="4Wh0rOTGiWs" role="3clFbG">
13099+
<property role="3clFbU" value="true" />
13100+
</node>
13101+
</node>
13102+
</node>
13103+
<node concept="10P_77" id="4Wh0rOTGcEv" role="3clF45" />
13104+
</node>
1307913105
</node>
1308013106
<node concept="312cEu" id="IzpDYSOg6$">
1308113107
<property role="3GE5qa" value="artifact" />

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

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@
5151
<import index="2ahs" ref="r:ea6cf71d-29d2-478d-8027-a9f4a4de53c4(com.mbeddr.mpsutil.interpreter.rt)" />
5252
<import index="ppzb" ref="r:5db517a0-f62d-4841-a421-11bb7269799d(org.iets3.core.expr.base.shared.runtime)" />
5353
<import index="ch50" ref="r:83d54567-d361-47ca-a949-7374ea89921d(org.iets3.variability.configuration.base.plugin)" />
54-
<import index="xygl" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.progress(MPS.IDEA/)" />
5554
<import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
56-
<import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
57-
<import index="wwqx" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.logging(MPS.Core/)" />
58-
<import index="fnpx" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.notification(MPS.IDEA/)" />
59-
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
6055
<import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
61-
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
56+
<import index="fnpx" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.notification(MPS.IDEA/)" />
6257
<import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
58+
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
59+
<import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
60+
<import index="wwqx" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.logging(MPS.Core/)" />
61+
<import index="xygl" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.progress(MPS.IDEA/)" />
62+
<import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
6363
</imports>
6464
<registry>
6565
<language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
@@ -7621,6 +7621,19 @@
76217621
</node>
76227622
</node>
76237623
</node>
7624+
<node concept="13i0hz" id="52EttxuaVXR" role="13h7CS">
7625+
<property role="TrG5h" value="highlightWarning" />
7626+
<ref role="13i0hy" to="gdgh:4358bbCIl2g" resolve="highlightWarning" />
7627+
<node concept="3Tm1VV" id="52EttxuaVXS" role="1B3o_S" />
7628+
<node concept="3clFbS" id="52EttxuaVXX" role="3clF47">
7629+
<node concept="3clFbF" id="52Ettxub6uA" role="3cqZAp">
7630+
<node concept="3clFbT" id="52Ettxub6u_" role="3clFbG">
7631+
<property role="3clFbU" value="true" />
7632+
</node>
7633+
</node>
7634+
</node>
7635+
<node concept="10P_77" id="52EttxuaVXY" role="3clF45" />
7636+
</node>
76247637
</node>
76257638
<node concept="13h7C7" id="27K8O1MvJym">
76267639
<property role="3GE5qa" value="configuration" />

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4579,6 +4579,19 @@
45794579
</node>
45804580
</node>
45814581
</node>
4582+
<node concept="13i0hz" id="52EttxubgK5" role="13h7CS">
4583+
<property role="TrG5h" value="highlightWarning" />
4584+
<ref role="13i0hy" to="gdgh:4358bbCIl2g" resolve="highlightWarning" />
4585+
<node concept="3Tm1VV" id="52EttxubgK6" role="1B3o_S" />
4586+
<node concept="3clFbS" id="52EttxubgKb" role="3clF47">
4587+
<node concept="3clFbF" id="52Ettxub_P7" role="3cqZAp">
4588+
<node concept="3clFbT" id="52Ettxub_P6" role="3clFbG">
4589+
<property role="3clFbU" value="true" />
4590+
</node>
4591+
</node>
4592+
</node>
4593+
<node concept="10P_77" id="52EttxubgKc" role="3clF45" />
4594+
</node>
45824595
</node>
45834596
<node concept="13h7C7" id="7Nu9WvXwNpC">
45844597
<property role="3GE5qa" value="constraints" />

‎code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9360,6 +9360,11 @@
93609360
</node>
93619361
</node>
93629362
</node>
9363+
<node concept="1SiIV0" id="5ehyoLGSTmL" role="3bR37C">
9364+
<node concept="3bR9La" id="5ehyoLGSTmM" role="1SiIV1">
9365+
<ref role="3bR37D" to="ffeo:7Kfy9QB6Lh7" resolve="jetbrains.mps.typesystemEngine" />
9366+
</node>
9367+
</node>
93639368
</node>
93649369
<node concept="1E1JtD" id="5wLtKNeSRPz" role="2G$12L">
93659370
<property role="BnDLt" value="true" />
@@ -18186,6 +18191,11 @@
1818618191
</node>
1818718192
</node>
1818818193
</node>
18194+
<node concept="1SiIV0" id="5ehyoLGST$r" role="3bR37C">
18195+
<node concept="3bR9La" id="5ehyoLGST$s" role="1SiIV1">
18196+
<ref role="3bR37D" to="ffeo:7Kfy9QB6Lh7" resolve="jetbrains.mps.typesystemEngine" />
18197+
</node>
18198+
</node>
1818918199
</node>
1819018200
<node concept="1E1JtA" id="sIFyDYEApj" role="3989C9">
1819118201
<property role="BnDLt" value="true" />

0 commit comments

Comments
 (0)