Skip to content

Commit

Permalink
Merge pull request #1133 from JetBrains/merge/mps20243
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20241 into maintenance/mps20243
  • Loading branch information
@mps-ci-buildbot
mps-ci-buildbot authored Jan 22, 2025
2 parents 590273a + 8abcc0a commit c9c6255
Show file tree
Hide file tree
Showing 4 changed files with 273 additions and 139 deletions.
30 changes: 15 additions & 15 deletions ....itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13313,21 +13313,6 @@
</node>
</node>
<node concept="3clFbH" id="5S8_I2GS8wk" role="3cqZAp" />
<node concept="3clFbF" id="2Q7VE3OLTDg" role="3cqZAp">
<node concept="1rXfSq" id="2Q7VE3OLTDh" role="3clFbG">
<ref role="37wK5l" node="1FlH1cKdtR4" resolve="model2graphPorts" />
<node concept="37vLTw" id="2Q7VE3OLVzX" role="37wK5m">
<ref role="3cqZAo" node="1O5GA4gqRtN" resolve="dcell" />
</node>
<node concept="37vLTw" id="2Q7VE3OLVDN" role="37wK5m">
<ref role="3cqZAo" node="4KKQOHIOelW" resolve="box" />
</node>
<node concept="37vLTw" id="2Q7VE3OLTDk" role="37wK5m">
<ref role="3cqZAo" node="1O5GA4gfk56" resolve="syncContext" />
</node>
</node>
</node>
<node concept="3clFbH" id="2Q7VE3OLSRH" role="3cqZAp" />
<node concept="2Gpval" id="6OP6SOH_zdO" role="3cqZAp">
<node concept="2GrKxI" id="6OP6SOH_zdQ" role="2Gsz3X">
<property role="TrG5h" value="subdiagram" />
Expand Down Expand Up @@ -13571,6 +13556,21 @@
</node>
</node>
</node>
<node concept="3clFbH" id="1HjGWYx6LQF" role="3cqZAp" />
<node concept="3clFbF" id="2Q7VE3OLTDg" role="3cqZAp">
<node concept="1rXfSq" id="2Q7VE3OLTDh" role="3clFbG">
<ref role="37wK5l" node="1FlH1cKdtR4" resolve="model2graphPorts" />
<node concept="37vLTw" id="2Q7VE3OLVzX" role="37wK5m">
<ref role="3cqZAo" node="1O5GA4gqRtN" resolve="dcell" />
</node>
<node concept="37vLTw" id="2Q7VE3OLVDN" role="37wK5m">
<ref role="3cqZAo" node="4KKQOHIOelW" resolve="box" />
</node>
<node concept="37vLTw" id="2Q7VE3OLTDk" role="37wK5m">
<ref role="3cqZAo" node="1O5GA4gfk56" resolve="syncContext" />
</node>
</node>
</node>
</node>
</node>
<node concept="2tJIrI" id="4KKQOHIOemk" role="jymVt" />
Expand Down
15 changes: 15 additions & 0 deletions ...beddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<import index="yg2w" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util.containers(MPS.Core/)" />
<import index="g3l6" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.extapi.model(MPS.Core/)" />
<import index="yyf4" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.util(MPS.OpenAPI/)" />
<import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
</imports>
<registry>
<language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
Expand Down Expand Up @@ -1572,6 +1573,20 @@
</node>
</node>
</node>
<node concept="3clFbF" id="63s_Ska0rPJ" role="3cqZAp">
<node concept="2YIFZM" id="63s_Ska0HZp" role="3clFbG">
<ref role="37wK5l" to="w1kc:~FastNodeFinderManager.dispose(org.jetbrains.mps.openapi.model.SModel)" resolve="dispose" />
<ref role="1Pybhc" to="w1kc:~FastNodeFinderManager" resolve="FastNodeFinderManager" />
<node concept="2OqwBi" id="63s_Ska0NLy" role="37wK5m">
<node concept="37vLTw" id="63s_Ska0L9W" role="2Oq$k0">
<ref role="3cqZAo" node="52ZF9D37MIO" resolve="event" />
</node>
<node concept="liA8E" id="63s_Ska0R4P" role="2OqNvi">
<ref role="37wK5l" to="j9co:~SModelEvent.getModel()" resolve="getModel" />
</node>
</node>
</node>
</node>
</node>
<node concept="2AHcQZ" id="52ZF9D3cRoQ" role="2AJF6D">
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
Expand Down
34 changes: 34 additions & 0 deletions ...modellisteners/com.mbeddr.mpsutil.modellisteners.sandboxlang/languageModels/listeners.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,16 @@
</concept>
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
<reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
</concept>
<concept id="1143234257716" name="jetbrains.mps.lang.smodel.structure.Node_GetModelOperation" flags="nn" index="I4A8Y" />
<concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
<child id="1145404616321" name="leftExpression" index="2JrQYb" />
</concept>
<concept id="1171323947159" name="jetbrains.mps.lang.smodel.structure.Model_NodesOperation" flags="nn" index="2SmgA7">
<child id="1758937410080001570" name="conceptArgument" index="1dBWTz" />
</concept>
<concept id="1144146199828" name="jetbrains.mps.lang.smodel.structure.Node_CopyOperation" flags="nn" index="1$rogu" />
<concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
<reference id="1138056395725" name="property" index="3TsBF5" />
Expand All @@ -77,6 +84,7 @@
<concept id="5818559022137760597" name="com.mbeddr.mpsutil.modellisteners.structure.Parameter_instance" flags="ng" index="j_vvf" />
<concept id="5818559022137645654" name="com.mbeddr.mpsutil.modellisteners.structure.BeforeChildRemovedListener" flags="ig" index="j_Nrc" />
<concept id="5818559022137644042" name="com.mbeddr.mpsutil.modellisteners.structure.ChildAddedListener" flags="ig" index="j_Nyg" />
<concept id="5818559022137644848" name="com.mbeddr.mpsutil.modellisteners.structure.ChildRemovedListener" flags="ig" index="j_NIE" />
<concept id="5818559022137597839" name="com.mbeddr.mpsutil.modellisteners.structure.ConceptModelListeners" flags="ng" index="jA7cl">
<reference id="1213093996982" name="concept" index="1M2myG" />
<child id="5818559022137986141" name="listeners" index="j$A37" />
Expand All @@ -102,6 +110,7 @@
<child id="540871147943773366" name="argument" index="25WWJ7" />
</concept>
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
<concept id="1165595910856" name="jetbrains.mps.baseLanguage.collections.structure.GetLastOperation" flags="nn" index="1yVyf7" />
</language>
Expand Down Expand Up @@ -180,6 +189,31 @@
</node>
</node>
</node>
<node concept="j_NIE" id="4zw8TQtKYrG" role="j$A37">
<node concept="3clFbS" id="4zw8TQtKYrI" role="2VODD2">
<node concept="2xdQw9" id="4zw8TQtKYyJ" role="3cqZAp">
<node concept="3cpWs3" id="4zw8TQtKZzE" role="9lYJi">
<node concept="2OqwBi" id="4zw8TQtL2F3" role="3uHU7w">
<node concept="2OqwBi" id="4zw8TQtL0kH" role="2Oq$k0">
<node concept="2OqwBi" id="4zw8TQtKZXb" role="2Oq$k0">
<node concept="j_vvf" id="4zw8TQtKZ$s" role="2Oq$k0" />
<node concept="I4A8Y" id="4zw8TQtL0d5" role="2OqNvi" />
</node>
<node concept="2SmgA7" id="4zw8TQtL0tl" role="2OqNvi">
<node concept="chp4Y" id="4zw8TQtL0u0" role="1dBWTz">
<ref role="cht4Q" to="64jm:52ZF9D3bond" resolve="ChildConceptA" />
</node>
</node>
</node>
<node concept="34oBXx" id="4zw8TQtL5vz" role="2OqNvi" />
</node>
<node concept="Xl_RD" id="4zw8TQtKYyL" role="3uHU7B">
<property role="Xl_RC" value="Size:" />
</node>
</node>
</node>
</node>
</node>
<node concept="3v3Eqs" id="5iW7uqbJrTk" role="j$A37">
<ref role="j_u2Y" to="64jm:5iW7uqbJsoP" resolve="reference1" />
<node concept="3clFbS" id="5iW7uqbJrTm" role="2VODD2">
Expand Down
Loading

0 comments on commit c9c6255

Please sign in to comment.