Skip to content

Commit c30911e

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1097 from JetBrains/merge/mps20241
Merge maintenance/mps20232 into maintenance/mps20241
2 parents 74934c0 + 70da8fb commit c30911e

File tree

7 files changed

+3083
-3691
lines changed

7 files changed

+3083
-3691
lines changed

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9912,6 +9912,9 @@
99129912
<node concept="m$_yC" id="5U8hsWC7jgn" role="m$_yJ">
99139913
<ref role="m$_y1" node="5U8hsWC762L" resolve="org.modelix.model.api" />
99149914
</node>
9915+
<node concept="m$_yC" id="494a_O9Mc4K" role="m$_yJ">
9916+
<ref role="m$_y1" node="2NyZxKpUXYJ" resolve="de.itemis.mps.blutil" />
9917+
</node>
99159918
</node>
99169919
<node concept="m$_wf" id="2OJNL7ElZsF" role="3989C9">
99179920
<property role="m$_wk" value="de.q60.mps.collections.libs" />
@@ -14331,6 +14334,26 @@
1433114334
<ref role="3bR37D" to="ffeo:7Kfy9QB6L7y" resolve="jetbrains.mps.lang.intentions" />
1433214335
</node>
1433314336
</node>
14337+
<node concept="1SiIV0" id="2jDew6504Tc" role="3bR37C">
14338+
<node concept="3bR9La" id="2jDew6504Td" role="1SiIV1">
14339+
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
14340+
</node>
14341+
</node>
14342+
<node concept="1SiIV0" id="2jDew6504Te" role="3bR37C">
14343+
<node concept="3bR9La" id="2jDew6504Tf" role="1SiIV1">
14344+
<ref role="3bR37D" to="ffeo:44LXwdzyvTi" resolve="Annotations" />
14345+
</node>
14346+
</node>
14347+
<node concept="1SiIV0" id="2jDew6504Tg" role="3bR37C">
14348+
<node concept="3bR9La" id="2jDew6504Th" role="1SiIV1">
14349+
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
14350+
</node>
14351+
</node>
14352+
<node concept="1SiIV0" id="2jDew6504Ti" role="3bR37C">
14353+
<node concept="3bR9La" id="2jDew6504Tj" role="1SiIV1">
14354+
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
14355+
</node>
14356+
</node>
1433414357
</node>
1433514358
</node>
1433614359
<node concept="m$_wf" id="hCVXosGNJH" role="3989C9">

‎code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps‎

Lines changed: 80 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11696,7 +11696,7 @@
1169611696
<node concept="3clFbF" id="1tbbSi4Sn63" role="3cqZAp">
1169711697
<node concept="2YIFZM" id="1tbbSi4SnNC" role="3clFbG">
1169811698
<ref role="1Pybhc" node="3FRjz$vys4Z" resolve="PortLayouter" />
11699-
<ref role="37wK5l" node="2BjZSlQJ_ry" resolve="layoutPortCells" />
11699+
<ref role="37wK5l" node="6O6KyRn8ret" resolve="layoutPortCells" />
1170011700
<node concept="1eOMI4" id="1tbbSi4SoFi" role="37wK5m">
1170111701
<node concept="10QFUN" id="1tbbSi4SoFh" role="1eOMHV">
1170211702
<node concept="37vLTw" id="1tbbSi4SoFg" role="10QFUP">
@@ -11707,6 +11707,7 @@
1170711707
</node>
1170811708
</node>
1170911709
</node>
11710+
<node concept="3clFbT" id="6O6KyRn9RFZ" role="37wK5m" />
1171011711
</node>
1171111712
</node>
1171211713
</node>
@@ -108854,6 +108855,9 @@
108854108855
</node>
108855108856
<node concept="liA8E" id="3FRjz$vGeTq" role="2OqNvi">
108856108857
<ref role="37wK5l" node="3FRjz$vyxaH" resolve="layoutPortCells" />
108858+
<node concept="3clFbT" id="6O6KyRn8AIg" role="37wK5m">
108859+
<property role="3clFbU" value="true" />
108860+
</node>
108857108861
</node>
108858108862
</node>
108859108863
</node>
@@ -108881,41 +108885,75 @@
108881108885
<property role="DiZV1" value="false" />
108882108886
<property role="od$2w" value="false" />
108883108887
<node concept="3clFbS" id="2BjZSlQJ_rz" role="3clF47">
108884-
<node concept="3clFbF" id="2BjZSlQJ_r$" role="3cqZAp">
108885-
<node concept="2OqwBi" id="2BjZSlQJ_r_" role="3clFbG">
108886-
<node concept="2ShNRf" id="2BjZSlQJ_rA" role="2Oq$k0">
108887-
<node concept="1pGfFk" id="2BjZSlQJ_rB" role="2ShVmc">
108888+
<node concept="3clFbF" id="6O6KyRn8CWl" role="3cqZAp">
108889+
<node concept="1rXfSq" id="6O6KyRn8CWk" role="3clFbG">
108890+
<ref role="37wK5l" node="6O6KyRn8ret" resolve="layoutPortCells" />
108891+
<node concept="37vLTw" id="6O6KyRn8D7Y" role="37wK5m">
108892+
<ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
108893+
</node>
108894+
<node concept="3clFbT" id="6O6KyRnsXRn" role="37wK5m">
108895+
<property role="3clFbU" value="true" />
108896+
</node>
108897+
</node>
108898+
</node>
108899+
</node>
108900+
<node concept="37vLTG" id="2BjZSlQJ_rI" role="3clF46">
108901+
<property role="TrG5h" value="parentCell" />
108902+
<node concept="3uibUv" id="xqQxwszNam" role="1tU5fm">
108903+
<ref role="3uigEE" node="f4v_NgJPyX" resolve="BoxDCell" />
108904+
</node>
108905+
</node>
108906+
<node concept="3cqZAl" id="2BjZSlQJ_rK" role="3clF45" />
108907+
<node concept="3Tm1VV" id="2BjZSlQJ_rL" role="1B3o_S" />
108908+
</node>
108909+
<node concept="2tJIrI" id="6O6KyRn8req" role="jymVt" />
108910+
<node concept="2YIFZL" id="6O6KyRn8ret" role="jymVt">
108911+
<property role="TrG5h" value="layoutPortCells" />
108912+
<property role="DiZV1" value="false" />
108913+
<property role="od$2w" value="false" />
108914+
<node concept="3clFbS" id="6O6KyRn8reu" role="3clF47">
108915+
<node concept="3clFbF" id="6O6KyRn8rev" role="3cqZAp">
108916+
<node concept="2OqwBi" id="6O6KyRn8rew" role="3clFbG">
108917+
<node concept="2ShNRf" id="6O6KyRn8rex" role="2Oq$k0">
108918+
<node concept="1pGfFk" id="6O6KyRn8rey" role="2ShVmc">
108888108919
<ref role="37wK5l" node="3FRjz$vyT_L" resolve="PortLayouter" />
108889-
<node concept="2OqwBi" id="xqQxwsKNoj" role="37wK5m">
108890-
<node concept="2OqwBi" id="2BjZSlQJDBi" role="2Oq$k0">
108891-
<node concept="37vLTw" id="2BjZSlQJD$H" role="2Oq$k0">
108892-
<ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
108920+
<node concept="2OqwBi" id="6O6KyRn8rez" role="37wK5m">
108921+
<node concept="2OqwBi" id="6O6KyRn8re$" role="2Oq$k0">
108922+
<node concept="37vLTw" id="6O6KyRn8re_" role="2Oq$k0">
108923+
<ref role="3cqZAo" node="6O6KyRn8reF" resolve="parentCell" />
108893108924
</node>
108894-
<node concept="liA8E" id="2BjZSlQJDKg" role="2OqNvi">
108925+
<node concept="liA8E" id="6O6KyRn8reA" role="2OqNvi">
108895108926
<ref role="37wK5l" node="xqQxwsyFUA" resolve="getPorts" />
108896108927
</node>
108897108928
</node>
108898-
<node concept="ANE8D" id="xqQxwsKP5t" role="2OqNvi" />
108929+
<node concept="ANE8D" id="6O6KyRn8reB" role="2OqNvi" />
108899108930
</node>
108900-
<node concept="37vLTw" id="2BjZSlQJ_rD" role="37wK5m">
108901-
<ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
108931+
<node concept="37vLTw" id="6O6KyRn8reC" role="37wK5m">
108932+
<ref role="3cqZAo" node="6O6KyRn8reF" resolve="parentCell" />
108902108933
</node>
108903108934
</node>
108904108935
</node>
108905-
<node concept="liA8E" id="2BjZSlQJ_rE" role="2OqNvi">
108936+
<node concept="liA8E" id="6O6KyRn8reD" role="2OqNvi">
108906108937
<ref role="37wK5l" node="3FRjz$vyxaH" resolve="layoutPortCells" />
108938+
<node concept="37vLTw" id="6O6KyRn8reE" role="37wK5m">
108939+
<ref role="3cqZAo" node="6O6KyRn8reH" resolve="keepFittedSize" />
108940+
</node>
108907108941
</node>
108908108942
</node>
108909108943
</node>
108910108944
</node>
108911-
<node concept="37vLTG" id="2BjZSlQJ_rI" role="3clF46">
108945+
<node concept="37vLTG" id="6O6KyRn8reF" role="3clF46">
108912108946
<property role="TrG5h" value="parentCell" />
108913-
<node concept="3uibUv" id="xqQxwszNam" role="1tU5fm">
108947+
<node concept="3uibUv" id="6O6KyRn8reG" role="1tU5fm">
108914108948
<ref role="3uigEE" node="f4v_NgJPyX" resolve="BoxDCell" />
108915108949
</node>
108916108950
</node>
108917-
<node concept="3cqZAl" id="2BjZSlQJ_rK" role="3clF45" />
108918-
<node concept="3Tm1VV" id="2BjZSlQJ_rL" role="1B3o_S" />
108951+
<node concept="37vLTG" id="6O6KyRn8reH" role="3clF46">
108952+
<property role="TrG5h" value="keepFittedSize" />
108953+
<node concept="10P_77" id="6O6KyRn8reI" role="1tU5fm" />
108954+
</node>
108955+
<node concept="3cqZAl" id="6O6KyRn8reJ" role="3clF45" />
108956+
<node concept="3Tm1VV" id="6O6KyRn8reK" role="1B3o_S" />
108919108957
</node>
108920108958
<node concept="2tJIrI" id="3FRjz$vz2gC" role="jymVt" />
108921108959
<node concept="312cEg" id="3FRjz$vyOx4" role="jymVt">
@@ -109223,6 +109261,9 @@
109223109261
<node concept="3clFbF" id="61tQzM6bsb0" role="3cqZAp">
109224109262
<node concept="1rXfSq" id="61tQzM6bsaY" role="3clFbG">
109225109263
<ref role="37wK5l" node="61tQzM6beoK" resolve="doLayoutPorts" />
109264+
<node concept="37vLTw" id="6O6KyRniKhD" role="37wK5m">
109265+
<ref role="3cqZAo" node="6O6KyRniB6Z" resolve="keepFittedSize" />
109266+
</node>
109226109267
</node>
109227109268
</node>
109228109269
<node concept="3clFbF" id="147Asf0q3OA" role="3cqZAp">
@@ -109236,6 +109277,10 @@
109236109277
</node>
109237109278
</node>
109238109279
</node>
109280+
<node concept="37vLTG" id="6O6KyRniB6Z" role="3clF46">
109281+
<property role="TrG5h" value="keepFittedSize" />
109282+
<node concept="10P_77" id="6O6KyRniB6Y" role="1tU5fm" />
109283+
</node>
109239109284
</node>
109240109285
<node concept="2tJIrI" id="61tQzM672xv" role="jymVt" />
109241109286
<node concept="3clFb_" id="61tQzM6beoK" role="jymVt">
@@ -109597,18 +109642,29 @@
109597109642
</node>
109598109643
</node>
109599109644
</node>
109600-
<node concept="3fqX7Q" id="5eqlYwi$jmV" role="3clFbw">
109601-
<node concept="2OqwBi" id="5eqlYwi$pVU" role="3fr31v">
109602-
<node concept="37vLTw" id="5eqlYwi$nel" role="2Oq$k0">
109603-
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
109645+
<node concept="1Wc70l" id="6O6KyRnYdHB" role="3clFbw">
109646+
<node concept="3fqX7Q" id="6O6KyRnYse6" role="3uHU7w">
109647+
<node concept="37vLTw" id="6O6KyRnYse8" role="3fr31v">
109648+
<ref role="3cqZAo" node="6O6KyRniNzy" resolve="keepFittedSize" />
109604109649
</node>
109605-
<node concept="liA8E" id="5eqlYwi$vZ_" role="2OqNvi">
109606-
<ref role="37wK5l" node="5eqlYwiatMq" resolve="containsSubdiagram" />
109650+
</node>
109651+
<node concept="3fqX7Q" id="5eqlYwi$jmV" role="3uHU7B">
109652+
<node concept="2OqwBi" id="5eqlYwi$pVU" role="3fr31v">
109653+
<node concept="37vLTw" id="5eqlYwi$nel" role="2Oq$k0">
109654+
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
109655+
</node>
109656+
<node concept="liA8E" id="5eqlYwi$vZ_" role="2OqNvi">
109657+
<ref role="37wK5l" node="5eqlYwiatMq" resolve="containsSubdiagram" />
109658+
</node>
109607109659
</node>
109608109660
</node>
109609109661
</node>
109610109662
</node>
109611109663
</node>
109664+
<node concept="37vLTG" id="6O6KyRniNzy" role="3clF46">
109665+
<property role="TrG5h" value="keepFittedSize" />
109666+
<node concept="10P_77" id="6O6KyRniWxY" role="1tU5fm" />
109667+
</node>
109612109668
</node>
109613109669
<node concept="2tJIrI" id="61tQzM6bcoE" role="jymVt" />
109614109670
<node concept="312cEg" id="67wtfYkgacz" role="jymVt">

‎code/intentionsmenu/com.mbeddr.mpsutil.intentions.runtime/com.mbeddr.mpsutil.intentions.runtime.msd‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
<dependency reexport="true">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
1818
<dependency reexport="false">b92f861d-0184-446d-b88b-6dcf0e070241(com.mbeddr.mpsutil.intentions)</dependency>
1919
<dependency reexport="false">d7a92d38-f7db-40d0-8431-763b0c3c9f20(jetbrains.mps.lang.intentions)</dependency>
20+
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
21+
<dependency reexport="false">3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)</dependency>
22+
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
23+
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
2024
</dependencies>
2125
<languageVersions>
2226
<language slang="l:654422bf-e75f-44dc-936d-188890a746ce:de.slisson.mps.reflection" version="0" />

0 commit comments

Comments
 (0)